From: ntakahas <ntakahas>
Date: Fri, 26 Mar 2010 07:02:30 +0000 (+0000)
Subject: Include syllable final HJ to otf part.
X-Git-Tag: REL-1-6-0~13
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=94c0ba210b4f8ad7aedb7d964f378811fd029807;p=m17n%2Fm17n-db.git

Include syllable final HJ to otf part.
---

diff --git a/FLT/BENG-OTF.flt b/FLT/BENG-OTF.flt
index 1e3c8dc..f76c912 100644
--- a/FLT/BENG-OTF.flt
+++ b/FLT/BENG-OTF.flt
@@ -111,10 +111,12 @@
    ;; Consonant-based syllables
    ;;1        23                   4
    ("([CBYR]n?((J?H|HJ?)[CBYR]n?)*)(H[NJ]?|m?([NJ]?b)?p?n?a?A?)"
-    < | (1 :otf=beng=nukt,akhn+)
-    (4 (cond ("HJ" = =)
-	     ("(H)N?" (1 =) 0x200C)
-	     (".+" = *))) | >)
+    < |
+    (cond
+     (".+HJ$" :otf=beng=nukt,akhn+)
+     ("(.+)(H)N?$" (1 :otf=beng=nukt,akhn+) (2 =) 0x200C)
+     (".+" :otf=beng=nukt,akhn+))
+    | >)
 
    ;; Two-part vowel signs
    ((0x09C7 0x09BE)
diff --git a/FLT/MLYM-OTF.flt b/FLT/MLYM-OTF.flt
index 746075d..c7346e3 100644
--- a/FLT/MLYM-OTF.flt
+++ b/FLT/MLYM-OTF.flt
@@ -78,10 +78,12 @@
    ;; Consonant-based syllables
    ;;1      23                 4
    ("([CBPR]((J?H|HJ?)[CBPR])*)(H[NJ]?|m?p?A?)"
-    < | (1 :otf=mlym=akhn+)
-    (4 (cond ("HJ" = =)
-	     ("(H)N?" (1 =) 0x200C)
-	     (".+" = *))) | >)
+    < |
+    (cond
+     (".+HJ$" :otf=mlym=nukt,akhn+)
+     ("(.+)(H)N?$" (1 :otf=mlym=nukt,akhn+) (2 =) 0x200C)
+     (".+" :otf=mlym=nukt,akhn+))
+    | >)
 
    ;; Syllables with an independent vowel
    ("V(J?H[BPR])?m?p?A?"
diff --git a/FLT/ORYA-OTF.flt b/FLT/ORYA-OTF.flt
index c057793..f374231 100644
--- a/FLT/ORYA-OTF.flt
+++ b/FLT/ORYA-OTF.flt
@@ -84,10 +84,12 @@
    ;; Consonant-based syllables
    ;;1        23                   4
    ("([CBYR]n?((J?H|HJ?)[CBYR]n?)*)(H[NJ]?|m?u?b?p?n?a?A?)"
-    < | (1 :otf=orya=nukt,akhn+)
-    (4 (cond ("HJ" = =)
-	     ("(H)N?" (1 =) 0x200C)
-	     (".+" = *))) | >)
+    < |
+    (cond
+     (".+HJ$" :otf=orya=nukt,akhn+)
+     ("(.+)(H)N?$" (1 :otf=orya=nukt,akhn+) (2 =) 0x200C)
+     (".+" :otf=orya=nukt,akhn+))
+    | >)
 
    ;; Two-part vowel signs
    ((0x0B47 0x0B56)