Change the mark name @tone to TONE.

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

diff --git a/FLT/BENG-OTF.flt b/FLT/BENG-OTF.flt
index 4739de9..627c9ce 100644 (file)
--- a/FLT/BENG-OTF.flt
+++ b/FLT/BENG-OTF.flt
@@ -1,33 +1,14 @@
 ;; BENG-OTF.flt -- Font Layout Table for Bengali OpenType font
-;; Copyright (C) 2004, 2007
-;;   National Institute of Advanced Industrial Science and Technology (AIST)
-;;   Registration Number H15PRO112
+;; Copyright (C) 2004, 2007  AIST (H15PRO112)
+;; See the end for copying conditions.
 
-;; This file is part of the m17n database; a sub-part of the m17n
-;; library.
-
-;; The m17n library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public License
-;; as published by the Free Software Foundation; either version 2.1 of
-;; the License, or (at your option) any later version.
-
-;; The m17n library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
-
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with the m17n library; if not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+(font layouter beng-otf nil
+      (font (nil nil unicode-bmp :otf=beng=rphf)))
 
 ;;; <li> BENG-OTF.flt
 ;;;
 ;;; For Bengali OpenType fonts to draw the Bengali script.  
 
-(font layouter beng-otf nil
-      (font (nil nil unicode-bmp :otf=beng=rphf)))
-
 (category
  ;; X: generic
  ;; V: independent vowel
@@ -103,10 +84,6 @@
    ("(RH)?(T)"
     < | (2 =) (1 otf:beng=rphf+) | >)
 
-   ;; Standalone Ya-phalaa
-   ("JHY"
-    < | post | >)
-
    ;; A syllable with a pre-base vowel sign.
    ;;1    2        3      4       5       6  7   8   9
    ("(RH)?([CRBY]n?(HCn?)*(H[RB])?(J?HY)?)(m)(p)?(A)?(a)?"
@@ -129,9 +106,9 @@
     < | (2 pre-below) (6 =) (1 otf:beng=rphf+) (2 post) | >)
 
    ;; A syllable starting with an independent vowel.
-   ;;1  2      3
-   ("(V)(J?HY)?(A?a?)"
-    < | (1 =) 0x0980 (2 post) (3 = *) | >)
+   ;;1  2  3  4  5    6
+   ("(V)(J?(H)(Y)(p))?(A?a?)"
+    < | (1 =) 0x0980 (4 =) (3 =) (5 =) (6 = *) | >)
 
    ("." =))
   *)
@@ -153,9 +130,7 @@
  (post
   (cond
    (".*(H)(Y)$"
-    (2 =) (1 =))
-   (".+"
-    ))))
+    (2 =) (1 =)))))
 
 ;; Apply 'nukt' and 'akhn'.
 (generator
@@ -172,8 +147,6 @@
   (cond
    (" (N?m?.)([^Z]*)(Z)([^ ]*) "
     | (1 = *) (2 otf:beng=blwf+) (3 =) (4 otf:beng=pstf+) |)
-   (" (YH) "
-    | (1 otf:beng=pstf+) |)
    ("." =))
   *))
 
@@ -212,6 +185,28 @@
     [ = ]))
   *))
 
+;; Copyright (C) 2004, 2007
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H15PRO112
+
+;; This file is part of the m17n database; a sub-part of the m17n
+;; library.
+
+;; The m17n library is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public License
+;; as published by the Free Software Foundation; either version 2.1 of
+;; the License, or (at your option) any later version.
+
+;; The m17n library is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; Lesser General Public License for more details.
+
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with the m17n library; if not, write to the Free
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
 ;; Local Variables:
 ;; mode: emacs-lisp
 ;; End: