From: ntakahas <ntakahas>
Date: Fri, 26 Mar 2010 12:12:14 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-6-0~11
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=39d5cdcee61ea56d1fa1481668a48788867a9d93;p=m17n%2Fm17n-db.git

*** empty log message ***
---

diff --git a/FLT/DEVA-OTF.flt b/FLT/DEVA-OTF.flt
index b474191..839813d 100644
--- a/FLT/DEVA-OTF.flt
+++ b/FLT/DEVA-OTF.flt
@@ -107,7 +107,7 @@
    ("(RH)?(Vn?)((J?HR)?m?u?b?p?n?a?[sS]?t?A?)"
     < | (1 = =) (2 :otf=deva=nukt+) (3 = *) | >)
 
-   ;; Ordinary syllables
+   ;; Consonant-based syllables
    ;;1      23                 4
    ("([CR]n?((J?H|HJ?)[CR]n?)*)(H[NJ]?|m?u?b?p?n?a?[sS]?t?A?)"
     < |
@@ -175,8 +175,8 @@
     |
     (1 (cond ("RHJ" :otf=deva=half+)
 	     ("RH" :otf=deva=rphf+)))
-    (2 (cond ("(.H)(.+)" (1 :otf=deva=half+) (2 :otf=deva=blwf,half+))
-	     (".+" :otf=deva=blwf,half+)))
+    (2 (cond ("(.H)J?(.*)" (1 :otf=deva=half+) (2 lang-forms *))
+	     (".+" lang-forms *)))
     (3 = =) |)
 
    ;; Other syllables
diff --git a/FLT/GUJR-OTF.flt b/FLT/GUJR-OTF.flt
index 02c8c07..ececb3f 100644
--- 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)
diff --git a/FLT/ORYA-OTF.flt b/FLT/ORYA-OTF.flt
index f374231..fa35f01 100644
--- a/FLT/ORYA-OTF.flt
+++ b/FLT/ORYA-OTF.flt
@@ -147,9 +147,7 @@
 
  (reorder
   ("(.|.+([^YJ]|JY|HJ))((J?HY)*)$"
-   (1 reorder-BR *) (3 reorder-Y *))
-  ("(.*)(.HJ)$"
-   (1 reorder-BR) (2 = *)))
+   (1 reorder-BR *) (3 reorder-Y *)))
 
  (reorder-BR
   (cond