X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=generic.fst;h=1765b0292f1b7daa7e006ab50f35d2a21850a28d;hb=133ee7c99151e7cb352b24c976dc66882714444f;hp=15f698067950f3611ed641bd822a24b3c812a9c6;hpb=f253b0d35472f1968fb1f3710f815948ba16feff;p=m17n%2Fm17n-db.git

diff --git a/generic.fst b/generic.fst
index 15f6980..1765b02 100644
--- a/generic.fst
+++ b/generic.fst
@@ -1,25 +1,6 @@
-;; generic.fst -- Fontset mainly using generic font specs.  -*- lisp -*-
-;; Copyright (C) 2005, 2006, 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.
+;; generic.fst -- Fontset mainly using generic font specs.
+;; Copyright (C) 2005, 2006, 2007, 2010  AIST (H15PRO112)
+;; See the end for copying conditions.
 
 ;;; <li> generic.fst
 ;;;
@@ -31,85 +12,123 @@
  (vi
   ((nil nil unicode-bmp :lang=vi)))
  (nil
-  ((nil nil unicode-bmp :lang=en))))
+  ((nil nil unicode-bmp :script=latin))))
 (hebrew
  (nil
-  ((nil freesans unicode-bmp) hebr)
-  ((nil nil unicode-bmp :lang=he,yi))))
+  ((nil nil unicode-bmp :otf=hebr) hebr-otf)
+  ((nil nil unicode-bmp :script=hebrew))))
 (arabic
  (nil
   ((nil nil unicode-bmp :otf=arab=init,medi,fina,liga+mark) arab-otf)
   ((nil nil unicode-bmp :otf=arab=init,medi,fina,liga+~mark) arab-otf-no-gpos)
-  ((nil bitstream\ cyberbase unicode-bmp) arab)))
+  ((nil nil unicode-bmp :script=arabic) arab)))
 (syriac
  (nil
   ((nil nil unicode-bmp :otf=syrc) syrc-otf)))
 (thaana
  (nil
   ((nil nil unicode-bmp :otf=thaa) thaa-otf)
-  ((nil thaana\ unicode\ akeh unicode-bmp) thaa-otf)))
+  ((nil nil unicode-bmp :script=thaana))))
 (devanagari
  (nil
-  ((nil nil unicode-bmp :otf=deva=rphf) deva-otf)
-  ((nil dv-ttyogesh apple-roman) deva-cdac)))
+  ((nil nil unicode-bmp :otf=dev2) dev2-otf)
+  ((nil nil unicode-bmp :otf=deva) deva-otf)))
 (bengali
  (nil
-  ((nil nil unicode-bmp :otf=beng=rphf) beng-otf)))
+  ((nil nil unicode-bmp :otf=bng2) bng2-otf)
+  ((nil nil unicode-bmp :otf=beng) beng-otf)))
 (gurmukhi
  (nil
-  ((nil nil unicode-bmp :otf=guru=vatu) guru-otf)))
+  ((nil nil unicode-bmp :otf=gur2) gur2-otf)
+  ((nil nil unicode-bmp :otf=guru) guru-otf)))
 (gujarati
  (nil
-  ((nil nil unicode-bmp :otf=gujr=rphf) gujr-otf)))
+  ((nil nil unicode-bmp :otf=gjr2) gjr2-otf)
+  ((nil nil unicode-bmp :otf=gujr) gujr-otf)))
 (oriya
  (nil
-  ((nil nil unicode-bmp :otf=orya=rphf) orya-otf)))
+  ((nil nil unicode-bmp :otf=ory2) ory2-otf)
+  ((nil nil unicode-bmp :otf=orya) orya-otf)))
 (tamil
  (nil
-  ((nil nil unicode-bmp :otf=taml=akhn) taml-otf)))
+  ((nil nil unicode-bmp :otf=tml2) tml2-otf)
+  ((nil nil unicode-bmp :otf=taml) taml-otf)))
 (telugu
  (nil
-  ((nil nil unicode-bmp :otf=telu=haln) telu-otf)))
+  ((nil nil unicode-bmp :otf=tel2) tel2-otf)
+  ((nil nil unicode-bmp :otf=telu) telu-otf)))
 (kannada
  (nil
-  ((nil nil unicode-bmp :otf=knda=rphf) knda-otf)))
+  ((nil nil unicode-bmp :otf=knd2) knd2-otf)
+  ((nil nil unicode-bmp :otf=knda) knda-otf)))
+(malayalam
+ (nil
+  ((nil nil unicode-bmp :otf=mlm2) mlm2-otf)
+  ((nil nil unicode-bmp :otf=mlym) mlym-otf)))
 (sinhala
  (nil
-  ((nil nil unicode-bmp :otf=sinh=akhn) sinh-otf)))
-(malayalam
+  ((nil nil unicode-bmp :otf=sinh) sinh-otf)))
+(tibetan
  (nil
-  ((nil nil unicode-bmp :otf=mlym=haln) mlym-otf)))
+  ((nil nil unicode-bmp :otf=tibt) tibt-otf)))
 (thai
  (nil
-  ((nil nil unicode-bmp :otf=thai+mark,mkmk) thai-otf)
-  ((nil norasi unicode-bmp) thai-norasi)
-  ((nil nil unicode-bmp :lang=th) thai-generic)))
+  ((nil nil unicode-bmp :otf=thai) thai-otf)
+  ((nil nil unicode-bmp :script=thai) thai-generic)))
 (lao
  (nil
-  ((nil alice0\ lao apple-roman) laoo-alice)
-  ((nil nil unicode-bmp :lang=lo) laoo-generic)))
-(tibetan
- (nil
-  ((nil nil unicode-bmp :otf=tibt=ccmp,blws,abvs) tibt-otf)))
-  ((nil mtib unicode-bmp) tibt-mtib)))
+  ((nil nil unicode-bmp :otf=laoo) laoo-otf)
+  ((nil nil unicode-bmp :script=lao) laoo-generic)))
 (myanmar
  (nil
-  ((nil myazedi_m17n unicode-bmp) mymr-myazedi)))
+  ((nil padauk unicode-bmp) mymr-sil)))
 (khmer
  (nil
-  ((nil nil unicode-bmp :otf=khmr=pres) khmr-otf)
-  ((nil anlongvill\ khek apple-roman) khmr-anlong)))
-(hiragana
+  ((nil nil unicode-bmp :otf=khmr) khmr-otf)))
+(han
+ (zh
+  ((nil nil unicode-bmp :lang=zh)))
  (ja
+  ((nil nil unicode-bmp :lang=ja)))
+ (ko
+  ((nil nil unicode-bmp :lang=ko))))
+(hiragana
+ (nil
   ((nil nil unicode-bmp :lang=ja))))
 (katakana
- (ja
+ (nil
   ((nil nil unicode-bmp :lang=ja))))
-(han
- (ja
-  ((nil nil unicode-bmp :lang=ja)))
- (zh
-  ((nil nil unicode-bmp :lang=zh))))
-
+(hangul
+ (nil
+  ((nil nil unicode-bmp :lang=ko))))
+(cham
+ (nil
+  ((nil nil unicode-bmp :script=cham) cham-generic)))
 (nil
  ((nil nil unicode-bmp)))
+
+;; Copyright (C) 2003, 2004, 2007, 2010
+;;   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: lisp
+;; End: