From: MORIOKA Tomohiko Date: Mon, 28 Jul 2014 12:30:49 +0000 (+0900) Subject: (coded-charset-entity-reference-alist): X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b448d53889a4fae3c241a32c47b5299e2fc0b2b;p=chise%2Fxemacs-chise.git- (coded-charset-entity-reference-alist): - Use "&G-[NAME];" for `==[NAME]' instead of `=>>[NAME]'. - Use "&R-[NAME];" for `===[NAME]' instead of `==[NAME]'. - Use "&g1-[NAME];" for `=>>[NAME]'. - Abolish "&g2-[NAME];". --- diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index e5d76e1..e6db0a9 100644 --- a/lisp/mule/mule-coding.el +++ b/lisp/mule/mule-coding.el @@ -187,12 +187,14 @@ =decomposition@hanyo-denshi)) (setq coded-charset-entity-reference-alist - '(((=mj . isolated) "I-MJ" 6 d) + '(((=mj . isolated) "I-MJ" 6 d) ((=adobe-japan1-6 . isolated) "I-AJ1-" 5 d) ( =mj "MJ" 6 d) ( =adobe-japan1-6 "AJ1-" 5 d) - (==mj "R-MJ" 6 d) - (==adobe-japan1-6 "R-AJ1-" 5 d) + (==mj "G-MJ" 6 d) + (===mj "R-MJ" 6 d) + (==adobe-japan1-6 "G-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) ((=hanyo-denshi/ja . isolated) "I-HD-JA-" 4 X) @@ -207,7 +209,7 @@ ((=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) - ((=gt . isolated) "I-GT-" 5 d) + ((=gt . isolated) "I-GT-" 5 d) ((=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) @@ -216,19 +218,19 @@ ((=jis-x0212 . isolated) "I-JSP-" 4 X) ((=jis-x0208@1978/1pr . isolated) "I-J78-" 4 X) ((=jis-x0208 . isolated) "I-J90-" 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) - ((chinese-cns11643-4 . isolated) "I-C4-" 4 X) - ((chinese-cns11643-5 . isolated) "I-C5-" 4 X) - ((chinese-cns11643-6 . isolated) "I-C6-" 4 X) - ((chinese-cns11643-7 . isolated) "I-C7-" 4 X) - ((chinese-gb2312 . isolated) "I-G0-" 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) + ((chinese-cns11643-4 . isolated) "I-C4-" 4 X) + ((chinese-cns11643-5 . isolated) "I-C5-" 4 X) + ((chinese-cns11643-6 . isolated) "I-C6-" 4 X) + ((chinese-cns11643-7 . isolated) "I-C7-" 4 X) + ((chinese-gb2312 . isolated) "I-G0-" 4 X) ((=iso-ir165 . isolated) "I-EGB-" 4 X) - ((korean-ksc5601 . isolated) "I-K0-" 4 X) + ((korean-ksc5601 . isolated) "I-K0-" 4 X) ((=ruimoku-v6 . isolated) "I-RUI6-" 4 X) ( =ruimoku-v6 "RUI6-" 4 X) - ((=daikanwa@rev2 . isolated) "I-M-" 5 d) + ((=daikanwa@rev2 . isolated) "I-M-" 5 d) ((=gt-k . isolated) "I-GT-K" 5 d) ((=cbeta . isolated) "I-CB" 5 d) ((=big5-cdp . isolated) "I-CDP-" 4 X) @@ -276,60 +278,79 @@ ( =hanyo-denshi/ip "HD-IP-" 4 X) ( =hanyo-denshi/jt "HD-JT-" 4 X) ( =hanyo-denshi/ks "HD-KS-" 6 d) - (==hanyo-denshi/ja "R-HD-JA-" 4 X) - (==hanyo-denshi/jb "R-HD-JB-" 4 X) - (==hanyo-denshi/jc "R-HD-JC-" 4 X) - (==hanyo-denshi/jd "R-HD-JD-" 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) + (==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/ft "R-HD-FT-" 4 X) + (===hanyo-denshi/ib "R-HD-IB-" 4 X) + (===hanyo-denshi/jt "R-HD-JT-" 4 X) ( =gt "GT-" 5 d) - (==gt "R-GT-" 5 d) + (==gt "G-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@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 "R-J90-" 4 X) - (==jis-x0212 "R-JSP-" 4 X) - (==jis-x0213-1@2000 "R-JX1-" 4 X) - (==jis-x0213-2 "R-JX2-" 4 X) - (==jis-x0213-1@2004 "R-JX3-" 4 X) + (==jis-x0208@1990 "G-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-x0213-1 "R-JX1-" 4 X) + (===jis-x0213-2 "R-JX2-" 4 X) + (===jis-x0212 "R-JSP-" 4 X) ( =cns11643-1 "C1-" 4 X) - ( chinese-cns11643-2 "C2-" 4 X) - ( chinese-cns11643-3 "C3-" 4 X) - ( chinese-cns11643-4 "C4-" 4 X) - ( chinese-cns11643-5 "C5-" 4 X) - ( chinese-cns11643-6 "C6-" 4 X) - ( chinese-cns11643-7 "C7-" 4 X) - ( chinese-gb2312 "G0-" 4 X) - ( =big5-cdp "CDP-" 4 X) - (==big5-cdp "R-CDP-" 4 X) - ((=big5-eten . isolated) "I-B-" 4 X) - ( =zinbun-oracle "ZOB-" 4 d) + ( chinese-cns11643-2 "C2-" 4 X) + ( chinese-cns11643-3 "C3-" 4 X) + ( chinese-cns11643-4 "C4-" 4 X) + ( chinese-cns11643-5 "C5-" 4 X) + ( chinese-cns11643-6 "C6-" 4 X) + ( chinese-cns11643-7 "C7-" 4 X) + ( chinese-gb2312 "G0-" 4 X) + ( =big5-cdp "CDP-" 4 X) + (==big5-cdp "G-CDP-" 4 X) + (===big5-cdp "R-CDP-" 4 X) + ((=big5-eten . isolated) "I-B-" 4 X) + ( =zinbun-oracle "ZOB-" 4 d) ( =daikanwa/ho "M-H" 4 d) ( =daikanwa/+p "M-p" 5 d) ( =daikanwa/+2p "M-2p" 5 d) - ( =daikanwa "M-" 5 d) - ( =daikanwa@rev2 "r2M-" 5 d) - ( =daikanwa@rev1 "r1M-" 5 d) - (==daikanwa/+p "R-M-p" 5 d) - (==daikanwa "R-M-" 5 d) - ( =ks-x1001 "K0-" 4 X) - (==ks-x1001 "R-K0-" 4 X) - ( =iso-ir165 "EGB-" 4 X) + ( =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 "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 "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 "R-GT-K" 5 d) - (==jis-x0208@1983 "R-J83-" 4 X) - (==jis-x0208@1978 "R-J78-" 4 X) + (==gt-k "G-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 "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 "R-CB" 5 d) ( =hanziku-1 "HZK01-" 4 X) ( =hanziku-2 "HZK02-" 4 X) ( =hanziku-3 "HZK03-" 4 X) @@ -346,60 +367,60 @@ ( =hanziku-1 "HZK1-" 4 X) ((=hanziku-2 . isolated) "I-HZK2-" 4 X) ( =hanziku-2 "HZK2-" 4 X) - ( =hanyo-denshi/ks/mf "KSMF-" 5 d) + ( =hanyo-denshi/ks/mf "KSMF-" 5 d) ( =ucs-itaiji-084 "U-i084+" 4 X) ( =big5-cdp-var-3 "CDP-var3-" 4 X) ( =big5-cdp-var-5 "CDP-var5-" 4 X) ( latin-iso8859-1 "LATIN1-" 2 X) - ( latin-iso8859-2 "LATIN2-" 2 X) + ( latin-iso8859-2 "LATIN2-" 2 X) ( latin-iso8859-3 "LATIN3-" 2 X) ( latin-iso8859-4 "LATIN4-" 2 X) - ( cyrillic-iso8859-5 "CYRILLIC-" 2 X) + ( cyrillic-iso8859-5 "CYRILLIC-" 2 X) ( greek-iso8859-7 "GREEK-" 2 X) ( hebrew-iso8859-8 "HEBREW-" 2 X) ( latin-iso8859-9 "LATIN5-" 2 X) ( latin-jisx0201 "LATINJ-" 2 X) ( katakana-jisx0201 "KATAKANA-" 2 X) - ( latin-tcvn5712 "VSCII2-" 2 X) - ( latin-viscii "VISCII-" 2 X) + ( latin-tcvn5712 "VSCII2-" 2 X) + ( latin-viscii "VISCII-" 2 X) ( latin-viscii-upper "MULE-VIET-U-" 2 X) ( latin-viscii-lower "MULE-VIET-L-" 2 X) - ( thai-tis620 "THAI-" 2 X) + ( thai-tis620 "THAI-" 2 X) ( lao "MULE-LAO-" 2 X) - ( ethiopic "MULE-ETHIO-" 4 X) - ( arabic-1-column "MULE-ARB1-" 2 X) - ( arabic-2-column "MULE-ARB2-" 2 X) + ( ethiopic "MULE-ETHIO-" 4 X) + ( arabic-1-column "MULE-ARB1-" 2 X) + ( arabic-2-column "MULE-ARB2-" 2 X) ( arabic-digit "MULE-ARBD-" 2 X) - ( ipa "MULE-IPA-" 2 X) - (=>>>adobe-japan1 "g2-AJ1-" 5 d) - (=>>>jis-x0208 "g2-J0-" 4 X) + ( ipa "MULE-IPA-" 2 X) + (=>>>adobe-japan1 "G-AJ1-" 5 d) + (=>>>jis-x0208 "G-J0-" 4 X) (=>>>jis-x0208 "GI-J0-" 4 X) - (=>>>jis-x0213-1 "g2-JX1-" 4 X) + (=>>>jis-x0213-1 "G-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-2 "G-JX2-" 4 X) + (=>>>jis-x0213-1@2004 "G-JX3-" 4 X) (=>>>jis-x0213-1@2004 "GI-JX3-" 4 X) - (=>>>hanyo-denshi/ib "g2-HD-IB-" 4 X) - (=>>>hanyo-denshi/ft "g2-HD-FT-" 4 X) - (=>>>hanyo-denshi/jt "g2-HD-JT-" 4 X) - (=>>>gt "g2-GT-" 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) + (=>>>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) (=+>jis-x0208 "o-J0-" 4 X) (=+>jis-x0213-1 "o-JX1-" 4 X) (=+>jis-x0213-2 "o-JX2-" 4 X) @@ -429,15 +450,15 @@ (=+>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 "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) @@ -452,24 +473,37 @@ ( =ucs@ks "KU-" 8 X) ( =ucs@JP "dJU+" 4 X) ( =ucs@JP/hanazono "hanaJU+" 4 X) - (==ucs@iso "R-U-" 8 X) - (==ucs@unicode "R-UU+" 4 X) - (==ucs@cns "R-CU+" 4 X) - (==ucs@ks "R-KU+" 4 X) - (==cns11643-1 "R-C1-" 4 X) - (==cns11643-2 "R-C2-" 4 X) - (==cns11643-3 "R-C3-" 4 X) - (==cns11643-4 "R-C4-" 4 X) - (==cns11643-5 "R-C5-" 4 X) - (==cns11643-6 "R-C6-" 4 X) - (==cns11643-7 "R-C7-" 4 X) - (==ucs@JP/hanazono "R-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 "R-U-" 8 X) + (===ucs@unicode "R-UU+" 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 "R-C1-" 4 X) + (===cns11643-2 "R-C2-" 4 X) + (===cns11643-3 "R-C3-" 4 X) + (===cns11643-4 "R-C4-" 4 X) + (===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) ( china3-jef "JC3-" 4 X) + (==jef-china3 "G-JC3-" 4 X) + (===jef-china3 "R-JC3-" 4 X) ( =big5 "B-" 4 X) ( =big5 "C0-" 4 X) ( =big5-eten "BE-" 4 X) - (=>>daikanwa "G-M-" 5 d) - (=>>daikanwa/+p "G-M-p" 5 d) + (=>>daikanwa "g1-M-" 5 d) + (=>>daikanwa/+p "g1-M-p" 5 d) (=>daikanwa "A-M-" 5 d) (=>daikanwa/ho "A-M-H" 4 d) (=>cns11643-7 "A-C7-" 4 X) @@ -477,20 +511,20 @@ ( =jis-x0208@1978/i1 "J78i1-" 4 X) ( =shinjigen@rev "SJG2-" 4 d) ( =shinjigen@1ed "SJG1-" 4 d) - (==shinjigen@rev "R-SJG2-" 4 d) - (==shinjigen@1ed "R-SJG1-" 4 d) - (=>>>ucs@iso "g2-IU+" 4 X) + (==shinjigen@rev "G-SJG2-" 4 d) + (==shinjigen@1ed "G-SJG1-" 4 d) + (=>>>ucs@iso "G-IU+" 4 X) (=>>>ucs@iso "GI-IU+" 4 X) - (=>>>ucs@unicode "g2-UU+" 4 X) + (=>>>ucs@unicode "G-UU+" 4 X) (=>>>ucs@unicode "GI-UU+" 4 X) - (=>>>ucs@cns "g2-CU+" 4 X) + (=>>>ucs@cns "G-CU+" 4 X) (=>>>ucs@cns "GI-CU+" 4 X) - (=>>>ucs@jis "g2-JU+" 4 X) + (=>>>ucs@jis "G-JU+" 4 X) (=>>>ucs@jis "GI-JU+" 4 X) - (=>>>ucs@jis/2004 "g2-J04U+" 4 X) + (=>>>ucs@jis/2004 "G-J04U+" 4 X) (=>>>ucs@jis/2004 "GI-J04U+" 4 X) - (=>>>ucs@jis/1990 "g2-J90U+" 4 X) - (=>>>ucs@ks "g2-KU+" 4 X) + (=>>>ucs@jis/1990 "G-J90U+" 4 X) + (=>>>ucs@ks "G-KU+" 4 X) (=>>>ucs@ks "GI-KU+" 4 X) ))