*** empty log message ***

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

diff --git a/FLT/MLYM-OTF.flt b/FLT/MLYM-OTF.flt
index 746075d..67f9bf2 100644 (file)
--- a/FLT/MLYM-OTF.flt
+++ b/FLT/MLYM-OTF.flt
@@ -59,14 +59,6 @@
    ((0x0D4B) 0x0D47 0x0D3E)
    ((0x0D4C) 0x0D46 0x0D57)
 
-   ;; Chillu letters
-   ((0x0D23 0x0D4D 0x200D) :otf=mlym=akhn,half,haln+)
-   ((0x0D28 0x0D4D 0x200D) :otf=mlym=akhn,half,haln+)
-   ((0x0D30 0x0D4D 0x200D) :otf=mlym=akhn,half,haln+)
-   ((0x0D32 0x0D4D 0x200D) :otf=mlym=akhn,half,haln+)
-   ((0x0D33 0x0D4D 0x200D) :otf=mlym=akhn,half,haln+)
-   ((0x0D15 0x0D4D 0x200D) :otf=mlym=akhn,half,haln+)
-
    ("." =))
   *))
 
@@ -78,10 +70,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?"
@@ -91,15 +85,15 @@
    ((0x0D46 0x0D3E)
     (cond
      ((font-facility 0x25CC) < = 0x25CC = >)
-     (".+" < 0x0D4A >)))
+     (".+" [ 0x0D4A ])))
    ((0x0D47 0x0D3E)
     (cond
      ((font-facility 0x25CC) < = 0x25CC = >)
-     (".+" < 0x0D4B >)))
+     (".+" [ 0x0D4B ])))
    ((0x0D46 0x0D57)
     (cond
      ((font-facility 0x25CC) < = 0x25CC = >)
-     (".+" < 0x0D4C >)))
+     (".+" [ 0x0D4C ])))
 
    ;; Combining marks are displayed with a DOTTED CIRCLE.
    ("m"
@@ -160,8 +154,7 @@
     (1 reorder-B *) (2 reorder-any *))
    ;; no pref
    ("(.|.+([^PJ]|JP|HJ))((J?HP)*)$"
-    (1 reorder-B *) (3 reorder-any *))
-   (".+" = *)))    
+    (1 reorder-B *) (3 reorder-any *))))
 
  (reorder-B
   (cond