*** empty log message ***

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

diff --git a/FLT/GUJR-OTF.flt b/FLT/GUJR-OTF.flt
index d01e7d3..ececb3f 100644 (file)
--- a/FLT/GUJR-OTF.flt
+++ b/FLT/GUJR-OTF.flt
@@ -61,10 +61,12 @@
    ;; Consonant-based syllables
    ;;1      23                 4
    ("([CR]n?((J?H|HJ?)[CR]n?)*)(H[NJ]?|m?u?b?p?n?a?A?)"
-    < | (1 :otf=gujr=nukt,akhn+)
-    (4 (cond ("HJ" = =)
-            ("(H)N?" (1 =) 0x200C)
-            (".+" = *))) | >)
+    < |
+    (cond
+     (".+HJ$" :otf=gujr=nukt,akhn+)
+     ("(.+)(H)N?$" (1 :otf=gujr=nukt,akhn+) (2 =) 0x200C)
+     (".+" :otf=gujr=nukt,akhn+))
+    | >)
 
    ;; Combining marks are displayed with a DOTTED CIRCLE.
    ("m"
@@ -105,11 +107,13 @@
    ("." =))
   *)
 
+ ;; In Devanagari and Gujarati, vattu has a half form.  Thus we handle
+ ;; the sequence CHRHC as (CH)half + (RH)blwf + C instead of
+ ;; reordering and interpreting it as C + (RH)blwf + H + C.
  (reorder
   (cond
-   ("J?(H)(R)$" (2 =) (1 =))
-   ("J?(HR)(.+)$" (1 = =) (2 reorder))
-   ("(.)(.*)$" (1 =) (2 reorder))))
+   ("(.+)(H)(R)$" (1 = *) (3 =) (2 =))
+   (".+" = *)))
  )
 
 ;; Stage 2
@@ -122,8 +126,8 @@
     |
     (1 (cond ("RHJ" :otf=gujr=half+)
             ("RH" :otf=gujr=rphf+)))
-    (2 (cond ("(.H)(.+)" (1 :otf=gujr=half+) (2 :otf=gujr=blwf,half+))
-            (".+" :otf=gujr=blwf,half+)))
+    (2 (cond ("(.H)J?(.*)" (1 :otf=gujr=half+) (2 lang-forms *))
+            (".+" lang-forms *)))
     (3 = =) |)
 
    ;; Other syllables
@@ -132,12 +136,19 @@
     | (3 = *)
     (1 (cond ("RHJ" :otf=gujr=half+)
             ("RH" :otf=gujr=rphf+)))
-    (2 (cond ("(.H)(.+)" (1 :otf=gujr=half+) (2 :otf=gujr=blwf,half+))
-            (".+" :otf=gujr=blwf,half+)))
+    (2 (cond ("(.H)J?(.*)" (1 :otf=gujr=half+) (2 lang-forms *))
+            (".+" lang-forms *)))
     (5 = *) (4 = *) (6 = *) |)
 
    ("." =))
-  *))
+  *)
+
+ (lang-forms
+  (cond
+   ("(.H)J" (1 :otf=gujr=half+))
+   (".H" :otf=gujr=blwf,half+)
+   ("." =)))
+ )
 
 ;; Stage 3
 ;; Final reordering #1 (Move pre-base matra after the last halant)