X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=78cb5cec09908645f23cf80f0635469710f37fc5;hb=9f94821da462412bb7a1b79a0a7ac4f4d4acc4ee;hp=f88d970cb32adb2fcabc8c42fb12b87934e0fd86;hpb=053309c0826c0bca64f89c85a52799c7ecd75981;p=chise%2Fxemacs-chise.git diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index f88d970..78cb5ce 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, 2011, 2012, 2013, 2014, 2015 MORIOKA Tomohiko +;; 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 MORIOKA Tomohiko ;; This file is part of XEmacs. @@ -278,6 +278,7 @@ ( =hanyo-denshi/ip "HD-IP-" 4 X) ( =hanyo-denshi/jt "HD-JT-" 4 X) ( =hanyo-denshi/ks "HD-KS-" 6 d) + ( =hanyo-denshi/tk "HD-TK-" 8 d) (==hanyo-denshi/ja "g2-HD-JA-" 4 X) (==hanyo-denshi/jb "g2-HD-JB-" 4 X) (==hanyo-denshi/jc "g2-HD-JC-" 4 X) @@ -289,11 +290,15 @@ (==hanyo-denshi/ip "g2-HD-IP-" 4 X) (==hanyo-denshi/jt "g2-HD-JT-" 4 X) (==hanyo-denshi/ks "g2-HD-KS-" 6 d) + (==hanyo-denshi/tk "g2-HD-TK-" 8 d) + (===hanyo-denshi/jb "R-HD-JB-" 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) ( =gt "GT-" 5 d) (==gt "g2-GT-" 5 d) (===gt "R-GT-" 5 d) @@ -304,14 +309,16 @@ ( =jis-x0212 "JSP-" 4 X) (==jis-x0208@1990 "g2-J90-" 4 X) (===jis-x0208@1990 "R-J90-" 4 X) + (===jis-x0208 "R-J0-" 4 X) (==jis-x0212 "g2-JSP-" 4 X) (==jis-x0213-1@2000 "g2-JX1-" 4 X) (==jis-x0213-2 "g2-JX2-" 4 X) (==jis-x0213-1@2004 "g2-JX3-" 4 X) - (===jis-x0213-1@2000 "R-JX1-" 4 X) + (===jis-x0213-1 "R-JX1-" 4 X) (===jis-x0213-2 "R-JX2-" 4 X) (===jis-x0213-1@2004 "R-JX3-" 4 X) (===jis-x0212 "R-JSP-" 4 X) + (===jis-x0213-1@2000 "R-J00X1-" 4 X) ( =cns11643-1 "C1-" 4 X) ( chinese-cns11643-2 "C2-" 4 X) ( chinese-cns11643-3 "C3-" 4 X) @@ -319,7 +326,8 @@ ( chinese-cns11643-5 "C5-" 4 X) ( chinese-cns11643-6 "C6-" 4 X) ( chinese-cns11643-7 "C7-" 4 X) - ( chinese-gb2312 "G0-" 4 X) + ( =gb2312 "G0-" 4 X) + ;; (==gb2312 "g2-G0-" 4 X) ( =big5-cdp "CDP-" 4 X) (==big5-cdp "g2-CDP-" 4 X) (===big5-cdp "R-CDP-" 4 X) @@ -351,10 +359,59 @@ (===jis-x0208@1983 "R-J83-" 4 X) (===jis-x0208@1978 "R-J78-" 4 X) ( =koseki "KOSEKI-" 6 d) + (==koseki "g2-KOSEKI-" 6 d) ( =cbeta "CB" 5 d) (=>cbeta "A-CB" 5 d) (==cbeta "g2-CB" 5 d) (===cbeta "R-CB" 5 d) + (===hng-jou "HNG001-" 5 d) + (===hng-keg "HNG002-" 5 d) + (===hng-dng "HNG003-" 5 d) + (===hng-mam "HNG005-" 5 d) + (===hng-drt "HNG006-" 5 d) + (===hng-kgk "HNG007-" 5 d) + (===hng-myz "HNG008-" 5 d) + (===hng-kda "HNG009-" 5 d) + (===hng-khi "HNG010-" 5 d) + (===hng-khm "HNG011-" 5 d) + (===hng-hok "HNG013-" 5 d) + (===hng-kyd "HNG014-" 5 d) + (===hng-sok "HNG015-" 5 d) + (===hng-yhk "HNG016-" 5 d) + (===hng-kak "HNG017-" 5 d) + (===hng-kar "HNG018-" 5 d) + (===hng-kae "HNG019-" 5 d) + (===hng-sys "HNG022-" 5 d) + (===hng-tsu "HNG024-" 5 d) + (===hng-tzj "HNG025-" 5 d) + (===hng-hos "HNG026-" 5 d) + (===hng-nak "HNG028-" 5 d) + (===hng-jhk "HNG029-" 5 d) + (===hng-hod "HNG030-" 5 d) + (===hng-gok "HNG031-" 5 d) + (===hng-ink "HNG033-" 5 d) + (===hng-nto "HNG034-" 5 d) + (===hng-nkm "HNG036-" 5 d) + (===hng-k24 "HNG037-" 5 d) + (===hng-nkk "HNG039-" 5 d) + (===hng-kcc "HNG041-" 5 d) + (===hng-kcj "HNG042-" 5 d) + (===hng-kbk "HNG043-" 5 d) + (===hng-sik "HNG044-" 5 d) + (===hng-skk "HNG046-" 5 d) + (===hng-kyu "HNG047-" 5 d) + (===hng-ksk "HNG048-" 5 d) + (===hng-wan "HNG049-" 5 d) + (===hng-okd "HNG050-" 5 d) + (===hng-wad "HNG054-" 5 d) + (===hng-kmi "HNG055-" 5 d) + (===hng-zkd "HNG056-" 5 d) + (===hng-doh "HNG057-" 5 d) + (===hng-jyu "HNG058-" 5 d) + (===hng-tzs "HNG060-" 5 d) + (===hng-kss "HNG064-" 5 d) + (===hng-kyo "HNG066-" 5 d) + (===hng-smk "HNG074-" 5 d) ( =hanziku-1 "HZK01-" 4 X) ( =hanziku-2 "HZK02-" 4 X) ( =hanziku-3 "HZK03-" 4 X) @@ -372,8 +429,32 @@ ((=hanziku-2 . isolated) "I-HZK2-" 4 X) ( =hanziku-2 "HZK2-" 4 X) ( =hanyo-denshi/ks/mf "KSMF-" 5 d) + ( =ucs-var-001 "U-v001+" 4 X) ( =ucs-var-002 "U-v002+" 4 X) + ( =ucs-var-003 "U-v003+" 4 X) + ( =ucs-var-004 "U-v004+" 4 X) + ( =ucs-var-005 "U-v005+" 4 X) + ( =ucs-var-006 "U-v006+" 4 X) + ( =ucs-var-008 "U-v008+" 4 X) + ( =ucs-var-010 "U-v010+" 4 X) + ( =ucs-itaiji-001 "U-i001+" 4 X) + ( =ucs-itaiji-002 "U-i002+" 4 X) + ( =ucs-itaiji-003 "U-i003+" 4 X) + ( =ucs-itaiji-004 "U-i004+" 4 X) + ( =ucs-itaiji-005 "U-i005+" 4 X) + ( =ucs-itaiji-006 "U-i006+" 4 X) + ( =ucs-itaiji-007 "U-i007+" 4 X) + ( =ucs-itaiji-008 "U-i008+" 4 X) + ( =ucs-itaiji-009 "U-i009+" 4 X) ( =ucs-itaiji-084 "U-i084+" 4 X) + ( =big5-cdp-itaiji-001 "CDP-i001-" 4 X) + (==big5-cdp-itaiji-001 "g2-CDP-i001-" 4 X) + ( =big5-cdp-itaiji-002 "CDP-i002-" 4 X) + ( =big5-cdp-itaiji-003 "CDP-i003-" 4 X) + ( =big5-cdp-var-002 "CDP-v002-" 4 X) + ( =big5-cdp-var-003 "CDP-v003-" 4 X) + ( =big5-cdp-var-004 "CDP-v004-" 4 X) + ( =big5-cdp-var-005 "CDP-v005-" 4 X) ( =big5-cdp-var-3 "CDP-var3-" 4 X) ( =big5-cdp-var-5 "CDP-var5-" 4 X) ( latin-iso8859-1 "LATIN1-" 2 X) @@ -417,7 +498,6 @@ (=>>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) (=+>jis-x0208 "o-J0-" 4 X) (=+>jis-x0213-1 "o-JX1-" 4 X) @@ -437,14 +517,18 @@ ( =>zinbun-oracle "A-ZOB-" 4 d) (==>ucs@bucs "BUCS+" 4 X) ( =>iwds-1 "IWDS1-" 3 d) + ( =>ucs@iwds-1 "A-IWDSU+" 4 X) + ( =>mj "A-MJ" 6 d) ( =>ucs@hanyo-denshi "A-HDU+" 4 X) ( =>ucs@hanyo-denshi "A-HD-UCS+" 4 X) ( =>ucs@iso "A-IU+" 4 X) ( =>ucs@unicode "A-UU+" 4 X) ( =>ucs@jis "A-JU+" 4 X) - ( =>ucs@jis/2004 "A-J04U+" 4 X) ( =>ucs@cns "A-CU+" 4 X) ( =>ucs@ks "A-KU+" 4 X) + ( =>ucs@jis/2004 "A-J04U+" 4 X) + ( =>ucs@component "A-compU+" 4 X) + ( =>ruimoku-v6 "A-RUI6-" 4 X) (=+>ucs@iso "o-IU+" 4 X) (=+>ucs@unicode "o-UU+" 4 X) (=+>ucs@jis "o-JU+" 4 X) @@ -476,10 +560,12 @@ (=>>ucs@JP "G-dJU+" 4 X) (==ucs@iso "g2-IU-" 8 X) (==ucs@unicode "g2-UU+" 4 X) + (==ucs@gb "g2-GU+" 4 X) (==ucs@cns "g2-CU+" 4 X) (==ucs@ks "g2-KU+" 4 X) (===ucs@iso "R-U-" 8 X) (===ucs@unicode "R-UU+" 4 X) + (===ucs@gb "R-GU+" 4 X) (===ucs@ks "R-KU+" 4 X) (==cns11643-1 "g2-C1-" 4 X) (==cns11643-2 "g2-C2-" 4 X) @@ -508,8 +594,15 @@ (=>>daikanwa/+p "G-M-p" 5 d) (=>daikanwa "A-M-" 5 d) (=>daikanwa/ho "A-M-H" 4 d) + (=>cns11643-5 "A-C5-" 4 X) (=>cns11643-7 "A-C7-" 4 X) (=>big5-cdp "A-CDP-" 4 X) + (=>ucs-itaiji-001 "A-U-i001+" 4 X) + (=>ucs-itaiji-002 "A-U-i002+" 4 X) + (=>ucs-itaiji-005 "A-U-i005+" 4 X) + (==ucs-itaiji-005 "g2-U-i005+" 4 X) + (=>ucs-itaiji-006 "A-U-i006+" 4 X) + (=>big5-cdp-itaiji-001 "A-CDP-i001-" 4 X) ( =jis-x0208@1978/i1 "J78i1-" 4 X) ( =shinjigen@rev "SJG2-" 4 d) ( =shinjigen@1ed "SJG1-" 4 d) @@ -553,7 +646,8 @@ '(mnemonic "UTF8G" charset-g0 =ucs@gb charset-g1 =>ucs@unicode - charset-g2 =>ucs)) + charset-g2 =>ucs + charset-g3 =ucs)) (make-coding-system 'utf-8-ivs-gb 'utf-8 @@ -562,6 +656,7 @@ charset-g0 =ucs@gb charset-g1 =>ucs@unicode charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -571,6 +666,7 @@ charset-g0 =ucs@gb charset-g1 =>ucs@unicode charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -580,6 +676,7 @@ charset-g0 =ucs@gb charset-g1 =>ucs@unicode charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -589,7 +686,8 @@ '(mnemonic "UTF8C" charset-g0 =ucs@cns charset-g1 =>ucs@cns - charset-g2 =>ucs)) + charset-g2 =>ucs + charset-g3 =ucs)) (make-coding-system 'utf-8-ivs-cns 'utf-8 @@ -598,6 +696,7 @@ charset-g0 =ucs@cns charset-g1 =>ucs@cns charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -607,6 +706,7 @@ charset-g0 =ucs@cns charset-g1 =>ucs@cns charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -616,6 +716,7 @@ charset-g0 =ucs@cns charset-g1 =>ucs@cns charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -625,7 +726,8 @@ '(mnemonic "UTF8B" charset-g0 =ucs@big5 charset-g1 =>ucs@big5 - charset-g2 =>ucs)) + charset-g2 =>ucs + charset-g3 =ucs)) (make-coding-system 'utf-8-ivs-big5 'utf-8 @@ -634,6 +736,7 @@ charset-g0 =ucs@big5 charset-g1 =>ucs@big5 charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -643,6 +746,7 @@ charset-g0 =ucs@big5 charset-g1 =>ucs@big5 charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -652,6 +756,7 @@ charset-g0 =ucs@big5 charset-g1 =>ucs@big5 charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -661,7 +766,8 @@ '(mnemonic "UTF8J00" charset-g0 =ucs@jis/2000 charset-g1 =>ucs@jis - charset-g2 =>ucs)) + charset-g2 =>ucs + charset-g3 =ucs)) (make-coding-system 'utf-8-ivs-jis 'utf-8 @@ -670,6 +776,7 @@ charset-g0 =ucs@jis/2000 charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -679,6 +786,7 @@ charset-g0 =ucs@jis/2000 charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -688,6 +796,7 @@ charset-g0 =ucs@jis/2000 charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -697,7 +806,8 @@ '(mnemonic "UTF8JP" charset-g0 =ucs@JP charset-g1 =>ucs@jis - charset-g2 =>ucs)) + charset-g2 =>ucs + charset-g3 =ucs)) (make-coding-system 'utf-8-ivs-jp 'utf-8 @@ -706,6 +816,7 @@ charset-g0 =ucs@JP charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -715,6 +826,7 @@ charset-g0 =ucs@JP charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -724,6 +836,7 @@ charset-g0 =ucs@JP charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -733,7 +846,8 @@ '(mnemonic "UTF8K" charset-g0 =ucs@ks charset-g1 =>ucs@ks - charset-g2 =>ucs)) + charset-g2 =>ucs + charset-g3 =ucs)) (make-coding-system 'utf-8-ivs-ks 'utf-8 @@ -742,6 +856,7 @@ charset-g0 =ucs@ks charset-g1 =>ucs@ks charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -751,6 +866,7 @@ charset-g0 =ucs@ks charset-g1 =>ucs@ks charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -760,6 +876,7 @@ charset-g0 =ucs@ks charset-g1 =>ucs@ks charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t))