Render post-base vowel sign correctly after an independent vowel.

[m17n/m17n-db.git] / FLT / KNDA-OTF.flt

diff --git a/FLT/KNDA-OTF.flt b/FLT/KNDA-OTF.flt
index 5f31ddf..90809fd 100644 (file)
--- a/FLT/KNDA-OTF.flt
+++ b/FLT/KNDA-OTF.flt
@@ -23,8 +23,7 @@
 
 ;;; <li> KNDA-OTF.flt
 ;;;
-;;; For Kannada OpenType fonts to draw Kannada.
-;;; Designed for Kedage-n.ttf <http://brahmi.sourceforge.net/downloads.html>
+;;; For Kannada OpenType fonts to draw the Kannada script.
 
 (font layouter knda-otf nil
       (font (nil nil unicode-bmp :otf=knda=rphf)))
@@ -64,11 +63,11 @@
  (0x200D       ?J)                     ; ZWJ
  )
 
-;; Preprocessing
+;; Preprocessing.
 (generator
  (0
   (cond
-   ;; Decompose two-part and three-part vowels
+   ;; Decompose two-part and three-part vowel signs.
    ((0x0CC0)
     0x0CBF 0x0CD5)
    ((0x0CC7)
@@ -108,7 +107,7 @@
 
    ;; No vowel signs, no vowel modifiers.
    ;;1   2      3          4
-   ("(J)?([CR]n?(H[CR]n?)*)(H|HN)?"
+   ("(J)?([CR]n?(H[CR]n?)*)(HN?)?"
     < | (1 =) (2 otf:knda=nukt,akhn+) (4 = *) | >)
 
    ;; A syllable starting with an independent vowel.
@@ -123,7 +122,7 @@
 (generator
  (0
   (cond
-   ;; 1    2  34     5     6   7   8
+   ;; 1    2     34        5     6   7   8
    (" (RH)?([^N])((H[^N])*)(u|b)?(p)?(l)?(a)? "
     | (2 =) (5 =) (6 =) (3 move-h) (7 =) (1 otf:knda=rphf+) (8 =) |)
 
@@ -134,7 +133,7 @@
     | (2 otf:knda=haln,psts+)(3 = *) (1 otf:knda=rphf+) |)
 
    ;; No reph movement if preceded by a ZWJ.
-   ;;  1  23     4     5   6
+   ;;  1  23        4     5   6
    (" J(.)((H[^N])*)(u|b)?(p)?(l?a?) "
     | (1 =) (4 =) (5 =) (2 move-h) (6 = *) |)