*** empty log message ***

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

diff --git a/FLT/GUJR-OTF.flt b/FLT/GUJR-OTF.flt
index 02c8c07..ececb3f 100644 (file)
--- a/FLT/GUJR-OTF.flt
+++ b/FLT/GUJR-OTF.flt
@@ -126,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
@@ -136,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)