X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=a8807eb3808fb962397f13a628f2d8eeb221a24b;hb=61743a171c2331f80b0c36ecc4268436a0d8e5bf;hp=ba5d040812a0114dc17788c1e2fb8b481451f1bf;hpb=c638b0d95dc490e3f53b14acce05c6370e3c5630;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index ba5d040..a8807eb 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 @@ -173,120 +182,204 @@ (when (featurep 'utf-2000) (setq coded-charset-entity-reference-alist - '(((ideograph-gt . isolated) "I-GT-" 5 d) - ( ideograph-gt "GT-" 5 d) - ((=ruimoku-v6 . isolated) "I-RUI6-" 4 X) + '(((=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) + ((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) + ((=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 . isolated) "I-J78-" 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) + ((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) + ((latin-iso8859-1 . isolated) "I-LATIN1-" 2 X) + ((latin-iso8859-2 . isolated) "I-LATIN2-" 2 X) + ((latin-iso8859-3 . isolated) "I-LATIN3-" 2 X) + ((latin-iso8859-4 . isolated) "I-LATIN4-" 2 X) + ((cyrillic-iso8859-5 . isolated) "I-CYRILLIC-" 2 X) + ((greek-iso8859-7 . isolated) "I-GREEK-" 2 X) + ((hebrew-iso8859-8 . isolated) "I-HEBREW-" 2 X) + ((latin-iso8859-9 . isolated) "I-LATIN5-" 2 X) + ((latin-jisx0201 . isolated) "I-LATINJ-" 2 X) + ((katakana-jisx0201 . isolated) "I-KATAKANA-" 2 X) + ((latin-tcvn5712 . isolated) "I-VSCII2-" 2 X) + ;; ((latin-viscii . isolated) "I-VISCII-" 2 X) + ((latin-viscii-upper . isolated) "I-MULE-VIET-U-" 2 X) + ((latin-viscii-lower . isolated) "I-MULE-VIET-L-" 2 X) + ((thai-tis620 . isolated) "I-THAI-" 2 X) + ((lao . isolated) "I-MULE-LAO-" 2 X) + ((arabic-1-column . isolated) "I-MULE-ARB1-" 2 X) + ((arabic-2-column . isolated) "I-MULE-ARB2-" 2 X) + ((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) + ( =adobe-japan1-6 "AJ1-" 5 d) + ( =adobe-japan1-base "I-AJ1-" 5 d) + ( =gt "GT-" 5 d) + ( =zinbun-oracle "ZOB-" 4 d) ( =ruimoku-v6 "RUI6-" 4 X) - ((chinese-big5-cdp . isolated) "I-CDP-" 4 X) - ( chinese-big5-cdp "CDP-" 4 X) - ((ideograph-daikanwa . isolated) "I-M-" 5 d) - ( ideograph-daikanwa "M-" 5 d) - ((ideograph-gt-k . isolated) "I-GT-K" 5 d) - ( ideograph-gt-k "GT-K" 5 d) - ((ideograph-cbeta . isolated) "I-CB" 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 . isolated) "I-HZK01-" 4 X) ( ideograph-hanziku-1 "HZK01-" 4 X) - ((ideograph-hanziku-2 . isolated) "I-HZK02-" 4 X) ( ideograph-hanziku-2 "HZK02-" 4 X) - ((ideograph-hanziku-3 . isolated) "I-HZK03-" 4 X) ( ideograph-hanziku-3 "HZK03-" 4 X) - ((ideograph-hanziku-4 . isolated) "I-HZK04-" 4 X) ( ideograph-hanziku-4 "HZK04-" 4 X) - ((ideograph-hanziku-5 . isolated) "I-HZK05-" 4 X) ( ideograph-hanziku-5 "HZK05-" 4 X) - ((ideograph-hanziku-6 . isolated) "I-HZK06-" 4 X) ( ideograph-hanziku-6 "HZK06-" 4 X) - ((ideograph-hanziku-7 . isolated) "I-HZK07-" 4 X) ( ideograph-hanziku-7 "HZK07-" 4 X) - ((ideograph-hanziku-8 . isolated) "I-HZK08-" 4 X) ( ideograph-hanziku-8 "HZK08-" 4 X) - ((ideograph-hanziku-9 . isolated) "I-HZK09-" 4 X) ( ideograph-hanziku-9 "HZK09-" 4 X) - ((ideograph-hanziku-10 . isolated) "I-HZK10-" 4 X) ( ideograph-hanziku-10 "HZK10-" 4 X) - ((ideograph-hanziku-11 . isolated) "I-HZK11-" 4 X) ( ideograph-hanziku-11 "HZK11-" 4 X) - ((ideograph-hanziku-12 . isolated) "I-HZK12-" 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 . isolated) "I-J90-" 4 X) - ( japanese-jisx0208-1990 "J90-" 4 X) - ((japanese-jisx0208 . isolated) "I-J83-" 4 X) - ( japanese-jisx0208 "J83-" 4 X) - ((japanese-jisx0213-1 . isolated) "I-JX1-" 4 X) - ( japanese-jisx0213-1 "JX1-" 4 X) - ((japanese-jisx0213-2 . isolated) "I-JX2-" 4 X) - ( japanese-jisx0213-2 "JX2-" 4 X) - ((japanese-jisx0212 . isolated) "I-JSP-" 4 X) - ( japanese-jisx0212 "JSP-" 4 X) - ((japanese-jisx0208-1978 . isolated) "I-J78-" 4 X) - ( japanese-jisx0208-1978 "J78-" 4 X) - ((chinese-cns11643-1 . isolated) "I-C1-" 4 X) + ( =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) + ( =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) + ( =jis-x0208@1983 "J83-" 4 X) + ( =jis-x0208@1978 "J78-" 4 X) ( chinese-cns11643-1 "C1-" 4 X) - ((chinese-cns11643-2 . isolated) "I-C2-" 4 X) ( chinese-cns11643-2 "C2-" 4 X) - ((chinese-cns11643-3 . isolated) "I-C3-" 4 X) ( chinese-cns11643-3 "C3-" 4 X) - ((chinese-cns11643-4 . isolated) "I-C4-" 4 X) ( chinese-cns11643-4 "C4-" 4 X) - ((chinese-cns11643-5 . isolated) "I-C5-" 4 X) ( chinese-cns11643-5 "C5-" 4 X) - ((chinese-cns11643-6 . isolated) "I-C6-" 4 X) ( chinese-cns11643-6 "C6-" 4 X) - ((chinese-cns11643-7 . isolated) "I-C7-" 4 X) ( chinese-cns11643-7 "C7-" 4 X) - ((korean-ksc5601 . isolated) "I-K0-" 4 X) ( korean-ksc5601 "K0-" 4 X) - ((chinese-gb2312 . isolated) "I-G0-" 4 X) ( chinese-gb2312 "G0-" 4 X) - ((=iso-ir165 . isolated) "I-EGB-" 4 X) ( =iso-ir165 "EGB-" 4 X) - ((latin-iso8859-1 . isolated) "I-LATIN1-" 2 X) ( latin-iso8859-1 "LATIN1-" 2 X) - ((latin-iso8859-2 . isolated) "I-LATIN2-" 2 X) ( latin-iso8859-2 "LATIN2-" 2 X) - ((latin-iso8859-3 . isolated) "I-LATIN3-" 2 X) ( latin-iso8859-3 "LATIN3-" 2 X) - ((latin-iso8859-4 . isolated) "I-LATIN4-" 2 X) ( latin-iso8859-4 "LATIN4-" 2 X) - ((cyrillic-iso8859-5 . isolated) "I-CYRILLIC-" 2 X) ( cyrillic-iso8859-5 "CYRILLIC-" 2 X) - ((greek-iso8859-7 . isolated) "I-GREEK-" 2 X) ( greek-iso8859-7 "GREEK-" 2 X) - ((hebrew-iso8859-8 . isolated) "I-HEBREW-" 2 X) ( hebrew-iso8859-8 "HEBREW-" 2 X) - ((latin-iso8859-9 . isolated) "I-LATIN5-" 2 X) ( latin-iso8859-9 "LATIN5-" 2 X) - ((latin-jisx0201 . isolated) "I-LATINJ-" 2 X) ( latin-jisx0201 "LATINJ-" 2 X) - ((katakana-jisx0201 . isolated) "I-KATAKANA-" 2 X) ( katakana-jisx0201 "KATAKANA-" 2 X) - ;; ((latin-viscii . isolated) "I-VISCII-" 2 X) - ;; ( latin-viscii "VISCII-" 2 X) - ((latin-tcvn5712 . isolated) "I-VSCII2-" 2 X) ( latin-tcvn5712 "VSCII2-" 2 X) - ((thai-tis620 . isolated) "I-THAI-" 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) - ((lao . isolated) "I-MULE-LAO-" 2 X) ( lao "MULE-LAO-" 2 X) ( ethiopic "MULE-ETHIO-" 4 X) - ((arabic-1-column . isolated) "I-MULE-ARB1-" 2 X) ( arabic-1-column "MULE-ARB1-" 2 X) - ((arabic-2-column . isolated) "I-MULE-ARB2-" 2 X) ( arabic-2-column "MULE-ARB2-" 2 X) - ((arabic-digit . isolated) "I-MULE-ARBD-" 2 X) ( arabic-digit "MULE-ARBD-" 2 X) - ((ipa . isolated) "I-MULE-IPA-" 2 X) ( ipa "MULE-IPA-" 2 X) - ((china3-jef . isolated) "I-JC3-" 4 X) - ( china3-jef "JC3-" 4 X) - ((chinese-big5 . isolated) "I-B-" 4 X) - ( chinese-big5 "B-" 4 X) - ( chinese-big5 "C0-" 4 X) + (=>>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 @@ -295,6 +388,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"