Fix misalginment with non-tashkeeled letters

latiif · Jan 31, 2020 · 5baf8f3 · 5baf8f3
1 parent e5600cc
commit 5baf8f3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/go.sum b/go.sum
@@ -1,2 +1,4 @@
+github.com/buger/goterm v0.0.0-20181115115552-c206103e1f37 h1:uxxtrnACqI9zK4ENDMf0WpXfUsHP5V8liuq5QdgDISU=
 github.com/buger/goterm v0.0.0-20181115115552-c206103e1f37/go.mod h1:u9UyCz2eTrSGy6fbupqJ54eY5c4IC8gREQ1053dK12U=
+golang.org/x/sys v0.0.0-20190913121621-c3b328c6e5a7 h1:wYqz/tQaWUgGKyx+B/rssSE6wkIKdY5Ee6ryOmzarIg=
 golang.org/x/sys v0.0.0-20190913121621-c3b328c6e5a7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/goarabic/stringutils.go b/goarabic/stringutils.go
@@ -75,14 +75,12 @@ func constructAlphabetMap(letters []Harf) map[rune]bool {
 func SmartLength(s *string) int {
 	// len() use int as return value, so we'd better follow for compatibility
 	length := 0
-
 	for _, value := range *s {
 		if tashkeel[value] {
 			continue
 		}
 		length++
 	}
-
 	return length
 }
 
@@ -299,9 +297,7 @@ func breakLineAt(pos int, str string) (fst, snd string) {
 //padRTL Fills the leading places with spaces to make an RTL text
 func padRTL(strlen, size int, str string) string {
 	plotsToFill := size - strlen
-
 	padding := strings.Repeat(" ", plotsToFill)
-
 	return padding + str
 }
 

diff --git a/goarabic/tashkeel.go b/goarabic/tashkeel.go
@@ -56,17 +56,10 @@ func ApplyTashkeel(table []rune, s string) string {
 		i++
 	}
 
-	// Store remaining elements of second array
-	for j < n2 {
-		if table[j] != rune(0) {
-			r[k] = table[j]
-			k++
-		}
-		j++
-	}
-
-	return string(r)
-
+	// ignore trailing empty 0 from tashkeel table
+	trimmed := make([]rune, k)
+	copy(trimmed, r)
+	return string(trimmed)
 }
 
 var tashkeels = []rune{

diff --git a/main.go b/main.go
@@ -27,7 +27,6 @@ func main() {
 						ara.ToGlyph(
 							ara.Smooth(
 								ara.RemoveTashkeel(rawText)))))))
-
 	}
 
 	if err := scanner.Err(); err != nil {