X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-charset.el;h=0c5ba1c3d83be241f142cbda52bc3157d515cd50;hb=0bb2cf05f557565e9bc6edfb3fa8878bd4ca05e0;hp=d54a3e60daafd695fdc93521df51bfed684992c3;hpb=ebaaa913484140ec025a9e2806e6d5d30c05df8e;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index d54a3e6..0c5ba1c 100644
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -4,7 +4,7 @@
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1996 Sun Microsystems.
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
-;;   2009, 2010, 2011, 2012, 2013, 2014, 2015 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 MORIOKA Tomohiko
 
 ;; Author: Unknown
 ;; Keywords: i18n, mule, internal
@@ -278,17 +278,15 @@ DESCRIPTION (string) is the description string of the charset."
 	  greek-iso8859-7
 	  thai-tis620
 	  =jis-x0208
+	  =jis-x0208@1983
 	  chinese-gb2312
-	  japanese-jisx0208
 	  =jis-x0208-1990
 	  =ucs-radicals
 	  =ucs-radicals@unicode
 	  ;; =ucs-bmp-cjk@JP
 	  =ucs-bmp-cjk@JP/hanazono
 	  =ucs-bmp-cjk@gb
-	  =ucs-bmp-cjk-compat
-          =ucs-bmp-cjk-compat@unicode
-          japanese-jisx0208-1978
+	  japanese-jisx0208-1978
 	  =jis-x0212
 	  chinese-cns11643-1
 	  chinese-cns11643-2
@@ -318,6 +316,7 @@ DESCRIPTION (string) is the description string of the charset."
 	  =hanyo-denshi/ip
 	  =hanyo-denshi/jt
 	  =hanyo-denshi/ks/mf
+	  =hanyo-denshi/tk/mf-01
 	  =gt-pj-2
 	  =gt-pj-3
 	  =gt-pj-4
@@ -378,22 +377,33 @@ DESCRIPTION (string) is the description string of the charset."
 	  chinese-big5-2
           ;; =zihai-17xx
 	  =ucs-bmp-var-001
+	  =ucs-sip-var-001
 	  =ucs-bmp-var-002
+	  =ucs-sip-var-002
 	  =ucs-bmp-var-003
+	  =ucs-sip-var-003
+	  =ucs-bmp-var-004
 	  =ucs-bmp-itaiji-001
 	  =ucs-sip-itaiji-001
 	  =ucs-bmp-itaiji-002
+	  =ucs-sip-itaiji-002
 	  =ucs-bmp-itaiji-003
+	  =ucs-sip-itaiji-003
+	  =ucs-bmp-itaiji-004
+	  =ucs-bmp-itaiji-005
+	  =ucs-bmp-itaiji-006
 	  =ucs-bmp-itaiji-008
 	  =ucs-bmp-itaiji-084
-	  =big5-cdp-var-3
-	  =big5-cdp-var-5
+	  =big5-cdp-var-003
+	  =big5-cdp-var-004
+	  =big5-cdp-var-005
+	  =ucs-bmp-cjk-compat
+          =ucs-bmp-cjk-compat@unicode
+          =ucs-sip@JP/hanazono
 	  ==jis-x0208@1990
 	  ==ucs-radicals@unicode
 	  ==ucs-bmp-cjk@JP/hanazono
 	  ==ucs-bmp-cjk@gb
-          ==ucs-bmp-cjk-compat@gb
-          ==ucs-bmp-cjk-compat@JP
           ==ucs-sip-ext-b@iso
 	  ==mj-0
 	  ==mj-1
@@ -427,7 +437,9 @@ DESCRIPTION (string) is the description string of the charset."
 	  ==daikanwa
 	  ==cbeta
 	  ==jef-china3
-	  ===mj-0
+	  ==ucs-bmp-cjk-compat@JP
+          ==ucs-bmp-cjk-compat@gb
+          ===mj-0
 	  ===mj-1
           ===jis-x0208
 	  ===jis-x0208@1990
@@ -512,6 +524,7 @@ DESCRIPTION (string) is the description string of the charset."
 	  ===hng-smk ; 74
 	  ===cbeta
 	  ===jef-china3
+	  ===ucs-bmp-cjk-compat@unicode
 	  ;; ucs-sip
 	  =>>big5-cdp
 	  =>>jis-x0208