X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=76880655727c7f4a2b0d4c1ca6874ea32658bc24;hb=8f3a7e6d4141e9d00348bccf69512e821b44e027;hp=e6db0a99bfe62e287067bcae59f3aa0f1ccda09b;hpb=2b448d53889a4fae3c241a32c47b5299e2fc0b2b;p=chise%2Fxemacs-chise.git- diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index e6db0a9..7688065 100644 --- a/lisp/mule/mule-coding.el +++ b/lisp/mule/mule-coding.el @@ -5,7 +5,7 @@ ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 1997, 1999, 2002, 2003, 2004, 2005, 2006, 2008, 2009, -;; 2010, 2011, 2012, 2013, 2014 MORIOKA Tomohiko +;; 2010, 2011, 2012, 2013, 2014, 2015 MORIOKA Tomohiko ;; This file is part of XEmacs. @@ -191,9 +191,9 @@ ((=adobe-japan1-6 . isolated) "I-AJ1-" 5 d) ( =mj "MJ" 6 d) ( =adobe-japan1-6 "AJ1-" 5 d) - (==mj "G-MJ" 6 d) + (==mj "g2-MJ" 6 d) (===mj "R-MJ" 6 d) - (==adobe-japan1-6 "G-AJ1-" 5 d) + (==adobe-japan1-6 "g2-AJ1-" 5 d) (===adobe-japan1-6 "R-AJ1-" 5 d) ((=adobe-japan1-base . isolated) "I-AJ1-" 5 d) ( =adobe-japan1-base "I-AJ1-" 5 d) @@ -278,37 +278,45 @@ ( =hanyo-denshi/ip "HD-IP-" 4 X) ( =hanyo-denshi/jt "HD-JT-" 4 X) ( =hanyo-denshi/ks "HD-KS-" 6 d) - (==hanyo-denshi/ja "G-HD-JA-" 4 X) - (==hanyo-denshi/jb "G-HD-JB-" 4 X) - (==hanyo-denshi/jc "G-HD-JC-" 4 X) - (==hanyo-denshi/jd "G-HD-JD-" 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/hg "G-HD-HG-" 4 X) - (==hanyo-denshi/ip "G-HD-IP-" 4 X) - (==hanyo-denshi/jt "G-HD-JT-" 4 X) - (==hanyo-denshi/ks "G-HD-KS-" 6 d) + (==hanyo-denshi/ja "g2-HD-JA-" 4 X) + (==hanyo-denshi/jb "g2-HD-JB-" 4 X) + (==hanyo-denshi/jc "g2-HD-JC-" 4 X) + (==hanyo-denshi/jd "g2-HD-JD-" 4 X) + (==hanyo-denshi/ft "g2-HD-FT-" 4 X) + (==hanyo-denshi/ia "g2-HD-IA-" 4 X) + (==hanyo-denshi/ib "g2-HD-IB-" 4 X) + (==hanyo-denshi/hg "g2-HD-HG-" 4 X) + (==hanyo-denshi/ip "g2-HD-IP-" 4 X) + (==hanyo-denshi/jt "g2-HD-JT-" 4 X) + (==hanyo-denshi/ks "g2-HD-KS-" 6 d) + (===hanyo-denshi/jb "R-HD-JB-" 4 X) (===hanyo-denshi/ft "R-HD-FT-" 4 X) + (===hanyo-denshi/ia "R-HD-IA-" 4 X) (===hanyo-denshi/ib "R-HD-IB-" 4 X) + (===hanyo-denshi/hg "R-HD-HG-" 4 X) + (===hanyo-denshi/ip "R-HD-IP-" 4 X) (===hanyo-denshi/jt "R-HD-JT-" 4 X) + (===hanyo-denshi/ks "R-HD-KS-" 6 d) ( =gt "GT-" 5 d) - (==gt "G-GT-" 5 d) + (==gt "g2-GT-" 5 d) (===gt "R-GT-" 5 d) ( =jis-x0208@1990 "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@1990 "G-J90-" 4 X) + (==jis-x0208@1990 "g2-J90-" 4 X) (===jis-x0208@1990 "R-J90-" 4 X) - (==jis-x0212 "G-JSP-" 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) + (===jis-x0208 "R-J0-" 4 X) + (==jis-x0212 "g2-JSP-" 4 X) + (==jis-x0213-1@2000 "g2-JX1-" 4 X) + (==jis-x0213-2 "g2-JX2-" 4 X) + (==jis-x0213-1@2004 "g2-JX3-" 4 X) (===jis-x0213-1 "R-JX1-" 4 X) (===jis-x0213-2 "R-JX2-" 4 X) + (===jis-x0213-1@2004 "R-JX3-" 4 X) (===jis-x0212 "R-JSP-" 4 X) + (===jis-x0213-1@2000 "R-J00X1-" 4 X) ( =cns11643-1 "C1-" 4 X) ( chinese-cns11643-2 "C2-" 4 X) ( chinese-cns11643-3 "C3-" 4 X) @@ -316,9 +324,10 @@ ( chinese-cns11643-5 "C5-" 4 X) ( chinese-cns11643-6 "C6-" 4 X) ( chinese-cns11643-7 "C7-" 4 X) - ( chinese-gb2312 "G0-" 4 X) + ( =gb2312 "G0-" 4 X) + ;; (==gb2312 "g2-G0-" 4 X) ( =big5-cdp "CDP-" 4 X) - (==big5-cdp "G-CDP-" 4 X) + (==big5-cdp "g2-CDP-" 4 X) (===big5-cdp "R-CDP-" 4 X) ((=big5-eten . isolated) "I-B-" 4 X) ( =zinbun-oracle "ZOB-" 4 d) @@ -328,29 +337,40 @@ ( =daikanwa "M-" 5 d) ( =daikanwa@rev2 "r2M-" 5 d) ( =daikanwa@rev1 "r1M-" 5 d) - (==daikanwa/ho "G-M-H" 4 d) - (==daikanwa/+p "G-M-p" 5 d) - (==daikanwa "G-M-" 5 d) + (==daikanwa/ho "g2-M-H" 4 d) + (==daikanwa/+p "g2-M-p" 5 d) + (==daikanwa "g2-M-" 5 d) (===daikanwa/ho "R-M-H" 4 d) (===daikanwa/+p "R-M-p" 5 d) (===daikanwa "R-M-" 5 d) ( =ks-x1001 "K0-" 4 X) - (==ks-x1001 "G-K0-" 4 X) + (==ks-x1001 "g2-K0-" 4 X) (===ks-x1001 "R-K0-" 4 X) ( =iso-ir165 "EGB-" 4 X) ( =jis-x0208@1983 "J83-" 4 X) ( =jis-x0208@1978 "J78-" 4 X) ( =gt-k "GT-K" 5 d) - (==gt-k "G-GT-K" 5 d) + (==gt-k "g2-GT-K" 5 d) (===gt-k "R-GT-K" 5 d) - (==jis-x0208@1983 "G-J83-" 4 X) - (==jis-x0208@1978 "G-J78-" 4 X) + (==jis-x0208@1983 "g2-J83-" 4 X) + (==jis-x0208@1978 "g2-J78-" 4 X) (===jis-x0208@1983 "R-J83-" 4 X) (===jis-x0208@1978 "R-J78-" 4 X) ( =koseki "KOSEKI-" 6 d) ( =cbeta "CB" 5 d) - (==cbeta "G-CB" 5 d) + (=>cbeta "A-CB" 5 d) + (==cbeta "g2-CB" 5 d) (===cbeta "R-CB" 5 d) + (===hng-khi "HNG010-" 5 d) + (===hng-khm "HNG011-" 5 d) + (===hng-kak "HNG017-" 5 d) + (===hng-sys "HNG022-" 5 d) + (===hng-tsu "HNG024-" 5 d) + (===hng-hod "HNG030-" 5 d) + (===hng-gok "HNG031-" 5 d) + (===hng-k24 "HNG037-" 5 d) + (===hng-kcj "HNG042-" 5 d) + (===hng-kbk "HNG043-" 5 d) ( =hanziku-1 "HZK01-" 4 X) ( =hanziku-2 "HZK02-" 4 X) ( =hanziku-3 "HZK03-" 4 X) @@ -368,6 +388,10 @@ ((=hanziku-2 . isolated) "I-HZK2-" 4 X) ( =hanziku-2 "HZK2-" 4 X) ( =hanyo-denshi/ks/mf "KSMF-" 5 d) + ( =ucs-var-001 "U-v001+" 4 X) + ( =ucs-var-002 "U-v002+" 4 X) + ( =ucs-var-003 "U-v003+" 4 X) + ( =ucs-itaiji-002 "U-i002+" 4 X) ( =ucs-itaiji-084 "U-i084+" 4 X) ( =big5-cdp-var-3 "CDP-var3-" 4 X) ( =big5-cdp-var-5 "CDP-var5-" 4 X) @@ -392,41 +416,36 @@ ( arabic-2-column "MULE-ARB2-" 2 X) ( arabic-digit "MULE-ARBD-" 2 X) ( ipa "MULE-IPA-" 2 X) - (=>>>adobe-japan1 "G-AJ1-" 5 d) - (=>>>jis-x0208 "G-J0-" 4 X) + (=>>>jis-x0208 "g2-J0-" 4 X) (=>>>jis-x0208 "GI-J0-" 4 X) - (=>>>jis-x0213-1 "G-JX1-" 4 X) + (=>>>jis-x0213-1 "g2-JX1-" 4 X) (=>>>jis-x0213-1 "GI-JX1-" 4 X) - (=>>>jis-x0213-2 "G-JX2-" 4 X) - (=>>>jis-x0213-1@2004 "G-JX3-" 4 X) (=>>>jis-x0213-1@2004 "GI-JX3-" 4 X) - (=>>>hanyo-denshi/ib "G-HD-IB-" 4 X) - (=>>>hanyo-denshi/ft "G-HD-FT-" 4 X) - (=>>>hanyo-denshi/jt "G-HD-JT-" 4 X) - (=>>>gt "G-GT-" 5 d) - (=>>adobe-japan1 "g1-AJ1-" 5 d) - (=>>jis-x0208 "g1-J0-" 4 X) - (=>>jis-x0213-1@2000 "g1-JX1-" 4 X) - (=>>jis-x0213-2 "g1-JX2-" 4 X) - (=>>jis-x0213-1@2004 "g1-JX3-" 4 X) - (=>>hanyo-denshi/ft "g1-HD-FT-" 4 X) - (=>>hanyo-denshi/ia "g1-HD-IA-" 4 X) - (=>>hanyo-denshi/ib "g1-HD-IB-" 4 X) - (=>>hanyo-denshi/jt "g1-HD-JT-" 4 X) - (=>>hanyo-denshi/ks "g1-HD-KS-" 4 X) - (=>>gt "g1-GT-" 5 d) - (=>>jis-x0208@1978 "g1-J78-" 4 X) - (=>>cns11643-4 "g1-C4-" 4 X) - (=>>big5-cdp "g1-CDP-" 4 X) - (=>>gt-k "g1-GT-K" 5 d) - (=>>ruimoku-v6 "g1-RUI6-" 4 X) - (=>>cbeta "g1-CB" 5 d) + (=>>adobe-japan1 "G-AJ1-" 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) + (=>>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) + (=>>gt "G-GT-" 5 d) + (=>>jis-x0208@1978 "G-J78-" 4 X) + (=>>cns11643-4 "G-C4-" 4 X) + (=>>big5-cdp "G-CDP-" 4 X) + (=>>gt-k "G-GT-K" 5 d) + (=>>ruimoku-v6 "G-RUI6-" 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) + (=+>hanyo-denshi/ft "o-HD-FT-" 4 X) + (=+>hanyo-denshi/jt "o-HD-JT-" 4 X) ( =>jis-x0208@1997 "J97-" 4 X) ( =>jis-x0208@1997 "A-J0-" 4 X) ( =>jis-x0213-1@2000 "A-JX1-" 4 X) @@ -436,6 +455,8 @@ ( =>gt-k "A-GT-K" 5 d) ( =>zinbun-oracle "A-ZOB-" 4 d) (==>ucs@bucs "BUCS+" 4 X) + ( =>iwds-1 "IWDS1-" 3 d) + ( =>ucs@iwds-1 "A-IWDSU+" 4 X) ( =>ucs@hanyo-denshi "A-HDU+" 4 X) ( =>ucs@hanyo-denshi "A-HD-UCS+" 4 X) ( =>ucs@iso "A-IU+" 4 X) @@ -450,15 +471,6 @@ (=+>ucs@jis/1990 "o-J90U+" 4 X) (=+>ucs@cns "o-CU+" 4 X) (=+>ucs@ks "o-KU+" 4 X) - (=>>ucs@iso "g1-IU+" 4 X) - (=>>ucs@unicode "g1-UU+" 4 X) - (=>>ucs@jis "g1-JU+" 4 X) - (=>>ucs@ks "g1-KU+" 4 X) - (=>>ucs@cns "g1-CU+" 4 X) - (=>>ucs@jis/2004 "g1-J04U+" 4 X) - (=>>ucs@jis/2000 "g1-J00U+" 4 X) - (=>>ucs@jis/1990 "g1-J90U+" 4 X) - (=>>ucs@JP "g1-dJU+" 4 X) ( =ucs@iso "U-" 8 X) ( =ucs@unicode "UU+" 4 X) ( =ucs@unicode "UU-" 8 X) @@ -473,20 +485,31 @@ ( =ucs@ks "KU-" 8 X) ( =ucs@JP "dJU+" 4 X) ( =ucs@JP/hanazono "hanaJU+" 4 X) - (==ucs@iso "G-IU-" 8 X) - (==ucs@unicode "G-UU+" 4 X) - (==ucs@cns "G-CU+" 4 X) - (==ucs@ks "G-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-" 8 X) + (==ucs@unicode "g2-UU+" 4 X) + (==ucs@gb "g2-GU+" 4 X) + (==ucs@cns "g2-CU+" 4 X) + (==ucs@ks "g2-KU+" 4 X) (===ucs@iso "R-U-" 8 X) (===ucs@unicode "R-UU+" 4 X) + (===ucs@gb "R-GU+" 4 X) (===ucs@ks "R-KU+" 4 X) - (==cns11643-1 "G-C1-" 4 X) - (==cns11643-2 "G-C2-" 4 X) - (==cns11643-3 "G-C3-" 4 X) - (==cns11643-4 "G-C4-" 4 X) - (==cns11643-5 "G-C5-" 4 X) - (==cns11643-6 "G-C6-" 4 X) - (==cns11643-7 "G-C7-" 4 X) + (==cns11643-1 "g2-C1-" 4 X) + (==cns11643-2 "g2-C2-" 4 X) + (==cns11643-3 "g2-C3-" 4 X) + (==cns11643-4 "g2-C4-" 4 X) + (==cns11643-5 "g2-C5-" 4 X) + (==cns11643-6 "g2-C6-" 4 X) + (==cns11643-7 "g2-C7-" 4 X) (===cns11643-1 "R-C1-" 4 X) (===cns11643-2 "R-C2-" 4 X) (===cns11643-3 "R-C3-" 4 X) @@ -494,16 +517,17 @@ (===cns11643-5 "R-C5-" 4 X) (===cns11643-6 "R-C6-" 4 X) (===cns11643-7 "R-C7-" 4 X) - (==ucs@JP/hanazono "G-hanaJU+" 4 X) - (==ruimoku-v6 "G-RUI6-" 4 X) + (==ucs@JP/hanazono "g2-hanaJU+" 4 X) + (==ruimoku-v6 "g2-RUI6-" 4 X) + (===ruimoku-v6 "R-RUI6-" 4 X) ( china3-jef "JC3-" 4 X) - (==jef-china3 "G-JC3-" 4 X) + (==jef-china3 "g2-JC3-" 4 X) (===jef-china3 "R-JC3-" 4 X) ( =big5 "B-" 4 X) ( =big5 "C0-" 4 X) ( =big5-eten "BE-" 4 X) - (=>>daikanwa "g1-M-" 5 d) - (=>>daikanwa/+p "g1-M-p" 5 d) + (=>>daikanwa "G-M-" 5 d) + (=>>daikanwa/+p "G-M-p" 5 d) (=>daikanwa "A-M-" 5 d) (=>daikanwa/ho "A-M-H" 4 d) (=>cns11643-7 "A-C7-" 4 X) @@ -511,20 +535,17 @@ ( =jis-x0208@1978/i1 "J78i1-" 4 X) ( =shinjigen@rev "SJG2-" 4 d) ( =shinjigen@1ed "SJG1-" 4 d) - (==shinjigen@rev "G-SJG2-" 4 d) - (==shinjigen@1ed "G-SJG1-" 4 d) - (=>>>ucs@iso "G-IU+" 4 X) + (==shinjigen@rev "g2-SJG2-" 4 d) + (==shinjigen@1ed "g2-SJG1-" 4 d) + (=>>>ucs@iso "g2-IU+" 4 X) (=>>>ucs@iso "GI-IU+" 4 X) - (=>>>ucs@unicode "G-UU+" 4 X) (=>>>ucs@unicode "GI-UU+" 4 X) - (=>>>ucs@cns "G-CU+" 4 X) (=>>>ucs@cns "GI-CU+" 4 X) - (=>>>ucs@jis "G-JU+" 4 X) + (=>>>ucs@jis "g2-JU+" 4 X) (=>>>ucs@jis "GI-JU+" 4 X) - (=>>>ucs@jis/2004 "G-J04U+" 4 X) + (=>>>ucs@jis/2004 "g2-J04U+" 4 X) (=>>>ucs@jis/2004 "GI-J04U+" 4 X) - (=>>>ucs@jis/1990 "G-J90U+" 4 X) - (=>>>ucs@ks "G-KU+" 4 X) + (=>>>ucs@jis/1990 "g2-J90U+" 4 X) (=>>>ucs@ks "GI-KU+" 4 X) ))