X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=070172904e06d0aaf206c3b5706448535488b791;hb=4e6996e7de251659773d977a4f21b55b9d9b5606;hp=8f55228d00efaa9aa39afff45abfc229bd196ce4;hpb=111523f030b52e5bfbc74af100551123f9331500;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index 8f55228..0701729 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 MORIOKA Tomohiko +;; 2010, 2011 MORIOKA Tomohiko ;; This file is part of XEmacs. @@ -182,7 +182,9 @@ (when (featurep 'utf-2000) (setq coded-charset-entity-reference-alist - '(((=gt . isolated) "I-GT-" 5 d) + '(((=adobe-japan1-base . isolated) "I-AJ1-" 5 d) + ((=adobe-japan1-6 . isolated) "I-AJ1-" 5 d) + ((=gt . isolated) "I-GT-" 5 d) ((=ruimoku-v6 . isolated) "I-RUI6-" 4 X) ((chinese-big5-cdp . isolated) "I-CDP-" 4 X) ((=gt-k . isolated) "I-GT-K" 5 d) @@ -239,13 +241,26 @@ ((arabic-digit . isolated) "I-MULE-ARBD-" 2 X) ((ipa . isolated) "I-MULE-IPA-" 2 X) ((china3-jef . isolated) "I-JC3-" 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) + ( =adobe-japan1-6 "AJ1-" 5 d) + ( =adobe-japan1-base "I-AJ1-" 5 d) ( =gt "GT-" 5 d) - (=>>gt "G-GT-" 5 d) - (=>>gt "aGT-" 5 d) ( =zinbun-oracle "ZOB-" 4 d) ( =ruimoku-v6 "RUI6-" 4 X) - ( chinese-big5-cdp "CDP-" 4 X) - ( ideograph-daikanwa "M-" 5 d) + ( =big5-cdp "CDP-" 4 X) + ( =daikanwa "M-" 5 d) + ( =daikanwa@rev1 "r1M-" 5 d) ( =gt-k "GT-K" 5 d) ( ideograph-cbeta "CB" 5 d) ( ideograph-hanziku-1 "HZK01-" 4 X) @@ -265,25 +280,24 @@ ((ideograph-hanziku-2 . isolated) "I-HZK2-" 4 X) ( ideograph-hanziku-2 "HZK2-" 4 X) ( =jis-x0208@1990 "J90-" 4 X) - ( =jis-x0208@1983 "J83-" 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) + ( =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@1983 "J83-" 4 X) ( =jis-x0208@1978 "J78-" 4 X) - (=>>jis-x0208@1990 "G-J90-" 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@2000 "aJX1-" 4 X) - (=>>jis-x0213-2 "aJX2-" 4 X) - (=>>jis-x0213-1@2004 "aJX3-" 4 X) - (=>>jis-x0208@1978 "G-J78-" 4 X) - ( =>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) ( chinese-cns11643-1 "C1-" 4 X) ( chinese-cns11643-2 "C2-" 4 X) ( chinese-cns11643-3 "C3-" 4 X) @@ -315,24 +329,63 @@ ( 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@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) - ( =jis-x0208@1978/i1 "J78i1-" 4 X) - ( =shinjigen@rev "SJG2-" 4 d) - ( =shinjigen@1ed "SJG1-" 4 d) + (=>>gt "G-GT-" 5 d) + (=>>gt "aGT-" 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) + (=>>jis-x0213-1@2000 "aJX1-" 4 X) + (=>>jis-x0213-2 "aJX2-" 4 X) + (=>>jis-x0213-1@2004 "aJX3-" 4 X) + (=>>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) + ( =>jis-x0208@usual "o-J0-" 4 X) + ( =>jis-x0208@1997 "J97-" 4 X) + ( =>jis-x0208@1997 "A-J0-" 4 X) + ( =>jis-x0213-1@2000 "A-JX1-" 4 X) + ( =>jis-x0213-2@usual "o-JX2-" 4 X) + ( =>jis-x0213-2 "A-JX2-" 4 X) + ( =>jis-x0213-1@2004 "A-JX3-" 4 X) + ( =>gt "A-GT-" 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@cns "A-CU+" 4 X) + ( =>ucs@JP "o-JU+" 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@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) + ( china3-jef "JC3-" 4 X) + ( chinese-big5 "B-" 4 X) + ( chinese-big5 "C0-" 4 X) + ( =>big5-cdp "A-CDP-" 4 X) + ( =>daikanwa "A-M-" 5 d) + ( =jis-x0208@1978/i1 "J78i1-" 4 X) + ( =shinjigen@rev "SJG2-" 4 d) + ( =shinjigen@1ed "SJG1-" 4 d) )) (make-coding-system @@ -341,6 +394,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"