From: ntakahas <ntakahas>
Date: Thu, 25 Mar 2010 10:29:24 +0000 (+0000)
Subject: (reorder): Add the patters JP and HJ before pstf.
X-Git-Tag: REL-1-6-0~17
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f0004ec7627a7c9fc59941fd4856e1b463a442a;p=m17n%2Fm17n-db.git

(reorder): Add the patters JP and HJ before pstf.
---

diff --git a/FLT/MLYM-OTF.flt b/FLT/MLYM-OTF.flt
index 01c18e5..746075d 100644
--- a/FLT/MLYM-OTF.flt
+++ b/FLT/MLYM-OTF.flt
@@ -90,15 +90,15 @@
    ;; Two-part vowel signs
    ((0x0D46 0x0D3E)
     (cond
-     ((font-facility 0x25CC) < 0x0D46 0x25CC 0x0D3E >)
+     ((font-facility 0x25CC) < = 0x25CC = >)
      (".+" < 0x0D4A >)))
    ((0x0D47 0x0D3E)
     (cond
-     ((font-facility 0x25CC) < 0x0D47 0x25CC 0x0D3E >)
+     ((font-facility 0x25CC) < = 0x25CC = >)
      (".+" < 0x0D4B >)))
    ((0x0D46 0x0D57)
     (cond
-     ((font-facility 0x25CC) < 0x0D46 0x25CC 0x0D57 >)
+     ((font-facility 0x25CC) < = 0x25CC = >)
      (".+" < 0x0D4C >)))
 
    ;; Combining marks are displayed with a DOTTED CIRCLE.
@@ -150,29 +150,28 @@
  (reorder
   (cond
    ;; pref after pstf
-   ("(.|.+[^PJ])((J?HP)*J?HR)$"
-    (1 reorder-B) (2 reorder-any))
+   ("(.|.+([^PJ]|JP))((J?HP)*J?HR)$"
+    (1 reorder-B *) (3 reorder-any *))
    ;; pref between blwf and pstf
    ("(.*[^J])(J?HR(J?HP)+)$"
-    (1 reorder-B) (2 reorder-any))
+    (1 reorder-B *) (2 reorder-any *))
    ;; pref before blwf
    ("(.*[^J])(J?HR(J?HB)+(J?HP)*)$"
-    (1 reorder-B) (2 reorder-any))
+    (1 reorder-B *) (2 reorder-any *))
    ;; no pref
-   ("(.|.+[^PJ])((J?HP)*)$"
-    (1 reorder-B) (2 reorder-any))
+   ("(.|.+([^PJ]|JP|HJ))((J?HP)*)$"
+    (1 reorder-B *) (3 reorder-any *))
    (".+" = *)))    
 
  (reorder-B
   (cond
-   ("J?(H)(B)(.*)"
-    (2 =) (1 =) (3 reorder-B))
-   ("(.)(.*)"
-    (1 =) (2 reorder-B))))
+   ("J?(H)(B)"
+    (2 =) (1 =))
+   ("." =)))
 
  (reorder-any
-  ("J?(H)(.)(.*)"
-   (2 =) (1 =) (3 reorder-any)))
+  ("J?(H)(.)"
+   (2 =) (1 =)))
  )
 
 ;; Stage 3