X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=7037dda54ff8ea8aa8c241d72357786943ea433a;hb=181acc0306a08f51a25652d6ba9eb26aa36a3252;hp=04545aa2d6c4199e0fb3819d89a0a78ea079478b;hpb=5b15decbb761532f248b52d98b050d168c387e04;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index 04545aa..7037dda 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,6 +290,7 @@ (==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) @@ -348,15 +350,50 @@ (===ks-x1001 "R-K0-" 4 X) ( =iso-ir165 "EGB-" 4 X) ( =jis-x0208@1983 "J83-" 4 X) - ( =jis-x0208@1978 "J78-" 4 X) + ( =koseki "KOSEKI-" 6 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-010 "U-i010+" 4 X) + ( =ucs-itaiji-011 "U-i011+" 4 X) + ( =ucs-itaiji-084 "U-i084+" 4 X) + ( =big5-cdp-var-001 "CDP-v001-" 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-itaiji-001 "CDP-i001-" 4 X) + ( =big5-cdp-itaiji-002 "CDP-i002-" 4 X) + ( =big5-cdp-itaiji-003 "CDP-i003-" 4 X) + ( =jis-x0208@1978/1pr "J78-" 4 X) ( =gt-k "GT-K" 5 d) + (==jis-x0208@1983 "g2-J83-" 4 X) + (==koseki "g2-KOSEKI-" 6 d) + (==ucs-var-002 "g2-U-v002+" 4 X) + (==ucs-itaiji-001 "g2-U-i001+" 4 X) + (==ucs-itaiji-002 "g2-U-i002+" 4 X) + (==ucs-itaiji-003 "g2-U-i003+" 4 X) + (==ucs-itaiji-005 "g2-U-i005+" 4 X) + (==big5-cdp-itaiji-001 "g2-CDP-i001-" 4 X) + (==jis-x0208@1978/1pr "g2-J78-" 4 X) (==gt-k "g2-GT-K" 5 d) (===gt-k "R-GT-K" 5 d) - (==jis-x0208@1983 "g2-J83-" 4 X) - (==jis-x0208@1978 "g2-J78-" 4 X) (===jis-x0208@1983 "R-J83-" 4 X) (===jis-x0208@1978 "R-J78-" 4 X) - ( =koseki "KOSEKI-" 6 d) ( =cbeta "CB" 5 d) (=>cbeta "A-CB" 5 d) (==cbeta "g2-CB" 5 d) @@ -371,14 +408,27 @@ (===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) @@ -386,6 +436,13 @@ (===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) @@ -406,11 +463,6 @@ ((=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-itaiji-002 "U-i002+" 4 X) - ( =ucs-itaiji-084 "U-i084+" 4 X) ( =big5-cdp-var-3 "CDP-var3-" 4 X) ( =big5-cdp-var-5 "CDP-var5-" 4 X) ( latin-iso8859-1 "LATIN1-" 2 X) @@ -434,11 +486,12 @@ ( arabic-2-column "MULE-ARB2-" 2 X) ( arabic-digit "MULE-ARBD-" 2 X) ( ipa "MULE-IPA-" 2 X) - (=>>>jis-x0208 "g2-J0-" 4 X) - (=>>>jis-x0208 "GI-J0-" 4 X) - (=>>>jis-x0213-1 "g2-JX1-" 4 X) - (=>>>jis-x0213-1 "GI-JX1-" 4 X) - (=>>>jis-x0213-1@2004 "GI-JX3-" 4 X) + ;; (=>>>jis-x0208 "g2-J0-" 4 X) + ;; (=>>>jis-x0208 "GI-J0-" 4 X) + ;; (=>>>jis-x0213-1 "g2-JX1-" 4 X) + ;; (=>>>jis-x0213-1 "GI-JX1-" 4 X) + ;; (=>>>jis-x0213-1@2004 "GI-JX3-" 4 X) + (=>>mj "G-MJ" 6 d) (=>>adobe-japan1 "G-AJ1-" 5 d) (=>>jis-x0208 "G-J0-" 4 X) (=>>jis-x0213-1@2000 "G-JX1-" 4 X) @@ -454,7 +507,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) @@ -473,16 +525,20 @@ ( =>gt-k "A-GT-K" 5 d) ( =>zinbun-oracle "A-ZOB-" 4 d) (==>ucs@bucs "BUCS+" 4 X) - ( =>iwds-1 "IWDS1-" 3 d) ( =>ucs@iwds-1 "A-IWDSU+" 4 X) + ( =>ucs@cognate "A-cgnU+" 4 X) + ( =>ucs@component "A-compU+" 4 X) + ( =>iwds-1 "IWDS1-" 3 d) + ( =>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) + ( =>ruimoku-v6 "A-RUI6-" 4 X) (=+>ucs@iso "o-IU+" 4 X) (=+>ucs@unicode "o-UU+" 4 X) (=+>ucs@jis "o-JU+" 4 X) @@ -551,6 +607,14 @@ (=>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-003 "A-U-i003+" 4 X) + (=>ucs-itaiji-004 "A-U-i004+" 4 X) + (=>ucs-itaiji-005 "A-U-i005+" 4 X) + (=>ucs-itaiji-006 "A-U-i006+" 4 X) + (=>ucs-itaiji-007 "A-U-i007+" 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) @@ -594,7 +658,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 @@ -603,6 +668,7 @@ charset-g0 =ucs@gb charset-g1 =>ucs@unicode charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -612,6 +678,7 @@ charset-g0 =ucs@gb charset-g1 =>ucs@unicode charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -621,6 +688,7 @@ charset-g0 =ucs@gb charset-g1 =>ucs@unicode charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -630,7 +698,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 @@ -639,6 +708,7 @@ charset-g0 =ucs@cns charset-g1 =>ucs@cns charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -648,6 +718,7 @@ charset-g0 =ucs@cns charset-g1 =>ucs@cns charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -657,6 +728,7 @@ charset-g0 =ucs@cns charset-g1 =>ucs@cns charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -666,7 +738,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 @@ -675,6 +748,7 @@ charset-g0 =ucs@big5 charset-g1 =>ucs@big5 charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -684,6 +758,7 @@ charset-g0 =ucs@big5 charset-g1 =>ucs@big5 charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -693,6 +768,7 @@ charset-g0 =ucs@big5 charset-g1 =>ucs@big5 charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -702,7 +778,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 @@ -711,6 +788,7 @@ charset-g0 =ucs@jis/2000 charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -720,6 +798,7 @@ charset-g0 =ucs@jis/2000 charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -729,6 +808,7 @@ charset-g0 =ucs@jis/2000 charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -738,7 +818,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 @@ -747,6 +828,7 @@ charset-g0 =ucs@JP charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -756,6 +838,7 @@ charset-g0 =ucs@JP charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -765,6 +848,7 @@ charset-g0 =ucs@JP charset-g1 =>ucs@jis charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t)) @@ -774,7 +858,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 @@ -783,6 +868,7 @@ charset-g0 =ucs@ks charset-g1 =>ucs@ks charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t)) (make-coding-system @@ -792,6 +878,7 @@ charset-g0 =ucs@ks charset-g1 =>ucs@ks charset-g2 =>ucs + charset-g3 =ucs use-entity-reference t)) (make-coding-system @@ -801,6 +888,7 @@ charset-g0 =ucs@ks charset-g1 =>ucs@ks charset-g2 =>ucs + charset-g3 =ucs enable-decomposition t use-entity-reference t))