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

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

diff --git a/FLT/GURU-OTF.flt b/FLT/GURU-OTF.flt
index 8ed3b92..4c2c299 100644 (file)
--- a/FLT/GURU-OTF.flt
+++ b/FLT/GURU-OTF.flt
@@ -1,33 +1,14 @@
 ;; GURU-OTF.flt -- Font Layout Table for Gurmukhi OpenType fonts
-;; 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 guru-otf nil
+      (font (nil nil unicode-bmp :otf=guru=blwf)))
 
 ;;; <li> GURU-OTF.flt
 ;;;
 ;;; For Gurmukhi OpenType fonts to draw the Gurmukhi script.
 
-(font layouter guru-otf nil
-      (font (nil nil unicode-bmp :otf=guru=blwf)))
-
 (category
  ;; C: general consonant (except for R and Y)
  ;; R: consonant (below)
@@ -63,9 +44,11 @@
  (0x0A41 0x0A42        ?b)                     ; VOWEL SIGN U .. UU
  (0x0A47 0x0A4C        ?u)                     ; VOWEL SIGN EE .. AU
  (0x0A4D       ?H)                     ; SIGN VIRAMA
+;; (0x0A51     ?)                      ; SIGN UDAAT
  (0x0A59 0x0A5E        ?C)                     ; LETTER KHHA .. FA
  (0x0A70       ?A)                     ; TIPPI
  (0x0A71       ?d)                     ; ADDAK
+;; (0x0A75     ?)                      ; SIGN YAKASH
  (0x0964 0x0965        ?X)                     ; DANDA .. DOUBLE DANDA
  (0x200C       ?N)                     ; ZWNJ
  (0x200D       ?J)                     ; ZWJ
@@ -99,8 +82,8 @@
     < | (1 pre-below) (1 post) (3 = *) | >)
 
    ;; Add a ZWNJ explicitly when a syllable ends with a halant.
-   ;;1       2             3
-   ("([CRY]n?(H[CRY]n?)*)(H)?N?"
+   ;;1       2           3
+   ("([CRY]n?(H[CRY]n?)*)(HN?)?"
     < | (1 pre-below) (3 = 0x200C) (1 post) | >)
 
    ;; A syllable starting with an independent vowel.
@@ -156,12 +139,34 @@
  (0
   (cond
    (" ([^ ]+) "
-    (1 otf:guru=vatu,pres,abvs,blws,psts+abvm,blwm,dist))
+    (1 otf:guru=vatu,pres,abvs,blws,psts,haln+abvm,blwm,dist))
 
    ("."
     [ = ]))
   *))
 
+;; 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: