From: ntakahas <ntakahas>
Date: Thu, 28 Jun 2007 05:36:16 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-4-0~19
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a25f611081a2d37ee9685951d2f32be997a1b99d;p=m17n%2Fm17n-db.git

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

diff --git a/ChangeLog b/ChangeLog
index 6c9d196..0e2897f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-28  TAKAHASHI Naoto  <ntakahas@m17n.org>
+
+	* FLT/DEVA-OTF.flt: Rewritten with new algorithm for Unicode 5.0.
+
 2007-06-22  TAKAHASHI Naoto  <ntakahas@m17n.org>
 
 	* FLT/DEVA-OTF.flt: Avoid applying OTF features over post-base mark (Z).
diff --git a/FLT/DEVA-OTF.flt b/FLT/DEVA-OTF.flt
index d413813..657a25c 100644
--- a/FLT/DEVA-OTF.flt
+++ b/FLT/DEVA-OTF.flt
@@ -156,27 +156,29 @@
 (generator
  (0
   (cond
-   (" (m)?([^ ]+) "
-    | (1 =) (2 otf:deva=pres+) |)
+   (" (m)?([^Z ]+)(Z[^ ]*) "
+    | (1 =) (2 otf:deva=pres+) (3 = *) |)
    ("." =))
   *))
 
-;; When the number of glyphs between a pre-base vowel modifier and the
-;; post-base mark is more than one, move the pre-base vowel before the
-;; base glyph.
+;; When the number of glyphs between a pre-base vowel sign and the
+;; post-base mark is more than one, move the pre-base vowel sign
+;; before the base glyph.
 (generator
  (0
   (cond
-   (" (m)([^Z ]+)([^Z ])Z([^ ]*) "
+;;   (" (m)([^ZH ]+)(H)([^Z ])Z([^ ]*) "
+;;    | (2 = *) (3 =) (1 =) (4 =) (5 = *) |)
+   (" (m)([^Z]+)([^Z])Z([^ ]*) "
     | (2 = *) (1 =) (3 =) (4 = *) |)
-   (" ([^Z ]+)Z([^ ]*) "
+   (" ([^Z]+)Z([^ ]*) "
     | (1 = *) (2 = *) |)
    ("." =))
   *))
 
 ;; Apply other features.  The 'vatu' feature is applied again to get
 ;; base and post-base conjunct.  The 'pres' feature is also applied
-;; again for pre-base vowel modifier.
+;; again for pre-base vowel sign.
 (generator
  (0
   (cond