X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=966a4de84fcb4433808f8ae8ceb4616bba770430;hb=46fdc67510d0c44bec2c1a5283aa4ceaebb3e9c0;hp=928b6954f0dbeb836f86149b8e3c98439e543a78;hpb=b97df287541df3b342b68edc2490062681081286;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index 928b695..966a4de 100644 --- a/lisp/mule/mule-coding.el +++ b/lisp/mule/mule-coding.el @@ -191,47 +191,31 @@ ( =adobe-japan1-6 "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) + ((=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) + ( =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) ((=gt . isolated) "I-GT-" 5 d) ( =gt "GT-" 5 d) - ( =zinbun-oracle "ZOB-" 4 d) - ((=ruimoku-v6 . isolated) "I-RUI6-" 4 X) - ( =ruimoku-v6 "RUI6-" 4 X) - ((=big5-cdp . isolated) "I-CDP-" 4 X) - ( =big5-cdp "CDP-" 4 X) - ((=daikanwa@rev2 . isolated) "I-M-" 5 d) - ( =daikanwa/ho "M-H" 4 d) - ( =daikanwa/+p "M-p" 5 d) - ( =daikanwa "M-" 5 d) - ( =daikanwa@rev2 "r2M-" 5 d) - ( =daikanwa@rev1 "r1M-" 5 d) - ((=gt-k . isolated) "I-GT-K" 5 d) - ( =gt-k "GT-K" 5 d) - ((=cbeta . isolated) "I-CB" 5 d) - ( =cbeta "CB" 5 d) - ((=hanziku-1 . isolated) "I-HZK01-" 4 X) - ( =hanziku-1 "HZK01-" 4 X) - ((=hanziku-2 . isolated) "I-HZK02-" 4 X) - ( =hanziku-2 "HZK02-" 4 X) - ((=hanziku-3 . isolated) "I-HZK03-" 4 X) - ( =hanziku-3 "HZK03-" 4 X) - ((=hanziku-4 . isolated) "I-HZK04-" 4 X) - ( =hanziku-4 "HZK04-" 4 X) - ((=hanziku-5 . isolated) "I-HZK05-" 4 X) - ( =hanziku-5 "HZK05-" 4 X) - ((=hanziku-6 . isolated) "I-HZK06-" 4 X) - ( =hanziku-6 "HZK06-" 4 X) - ((=hanziku-7 . isolated) "I-HZK07-" 4 X) - ( =hanziku-7 "HZK07-" 4 X) - ((=hanziku-8 . isolated) "I-HZK08-" 4 X) - ( =hanziku-8 "HZK08-" 4 X) - ((=hanziku-9 . isolated) "I-HZK09-" 4 X) - ( =hanziku-9 "HZK09-" 4 X) - ((=hanziku-10 . isolated) "I-HZK10-" 4 X) - ( =hanziku-10 "HZK10-" 4 X) - ((=hanziku-11 . isolated) "I-HZK11-" 4 X) - ( =hanziku-11 "HZK11-" 4 X) - ((=hanziku-12 . isolated) "I-HZK12-" 4 X) - ( =hanziku-12 "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) @@ -245,9 +229,6 @@ ( =jis-x0213-2 "JX2-" 4 X) ( =jis-x0213-1@2004 "JX3-" 4 X) ( =jis-x0212 "JSP-" 4 X) - ( =jis-x0208@1983 "J83-" 4 X) - ((chinese-gb2312 . isolated) "I-G0-" 4 X) - ((=iso-ir165 . isolated) "I-EGB-" 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) @@ -255,8 +236,37 @@ ((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-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 . isolated) "I-G0-" 4 X) + ( chinese-gb2312 "G0-" 4 X) + ((=iso-ir165 . isolated) "I-EGB-" 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) + ((=gt-k . isolated) "I-GT-K" 5 d) + ((=cbeta . isolated) "I-CB" 5 d) + ((=big5-cdp . isolated) "I-CDP-" 4 X) + ( =big5-cdp "CDP-" 4 X) ((=big5-eten . isolated) "I-B-" 4 X) + ((=hanziku-1 . isolated) "I-HZK01-" 4 X) + ((=hanziku-2 . isolated) "I-HZK02-" 4 X) + ((=hanziku-3 . isolated) "I-HZK03-" 4 X) + ((=hanziku-4 . isolated) "I-HZK04-" 4 X) + ((=hanziku-5 . isolated) "I-HZK05-" 4 X) + ((=hanziku-6 . isolated) "I-HZK06-" 4 X) + ((=hanziku-7 . isolated) "I-HZK07-" 4 X) + ((=hanziku-8 . isolated) "I-HZK08-" 4 X) + ((=hanziku-9 . isolated) "I-HZK09-" 4 X) + ((=hanziku-10 . isolated) "I-HZK10-" 4 X) + ((=hanziku-11 . isolated) "I-HZK11-" 4 X) + ((=hanziku-12 . isolated) "I-HZK12-" 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) @@ -278,45 +288,35 @@ ((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) + ( =zinbun-oracle "ZOB-" 4 d) + ( =daikanwa/ho "M-H" 4 d) + ( =daikanwa/+p "M-p" 5 d) + ( =daikanwa "M-" 5 d) + ( =daikanwa@rev2 "r2M-" 5 d) + ( =daikanwa@rev1 "r1M-" 5 d) + ( korean-ksc5601 "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) + ( =cbeta "CB" 5 d) + ( =hanziku-1 "HZK01-" 4 X) + ( =hanziku-2 "HZK02-" 4 X) + ( =hanziku-3 "HZK03-" 4 X) + ( =hanziku-4 "HZK04-" 4 X) + ( =hanziku-5 "HZK05-" 4 X) + ( =hanziku-6 "HZK06-" 4 X) + ( =hanziku-7 "HZK07-" 4 X) + ( =hanziku-8 "HZK08-" 4 X) + ( =hanziku-9 "HZK09-" 4 X) + ( =hanziku-10 "HZK10-" 4 X) + ( =hanziku-11 "HZK11-" 4 X) + ( =hanziku-12 "HZK12-" 4 X) ((=hanziku-1 . isolated) "I-HZK1-" 4 X) ( =hanziku-1 "HZK1-" 4 X) ((=hanziku-2 . isolated) "I-HZK2-" 4 X) ( =hanziku-2 "HZK2-" 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@1978 "J78-" 4 X) - ( chinese-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) - ( korean-ksc5601 "K0-" 4 X) - ( chinese-gb2312 "G0-" 4 X) - ( =iso-ir165 "EGB-" 4 X) ( latin-iso8859-1 "LATIN1-" 2 X) ( latin-iso8859-2 "LATIN2-" 2 X) ( latin-iso8859-3 "LATIN3-" 2 X) @@ -442,11 +442,21 @@ )) (make-coding-system + 'utf-8-ivs-mcs 'utf-8 + "Coding-system of UTF-8 with IVS." + '(mnemonic "MTF8i" enable-decomposition t)) + + (make-coding-system 'utf-8-mcs-er 'utf-8 "Coding-system of UTF-8 with entity-reference." '(mnemonic "MTF8r" use-entity-reference t)) (make-coding-system + 'utf-8-ivs-mcs-er 'utf-8 + "Coding-system of UTF-8 with IVS and entity-reference." + '(mnemonic "MTF8ir" enable-decomposition t 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)) @@ -455,102 +465,216 @@ 'utf-8-gb 'utf-8 "Coding-system of UTF-8 using GB mapping." '(mnemonic "UTF8G" - charset-g0 ucs-gb - charset-g1 =>ucs-gb + charset-g0 =ucs@gb + charset-g1 =>ucs@unicode charset-g2 =>ucs)) (make-coding-system + 'utf-8-ivs-gb 'utf-8 + "Coding-system of UTF-8 using GB mapping with IVS." + '(mnemonic "UTF8iG" + charset-g0 =ucs@gb + charset-g1 =>ucs@unicode + charset-g2 =>ucs + enable-decomposition t)) + + (make-coding-system 'utf-8-gb-er 'utf-8 "Coding-system of UTF-8 using GB mapping with entity-reference." '(mnemonic "UTF8Gr" - charset-g0 ucs-gb - charset-g1 =>ucs-gb + charset-g0 =ucs@gb + charset-g1 =>ucs@unicode charset-g2 =>ucs use-entity-reference t)) (make-coding-system + 'utf-8-ivs-gb-er 'utf-8 + "Coding-system of UTF-8 using GB mapping with IVS and entity-reference." + '(mnemonic "UTF8iGr" + charset-g0 =ucs@gb + charset-g1 =>ucs@unicode + charset-g2 =>ucs + enable-decomposition t + use-entity-reference t)) + + (make-coding-system 'utf-8-cns 'utf-8 "Coding-system of UTF-8 using CNS mapping." '(mnemonic "UTF8C" - charset-g0 ucs-cns - charset-g1 =>ucs-cns + charset-g0 =ucs@cns + charset-g1 =>ucs@cns charset-g2 =>ucs)) (make-coding-system + 'utf-8-ivs-cns 'utf-8 + "Coding-system of UTF-8 using CNS mapping with IVS." + '(mnemonic "UTF8iC" + charset-g0 =ucs@cns + charset-g1 =>ucs@cns + charset-g2 =>ucs + enable-decomposition t)) + + (make-coding-system 'utf-8-cns-er 'utf-8 "Coding-system of UTF-8 using CNS mapping with entity-reference." '(mnemonic "UTF8Cr" - charset-g0 ucs-cns - charset-g1 =>ucs-cns + charset-g0 =ucs@cns + charset-g1 =>ucs@cns + charset-g2 =>ucs + use-entity-reference t)) + + (make-coding-system + 'utf-8-ivs-cns-er 'utf-8 + "Coding-system of UTF-8 using CNS mapping with IVS and entity-reference." + '(mnemonic "UTF8iCr" + charset-g0 =ucs@cns + charset-g1 =>ucs@cns charset-g2 =>ucs + enable-decomposition t use-entity-reference t)) (make-coding-system 'utf-8-big5 'utf-8 "Coding-system of UTF-8 using Big5 mapping." '(mnemonic "UTF8B" - charset-g0 ucs-big5 - charset-g1 =>ucs-big5 + charset-g0 =ucs@big5 + charset-g1 =>ucs@big5 charset-g2 =>ucs)) (make-coding-system + 'utf-8-ivs-big5 'utf-8 + "Coding-system of UTF-8 using Big5 mapping with IVS." + '(mnemonic "UTF8iB" + charset-g0 =ucs@big5 + charset-g1 =>ucs@big5 + charset-g2 =>ucs + enable-decomposition t)) + + (make-coding-system 'utf-8-big5-er 'utf-8 "Coding-system of UTF-8 using Big5 mapping with entity-reference." '(mnemonic "UTF8Br" - charset-g0 ucs-big5 - charset-g1 =>ucs-big5 + charset-g0 =ucs@big5 + charset-g1 =>ucs@big5 charset-g2 =>ucs use-entity-reference t)) (make-coding-system + 'utf-8-ivs-big5-er 'utf-8 + "Coding-system of UTF-8 using Big5 mapping with IVS and entity-reference." + '(mnemonic "UTF8iBr" + charset-g0 =ucs@big5 + charset-g1 =>ucs@big5 + charset-g2 =>ucs + enable-decomposition t + use-entity-reference t)) + + (make-coding-system 'utf-8-jis 'utf-8 - "Coding-system of UTF-8 using JIS mapping." - '(mnemonic "UTF8J" - charset-g0 =ucs@jis-2000 - charset-g1 =>ucs-jis + "Coding-system of UTF-8 using JIS2000 mapping." + '(mnemonic "UTF8J00" + charset-g0 =ucs@jis/2000 + charset-g1 =>ucs@jis charset-g2 =>ucs)) (make-coding-system + 'utf-8-ivs-jis 'utf-8 + "Coding-system of UTF-8 using JIS2000 mapping with IVS." + '(mnemonic "UTF8iJ00" + charset-g0 =ucs@jis/2000 + charset-g1 =>ucs@jis + charset-g2 =>ucs + enable-decomposition t)) + + (make-coding-system 'utf-8-jis-er 'utf-8 - "Coding-system of UTF-8 using JIS mapping with entity-reference." - '(mnemonic "UTF8Jr" - charset-g0 =ucs@jis-2000 - charset-g1 =>ucs-jis + "Coding-system of UTF-8 using JIS2000 mapping with entity-reference." + '(mnemonic "UTF8J00r" + charset-g0 =ucs@jis/2000 + charset-g1 =>ucs@jis charset-g2 =>ucs use-entity-reference t)) (make-coding-system + 'utf-8-ivs-jis-er 'utf-8 + "Coding-system of UTF-8 using JIS2000 mapping with IVS and entity-reference." + '(mnemonic "UTF8iJ00r" + charset-g0 =ucs@jis/2000 + charset-g1 =>ucs@jis + charset-g2 =>ucs + enable-decomposition t + use-entity-reference t)) + + (make-coding-system 'utf-8-jp 'utf-8 - "Coding-system of UTF-8 for common glyphs used in Japan." - '(mnemonic "UTF8J" - charset-g0 =ucs@jp - charset-g1 =>ucs-jis + "Coding-system of UTF-8 using =ucs@JP mapping." + '(mnemonic "UTF8JP" + charset-g0 =ucs@JP + charset-g1 =>ucs@jis charset-g2 =>ucs)) (make-coding-system + 'utf-8-ivs-jp 'utf-8 + "Coding-system of UTF-8 using =ucs@JP mapping with IVS." + '(mnemonic "UTF8iJP" + charset-g0 =ucs@JP + charset-g1 =>ucs@jis + charset-g2 =>ucs + enable-decomposition t)) + + (make-coding-system 'utf-8-jp-er 'utf-8 - "Coding-system of UTF-8 using =ucs@jp mapping with entity-reference." - '(mnemonic "UTF8Jr" - charset-g0 =ucs@jp - charset-g1 =>ucs-jis + "Coding-system of UTF-8 using =ucs@JP mapping with entity-reference." + '(mnemonic "UTF8JPr" + charset-g0 =ucs@JP + charset-g1 =>ucs@jis + charset-g2 =>ucs + use-entity-reference t)) + + (make-coding-system + 'utf-8-ivs-jp-er 'utf-8 + "Coding-system of UTF-8 using =ucs@JP mapping with IVS and entity-reference." + '(mnemonic "UTF8iJPr" + charset-g0 =ucs@JP + charset-g1 =>ucs@jis charset-g2 =>ucs + enable-decomposition t use-entity-reference t)) (make-coding-system 'utf-8-ks 'utf-8 "Coding-system of UTF-8 using KS mapping." '(mnemonic "UTF8K" - charset-g0 ucs-ks - charset-g1 =>ucs-ks + charset-g0 =ucs@ks + charset-g1 =>ucs@ks charset-g2 =>ucs)) (make-coding-system + 'utf-8-ivs-ks 'utf-8 + "Coding-system of UTF-8 using KS mapping with IVS." + '(mnemonic "UTF8iK" + charset-g0 =ucs@ks + charset-g1 =>ucs@ks + charset-g2 =>ucs + enable-decomposition t)) + + (make-coding-system 'utf-8-ks-er 'utf-8 "Coding-system of UTF-8 using KS mapping with entity-reference." '(mnemonic "UTF8Kr" - charset-g0 ucs-ks - charset-g1 =>ucs-ks + charset-g0 =ucs@ks + charset-g1 =>ucs@ks + charset-g2 =>ucs + use-entity-reference t)) + + (make-coding-system + 'utf-8-ivs-ks-er 'utf-8 + "Coding-system of UTF-8 using KS mapping with IVS and entity-reference." + '(mnemonic "UTF8iKr" + charset-g0 =ucs@ks + charset-g1 =>ucs@ks charset-g2 =>ucs + enable-decomposition t use-entity-reference t)) (define-coding-system-alias 'utf-8 'utf-8-mcs)