Change the mark name @tone to TONE.

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

diff --git a/FLT/ORYA-OTF.flt b/FLT/ORYA-OTF.flt
index b0a4f67..2673409 100644 (file)
--- a/FLT/ORYA-OTF.flt
+++ b/FLT/ORYA-OTF.flt
@@ -1,33 +1,14 @@
 ;; ORYA-OTF.flt -- Font Layout Table for Oriya OpenType font
-;; 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.
+;; Copyright (C) 2004, 2007, 2008 AIST (H15PRO112)
+;; See the end for copying conditions.
 
-;; 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 orya-otf nil
+      (font (nil nil unicode-bmp :otf=orya=rphf)))
 
 ;;; <li> ORYA-OTF.flt
 ;;;
 ;;; For Oriya OpenType fonts to draw the Oriya script.
 
-(font layouter orya-otf nil
-      (font (nil nil unicode-bmp :otf=orya=rphf)))
-
 (category
  ;; C: consonant (except for R, B and Y)
  ;; R: consonant RA
@@ -63,7 +44,7 @@
  (0x0B3E       ?p)                     ; VOWEL SIGN AA
  (0x0B3F       ?u)                     ; VOWEL SIGN I
  (0x0B40       ?p)                     ; VOWEL SIGN II
- (0x0B41 0x0B43        ?b)                     ; VOWEL SIGN U .. VOCALIC R
+ (0x0B41 0x0B44        ?b)                     ; VOWEL SIGN U .. VOCALIC RR
  (0x0B47       ?m)                     ; VOWEL SIGN E
  (0x0B48 0x0B4C ?t)                    ; VOWEL SIGN AI .. AU
  (0x0B4D       ?H)                     ; SIGN VIRAMA
@@ -72,6 +53,7 @@
  (0x0B5C 0x0B5D        ?C)                     ; LETTER RRA .. RHA
  (0x0B5F       ?Y)                     ; LETTER YYA
  (0x0B60 0x0B61        ?V)                     ; LETTER VOCALIC RR .. LL
+ (0x0B62 0x0B63 ?b)                    ; VOWEL SIGN VOCALIC L .. LL
  (0x0B71       ?C)                     ; LETTER WA
  (0x0B64 0x0B65        ?X)                     ; DANDA .. DOUBLE DANDA
  (0x200C       ?N)                     ; ZWNJ
@@ -121,7 +103,7 @@
 
    ;; Add a ZWNJ explicitly when a syllable ends with a halant.
    ;;1  23                    4
-   ("(J)(([CRBY]n?H)*[CRBY]n?)(HN|H)?"
+   ("(J)(([CRBY]n?H)*[CRBY]n?)(HN?)?"
     < | (1 =) (2 pre-below) (4 = 0x200C) (2 post) | >)
 
    ;; With a pre-base vowel sign, without a ZWJ.
@@ -143,7 +125,7 @@
 
    ;; Add a ZWNJ explicitly when a syllable ends with a halant.
    ;;1    23                    4
-   ("(RH)?(([CRBY]n?H)*[CRBY]n?)(HN|H)?"
+   ("(RH)?(([CRBY]n?H)*[CRBY]n?)(HN?)?"
     < | (2 pre-below) (1 otf:orya=rphf) (4 = 0x200C) (2 post) | >)
 
    ;; A syllable starting with an independent vowel.
@@ -225,6 +207,28 @@
     [ = ]))
   *))
 
+;; Copyright (C) 2004, 2007, 2008
+;;   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: