X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=FLT%2FCHAM-GENERIC.flt;h=3bf44cdf60395dc0484659d741a1a3d70fa55d23;hb=d78bb3bac0a2f338e4610c7a79be14b7abe5c70a;hp=c7caa3ea526125738d213fe2d9f1afa9d23f8420;hpb=f05b67fe35ea011fe99f5ebf9349c21fb8e5417f;p=m17n%2Fm17n-db.git

diff --git a/FLT/CHAM-GENERIC.flt b/FLT/CHAM-GENERIC.flt
index c7caa3e..3bf44cd 100644
--- a/FLT/CHAM-GENERIC.flt
+++ b/FLT/CHAM-GENERIC.flt
@@ -2,55 +2,45 @@
 ;; Copyright (C) 2008  AIST (H15PRO112)
 ;; See the end for copying conditions.
 
-(font layouter thai-generic nil
+(font layouter cham-generic nil
       (font (nil nil unicode-bmp :script=cham)))
 
-;;; <li> CHARM-GENERIC.flt
+;;; <li> CHAM-GENERIC.flt
 ;;;
 ;;; For the Cham proportional fonts to draw Cham script.
 
 (category
- ;; C: consonant normal
- ;; A: independent vowel A
- ;; I: independent vowel (except for A)
- ;; m: medial consonant (prefix)
- ;; M: medial consonant (postfix)
- ;; v: dependent vowel (prefix)
- ;; V: dependent vowel (postfix)
- ;; L: vowel lengthener
- ;; F: consonant sign final (independent)
- ;; f: consonant sign final (dependent)
- ;; E: else (independent)
- (0xAA00 0xAA5F	?E)
- (0xAA00	?A)
- (0xAA01 0xAA05	?I)
- (0xAA06 0xAA28	?C)
- (0xAA29	?L)
- (0xAA2A 0xAA32	?V)
- (0xAA2F	?v)
- (0xAA33 0xAA36	?M)
- (0xAA34	?m)
- (0xAA40 0xAA4B ?F)
- (0xAA43	?f)
- (0xAA4C 0xAA4D ?f))
+ (0xAA00 0xAA5F	?E) ;; E: anyting else (independent)
+ (0xAA00	?A) ;; A: independent vowel A
+ (0xAA01 0xAA05	?I) ;; I: independent vowel (except for A)
+ (0xAA06 0xAA28	?C) ;; C: consonant normal
+ (0xAA29	?L) ;; L: vowel lengthener
+ (0xAA2A 0xAA32	?V) ;; V: dependent vowel (postfix)
+ (0xAA2F 0xAA30	?v) ;; v: dependent vowel (prefix)
+ (0xAA33 0xAA36	?M) ;; M: medial consonant (postfix)
+ (0xAA34	?m) ;; m: medial consonant (prefix)
+ (0xAA40 0xAA4D ?F) ;; F: consonant sign final (independent)
+ (0xAA43	?f) ;; f: consonant sign final (dependent)
+ (0xAA4C	?f))
 
 (generator
  (0
   (cond
    ("([IA])(v?)(V?L?)([fF]?)"
     | < (2 =) (1 =) (3 = *) > (4 =) |)
-   ("([CA])(m?)(M?)(v?)(V?L?)([fF]?)"
-    | < (4 = ) (2 =) (1 =) (3 =) (4 = *) > (5 =) |)
+   ("([CA])(m?)(M?M?)(v?)(V?L?)([fF]?)"
+    | < (4 = ) (2 =) (1 =) (3 = *) (5 = *) > (6 =) |)
    ("."
-    =))
+    [ = ]))
   *))
 
 (generator
  (0
   (cond
-   (" .*f " < = * >)
-   (" .* " = *)
-   ("." =))))
+   (" (.*f) " < (1 = *) >)
+   (" (.*) " (1 = *))
+   ("." =))
+  *))
 
 ;; Copyright (C) 2008
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)