X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=8eeee2c36b67612e70c6a39adb1d0fcf36bdddc3;hb=45e4cd5502a658015454a5ee850ec07053e1a756;hp=c0a951b924c62aa636756afdd6f000d12a114bc9;hpb=2de08ae8eb4fc3dc993663c7b184f34a0c4477ac;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index c0a951b..8eeee2c 100644 --- a/lisp/mule/mule-coding.el +++ b/lisp/mule/mule-coding.el @@ -4,7 +4,8 @@ ;; Licensed to the Free Software Foundation. ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1995 Sun Microsystems. -;; Copyright (C) 1997,1999,2002,2003,2004 MORIOKA Tomohiko +;; Copyright (C) 1997, 1999, 2002, 2003, 2004, 2005, 2006, 2008, 2009, +;; 2010, 2011 MORIOKA Tomohiko ;; This file is part of XEmacs. @@ -124,12 +125,20 @@ (make-coding-system 'iso-2022-jp-2 'iso2022 "ISO-2022 coding system using SS2 for 96-charset in 7-bit code." - '(charset-g0 ascii - charset-g2 t ;; unspecified but can be used later. - seven t - short t - mnemonic "ISO7/SS" - eol-type nil)) + (let ((conf + '(charset-g0 ascii + charset-g2 t ;; unspecified but can be used later. + seven t + short t + mnemonic "ISO7/SS" + eol-type nil))) + (if (featurep 'utf-2000) + (list* 'ccs-priority-list + '(ascii + =jis-x0208@1983 =jis-x0208@1978 + latin-jisx0201) + conf) + conf))) (make-coding-system 'iso-2022-7bit 'iso2022 @@ -172,31 +181,71 @@ )) (when (featurep 'utf-2000) + (setq decomposition-feature-list + '(=decomposition + =decomposition@cid + =decomposition@hanyo-denshi)) + (setq coded-charset-entity-reference-alist - '(((ideograph-gt . isolated) "I-GT-" 5 d) + '(((=adobe-japan1-6 . isolated) "I-AJ1-" 5 d) + ( =adobe-japan1-6 "AJ1-" 5 d) + ((=adobe-japan1-base . isolated) "I-AJ1-" 5 d) + ( =adobe-japan1-base "I-AJ1-" 5 d) + ((=gt . isolated) "I-GT-" 5 d) + ( =gt "GT-" 5 d) + ( =zinbun-oracle "ZOB-" 4 d) ((=ruimoku-v6 . isolated) "I-RUI6-" 4 X) - ((chinese-big5-cdp . isolated) "I-CDP-" 4 X) - ((ideograph-gt-k . isolated) "I-GT-K" 5 d) - ((ideograph-cbeta . isolated) "I-CB" 5 d) - ((ideograph-hanziku-1 . isolated) "I-HZK01-" 4 X) - ((ideograph-hanziku-2 . isolated) "I-HZK02-" 4 X) - ((ideograph-hanziku-3 . isolated) "I-HZK03-" 4 X) - ((ideograph-hanziku-4 . isolated) "I-HZK04-" 4 X) - ((ideograph-hanziku-5 . isolated) "I-HZK05-" 4 X) - ((ideograph-hanziku-6 . isolated) "I-HZK06-" 4 X) - ((ideograph-hanziku-7 . isolated) "I-HZK07-" 4 X) - ((ideograph-hanziku-8 . isolated) "I-HZK08-" 4 X) - ((ideograph-hanziku-9 . isolated) "I-HZK09-" 4 X) - ((ideograph-hanziku-10 . isolated) "I-HZK10-" 4 X) - ((ideograph-hanziku-11 . isolated) "I-HZK11-" 4 X) - ((ideograph-hanziku-12 . isolated) "I-HZK12-" 4 X) - ((japanese-jisx0208-1990 . isolated) "I-J90-" 4 X) - ((japanese-jisx0208 . isolated) "I-J83-" 4 X) - ((japanese-jisx0213-1 . isolated) "I-JX1-" 4 X) - ((japanese-jisx0213-2 . isolated) "I-JX2-" 4 X) - ((japanese-jisx0212 . isolated) "I-JSP-" 4 X) - ((japanese-jisx0208-1978 . isolated) "I-J78-" 4 X) + ( =ruimoku-v6 "RUI6-" 4 X) + ((=big5-cdp . isolated) "I-CDP-" 4 X) + ( =big5-cdp "CDP-" 4 X) + ((=daikanwa@rev2 . isolated) "I-M-" 5 d) + ( =daikanwa "M-" 5 d) + ( =daikanwa@rev2 "r2M-" 5 d) + ( =daikanwa@rev1 "r1M-" 5 d) + ((=gt-k . isolated) "I-GT-K" 5 d) + ( =gt-k "GT-K" 5 d) + ((=cbeta . isolated) "I-CB" 5 d) + ( =cbeta "CB" 5 d) + ((=hanziku-1 . isolated) "I-HZK01-" 4 X) + ( =hanziku-1 "HZK01-" 4 X) + ((=hanziku-2 . isolated) "I-HZK02-" 4 X) + ( =hanziku-2 "HZK02-" 4 X) + ((=hanziku-3 . isolated) "I-HZK03-" 4 X) + ( =hanziku-3 "HZK03-" 4 X) + ((=hanziku-4 . isolated) "I-HZK04-" 4 X) + ( =hanziku-4 "HZK04-" 4 X) + ((=hanziku-5 . isolated) "I-HZK05-" 4 X) + ( =hanziku-5 "HZK05-" 4 X) + ((=hanziku-6 . isolated) "I-HZK06-" 4 X) + ( =hanziku-6 "HZK06-" 4 X) + ((=hanziku-7 . isolated) "I-HZK07-" 4 X) + ( =hanziku-7 "HZK07-" 4 X) + ((=hanziku-8 . isolated) "I-HZK08-" 4 X) + ( =hanziku-8 "HZK08-" 4 X) + ((=hanziku-9 . isolated) "I-HZK09-" 4 X) + ( =hanziku-9 "HZK09-" 4 X) + ((=hanziku-10 . isolated) "I-HZK10-" 4 X) + ( =hanziku-10 "HZK10-" 4 X) + ((=hanziku-11 . isolated) "I-HZK11-" 4 X) + ( =hanziku-11 "HZK11-" 4 X) + ((=hanziku-12 . isolated) "I-HZK12-" 4 X) + ( =hanziku-12 "HZK12-" 4 X) + ((=jis-x0208@1990 . isolated) "I-J90-" 4 X) + ((=jis-x0208@1983 . isolated) "I-J83-" 4 X) + ((=jis-x0213-1@2000 . isolated) "I-JX1-" 4 X) + ((=jis-x0213-2 . isolated) "I-JX2-" 4 X) + ((=jis-x0213-1@2004 . isolated) "I-JX3-" 4 X) + ((=jis-x0212 . isolated) "I-JSP-" 4 X) + ((=jis-x0208@1978/1pr . isolated) "I-J78-" 4 X) + ( =jis-x0208@1990 "J90-" 4 X) + ((=jis-x0208 . isolated) "I-J90-" 4 X) + ( =jis-x0213-1@2000 "JX1-" 4 X) + ( =jis-x0213-2 "JX2-" 4 X) + ( =jis-x0213-1@2004 "JX3-" 4 X) + ( =jis-x0212 "JSP-" 4 X) + ( =jis-x0208@1983 "J83-" 4 X) ((chinese-gb2312 . isolated) "I-G0-" 4 X) + ((=iso-ir165 . isolated) "I-EGB-" 4 X) ((chinese-cns11643-1 . isolated) "I-C1-" 4 X) ((chinese-cns11643-2 . isolated) "I-C2-" 4 X) ((chinese-cns11643-3 . isolated) "I-C3-" 4 X) @@ -205,9 +254,7 @@ ((chinese-cns11643-6 . isolated) "I-C6-" 4 X) ((chinese-cns11643-7 . isolated) "I-C7-" 4 X) ((korean-ksc5601 . isolated) "I-K0-" 4 X) - ((=iso-ir165 . isolated) "I-EGB-" 4 X) - ((ideograph-daikanwa . isolated) "I-M-" 5 d) - ((chinese-big5 . isolated) "I-B-" 4 X) + ((=big5-eten . isolated) "I-B-" 4 X) ((latin-iso8859-1 . isolated) "I-LATIN1-" 2 X) ((latin-iso8859-2 . isolated) "I-LATIN2-" 2 X) ((latin-iso8859-3 . isolated) "I-LATIN3-" 2 X) @@ -229,34 +276,35 @@ ((arabic-digit . isolated) "I-MULE-ARBD-" 2 X) ((ipa . isolated) "I-MULE-IPA-" 2 X) ((china3-jef . isolated) "I-JC3-" 4 X) - ( ideograph-gt "GT-" 5 d) - ( =ruimoku-v6 "RUI6-" 4 X) - ( chinese-big5-cdp "CDP-" 4 X) - ( ideograph-daikanwa "M-" 5 d) - ( ideograph-gt-k "GT-K" 5 d) - ( ideograph-cbeta "CB" 5 d) - ( ideograph-hanziku-1 "HZK01-" 4 X) - ( ideograph-hanziku-2 "HZK02-" 4 X) - ( ideograph-hanziku-3 "HZK03-" 4 X) - ( ideograph-hanziku-4 "HZK04-" 4 X) - ( ideograph-hanziku-5 "HZK05-" 4 X) - ( ideograph-hanziku-6 "HZK06-" 4 X) - ( ideograph-hanziku-7 "HZK07-" 4 X) - ( ideograph-hanziku-8 "HZK08-" 4 X) - ( ideograph-hanziku-9 "HZK09-" 4 X) - ( ideograph-hanziku-10 "HZK10-" 4 X) - ( ideograph-hanziku-11 "HZK11-" 4 X) - ( ideograph-hanziku-12 "HZK12-" 4 X) - ((ideograph-hanziku-1 . isolated) "I-HZK1-" 4 X) - ( ideograph-hanziku-1 "HZK1-" 4 X) - ((ideograph-hanziku-2 . isolated) "I-HZK2-" 4 X) - ( ideograph-hanziku-2 "HZK2-" 4 X) - ( japanese-jisx0208-1990 "J90-" 4 X) - ( japanese-jisx0208 "J83-" 4 X) - ( japanese-jisx0213-1 "JX1-" 4 X) - ( japanese-jisx0213-2 "JX2-" 4 X) - ( japanese-jisx0212 "JSP-" 4 X) - ( japanese-jisx0208-1978 "J78-" 4 X) + ((=hanyo-denshi/ja . isolated) "I-HD-JA-" 4 X) + ((=hanyo-denshi/jb . isolated) "I-HD-JB-" 4 X) + ((=hanyo-denshi/jc . isolated) "I-HD-JC-" 4 X) + ((=hanyo-denshi/jd . isolated) "I-HD-JD-" 4 X) + ((=hanyo-denshi/ft . isolated) "I-HD-FT-" 4 X) + ((=hanyo-denshi/ia . isolated) "I-HD-IA-" 4 X) + ((=hanyo-denshi/ib . isolated) "I-HD-IB-" 4 X) + ((=hanyo-denshi/hg . isolated) "I-HD-HG-" 4 X) + ((=hanyo-denshi/ip . isolated) "I-HD-IP-" 4 X) + ((=hanyo-denshi/jt . isolated) "I-HD-JT-" 4 X) + ((=hanyo-denshi/ks . isolated) "I-HD-KS-" 6 d) + ((=hanyo-denshi/ks/mf . isolated) "I-KSMF-" 5 d) + ((=hanziku-1 . isolated) "I-HZK1-" 4 X) + ( =hanziku-1 "HZK1-" 4 X) + ((=hanziku-2 . isolated) "I-HZK2-" 4 X) + ( =hanziku-2 "HZK2-" 4 X) + ( =hanyo-denshi/ja "HD-JA-" 4 X) + ( =hanyo-denshi/jb "HD-JB-" 4 X) + ( =hanyo-denshi/jc "HD-JC-" 4 X) + ( =hanyo-denshi/jd "HD-JD-" 4 X) + ( =hanyo-denshi/ft "HD-FT-" 4 X) + ( =hanyo-denshi/ia "HD-IA-" 4 X) + ( =hanyo-denshi/ib "HD-IB-" 4 X) + ( =hanyo-denshi/hg "HD-HG-" 4 X) + ( =hanyo-denshi/ip "HD-IP-" 4 X) + ( =hanyo-denshi/jt "HD-JT-" 4 X) + ( =hanyo-denshi/ks "HD-KS-" 6 d) + ( =hanyo-denshi/ks/mf "KSMF-" 5 d) + ( =jis-x0208@1978 "J78-" 4 X) ( chinese-cns11643-1 "C1-" 4 X) ( chinese-cns11643-2 "C2-" 4 X) ( chinese-cns11643-3 "C3-" 4 X) @@ -288,22 +336,105 @@ ( arabic-2-column "MULE-ARB2-" 2 X) ( arabic-digit "MULE-ARBD-" 2 X) ( ipa "MULE-IPA-" 2 X) - ( china3-jef "JC3-" 4 X) - ( chinese-big5 "B-" 4 X) - ( chinese-big5 "C0-" 4 X) - ( =ucs@unicode "UU+" 4 X) - ( =ucs@unicode "UU-" 8 X) - ( =ucs@iso "U+" 4 X) - ( =ucs@iso "U-" 8 X) - ( =ucs@gb "GU+" 4 X) - ( =ucs@gb "GU-" 8 X) - ( =ucs@jis "JU+" 4 X) - ( =ucs@jis "JU-" 8 X) - ( =ucs@cns "CU+" 4 X) - ( =ucs@cns "CU-" 8 X) - ( =ucs@ks "KU+" 4 X) - ( =ucs@ks "KU-" 8 X) - ( =jis-x0208@1997 "J97-" 4 X) + (=>>>jis-x0208 "g2-J0-" 4 X) + (=>>>jis-x0208 "GI-J0-" 4 X) + (=>>>jis-x0213-1 "g2-JX1-" 4 X) + (=>>>jis-x0213-1 "GI-JX1-" 4 X) + (=>>>jis-x0213-2 "g2-JX2-" 4 X) + (=>>>jis-x0213-1@2004 "g2-JX3-" 4 X) + (=>>>jis-x0213-1@2004 "GI-JX3-" 4 X) + (=>>>adobe-japan1 "g2-AJ1-" 5 d) + (=>>>hanyo-denshi/jt "g2-HD-JT-" 4 X) + (=>>>gt "g2-GT-" 5 d) + (=>>gt "G-GT-" 5 d) + (=>>jis-x0208 "G-J0-" 4 X) + (=>>jis-x0213-1@2000 "G-JX1-" 4 X) + (=>>jis-x0213-2 "G-JX2-" 4 X) + (=>>jis-x0213-1@2004 "G-JX3-" 4 X) + (=>>adobe-japan1 "G-AJ1-" 5 d) + (=>>jis-x0208@1978 "G-J78-" 4 X) + (=>>big5-cdp "G-CDP-" 4 X) + (=>>gt-k "G-GT-K" 5 d) + (=>>ruimoku-v6 "G-RUI6-" 4 X) + (=>>hanyo-denshi/ft "G-HD-FT-" 4 X) + (=>>hanyo-denshi/ia "G-HD-IA-" 4 X) + (=>>hanyo-denshi/ib "G-HD-IB-" 4 X) + (=>>hanyo-denshi/jt "G-HD-JT-" 4 X) + (=>>hanyo-denshi/ks "G-HD-KS-" 4 X) + (=>>cbeta "G-CB" 5 d) + (=+>jis-x0208 "o-J0-" 4 X) + (=+>jis-x0213-1 "o-JX1-" 4 X) + (=+>jis-x0213-2 "o-JX2-" 4 X) + (=+>jis-x0208@1978 "o-J78-" 4 X) + (=+>adobe-japan1 "o-AJ1-" 5 d) + (=+>gt "o-GT-" 5 d) + ( =>jis-x0208@1997 "J97-" 4 X) + ( =>jis-x0208@1997 "A-J0-" 4 X) + ( =>jis-x0213-1@2000 "A-JX1-" 4 X) + ( =>jis-x0213-2 "A-JX2-" 4 X) + ( =>jis-x0213-1@2004 "A-JX3-" 4 X) + ( =>gt "A-GT-" 5 d) + ( =>gt-k "A-GT-K" 5 d) + ( =>zinbun-oracle "A-ZOB-" 4 d) + (==>ucs@bucs "BUCS+" 4 X) + ( =>ucs@iso "A-IU+" 4 X) + ( =>ucs@unicode "A-UU+" 4 X) + ( =>ucs@jis "A-JU+" 4 X) + ( =>ucs@jis/2004 "A-J04U+" 4 X) + ( =>ucs@cns "A-CU+" 4 X) + ( =>ucs@ks "A-KU+" 4 X) + (=+>ucs@iso "o-IU+" 4 X) + (=+>ucs@unicode "o-UU+" 4 X) + (=+>ucs@jis "o-JU+" 4 X) + (=+>ucs@jis/1990 "o-J90U+" 4 X) + (=+>ucs@cns "o-CU+" 4 X) + (=+>ucs@ks "o-KU+" 4 X) + (=>>ucs@iso "G-IU+" 4 X) + (=>>ucs@unicode "G-UU+" 4 X) + (=>>ucs@jis "G-JU+" 4 X) + (=>>ucs@ks "G-KU+" 4 X) + (=>>ucs@cns "G-CU+" 4 X) + (=>>ucs@jis/2004 "G-J04U+" 4 X) + (=>>ucs@jis/2000 "G-J00U+" 4 X) + (=>>ucs@jis/1990 "G-J90U+" 4 X) + (=>>ucs@JP "G-dJU+" 4 X) + (=>>>ucs@iso "g2-IU+" 4 X) + (=>>>ucs@iso "GI-IU+" 4 X) + (=>>>ucs@unicode "g2-UU+" 4 X) + (=>>>ucs@unicode "GI-UU+" 4 X) + (=>>>ucs@jis "g2-JU+" 4 X) + (=>>>ucs@jis "GI-JU+" 4 X) + (=>>>ucs@ks "g2-KU+" 4 X) + (=>>>ucs@ks "GI-KU+" 4 X) + (=>>>ucs@cns "g2-CU+" 4 X) + (=>>>ucs@cns "GI-CU+" 4 X) + (=>>>ucs@jis/2004 "g2-J04U+" 4 X) + (=>>>ucs@jis/2004 "GI-J04U+" 4 X) + (=>>>ucs@jis/1990 "g2-J90U+" 4 X) + ( =ucs@iso "U-" 8 X) + ( =ucs@unicode "UU+" 4 X) + ( =ucs@unicode "UU-" 8 X) + ( =ucs@iso "U+" 4 X) + ( =ucs@gb "GU+" 4 X) + ( =ucs@gb "GU-" 8 X) + ( =ucs@jis "JU+" 4 X) + ( =ucs@jis "JU-" 8 X) + ( =ucs@cns "CU+" 4 X) + ( =ucs@cns "CU-" 8 X) + ( =ucs@ks "KU+" 4 X) + ( =ucs@ks "KU-" 8 X) + ( =ucs@JP "dJU+" 4 X) + ( =ucs@JP/hanazono "hanaJU+" 4 X) + ( china3-jef "JC3-" 4 X) + ( =big5 "B-" 4 X) + ( =big5 "C0-" 4 X) + ( =big5-eten "BE-" 4 X) + (=>daikanwa "A-M-" 5 d) + (=>cns11643-7 "A-C7-" 4 X) + (=>big5-cdp "A-CDP-" 4 X) + ( =jis-x0208@1978/i1 "J78i1-" 4 X) + ( =shinjigen@rev "SJG2-" 4 d) + ( =shinjigen@1ed "SJG1-" 4 d) )) (make-coding-system @@ -312,6 +443,11 @@ '(mnemonic "MTF8r" use-entity-reference t)) (make-coding-system + 'utf-8-mcs-no-composition 'utf-8 + "Coding-system of UTF-8 without composition." + '(mnemonic "MTF8-nc" disable-composition t)) + + (make-coding-system 'utf-8-gb 'utf-8 "Coding-system of UTF-8 using GB mapping." '(mnemonic "UTF8G"