X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=20a4a7af215fea50c51c22fbeb26a3ba83d5ab5b;hb=a05823abddb9345d1af9e9514cbbf7f2968e006f;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..20a4a7a 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 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,10 +182,11 @@ (when (featurep 'utf-2000) (setq coded-charset-entity-reference-alist - '(((ideograph-gt . isolated) "I-GT-" 5 d) + '(((=adobe-japan1-base . 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) - ((ideograph-gt-k . isolated) "I-GT-K" 5 d) + ((=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) @@ -190,12 +200,13 @@ ((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) + ((=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) @@ -229,11 +240,14 @@ ((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) + ( =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 "CDP-" 4 X) - ( ideograph-daikanwa "M-" 5 d) - ( ideograph-gt-k "GT-K" 5 d) + ( =big5-cdp "CDP-" 4 X) + ( =daikanwa "M-" 5 d) + ( =gt-k "GT-K" 5 d) ( ideograph-cbeta "CB" 5 d) ( ideograph-hanziku-1 "HZK01-" 4 X) ( ideograph-hanziku-2 "HZK02-" 4 X) @@ -251,12 +265,13 @@ ( 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) + ( =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) + ( =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 +303,54 @@ ( 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) + (=>>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) + ( =>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) + ( =>zinbun-oracle "A-ZOB-" 4 d) + ( =>ucs@iso "A-IU+" 4 X) + ( =>ucs@unicode "A-UU+" 4 X) + (=>>ucs@iso "G-IU+" 4 X) + (=>>ucs@unicode "G-UU+" 4 X) + (=>>ucs@jis "G-JU+" 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