X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-charset.el;h=37e89512839ad278bef289ff6bc7006362f4de56;hb=70d046c32fe6a05f14bb070cd3dfa6e654057cc6;hp=10d28563ae07ffcc9e42ae394734912707bd1ccc;hpb=e86fb943bf3dca2611fd2febb619071e4202fa51;p=chise%2Fxemacs-chise.git

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index 10d2856..37e8951 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 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014 MORIOKA Tomohiko
 
 ;; Author: Unknown
 ;; Keywords: i18n, mule, internal
@@ -281,8 +281,43 @@ DESCRIPTION (string) is the description string of the charset."
 	  chinese-gb2312
 	  japanese-jisx0208
 	  =jis-x0208-1990
-	  japanese-jisx0208-1978
+	  =ucs-radicals
+	  =ucs-radicals@unicode
+	  =ucs-bmp-cjk@gb
+          ;; =ucs-bmp-cjk@JP
+	  =ucs-bmp-cjk@JP/hanazono
+	  =ucs-bmp-cjk-compat
+          =ucs-bmp-cjk-compat@unicode
+          japanese-jisx0208-1978
 	  =jis-x0212
+	  chinese-cns11643-1
+	  chinese-cns11643-2
+	  chinese-cns11643-3
+          chinese-cns11643-4
+	  chinese-cns11643-5
+	  chinese-cns11643-6
+	  chinese-cns11643-7
+	  =mj-0
+	  =mj-1
+	  =adobe-japan1-0
+	  =adobe-japan1-1
+	  =adobe-japan1-2
+	  =adobe-japan1-3
+	  =adobe-japan1-4
+	  =adobe-japan1-5
+	  =adobe-japan1-6
+	  =big5-cdp
+	  =hanyo-denshi/ja
+	  =hanyo-denshi/jb
+	  =hanyo-denshi/jc
+	  =hanyo-denshi/jd
+	  =hanyo-denshi/ft
+	  =hanyo-denshi/ia
+	  =hanyo-denshi/ib
+	  =hanyo-denshi/hg
+	  =hanyo-denshi/ip
+	  =hanyo-denshi/jt
+	  =hanyo-denshi/ks/mf
 	  =gt-pj-2
 	  =gt-pj-3
 	  =gt-pj-4
@@ -295,14 +330,6 @@ DESCRIPTION (string) is the description string of the charset."
 	  =gt-pj-11
 	  =gt-pj-k1
 	  =gt-pj-k2
-	  chinese-cns11643-1
-	  chinese-cns11643-2
-	  chinese-cns11643-3
-          chinese-cns11643-4
-	  chinese-cns11643-5
-	  chinese-cns11643-6
-	  chinese-cns11643-7
-	  =big5-cdp
 	  chinese-big5-eten-a
 	  chinese-big5-eten-b
 	  chinese-big5
@@ -310,7 +337,6 @@ DESCRIPTION (string) is the description string of the charset."
 	  =jis-x0213-2-2000
 	  ;; chinese-gb12345
 	  =gt-pj-1
-	  =ucs-radicals
 	  =ucs-bmp-cjk
 	  =ucs-sip-ext-b
 	  =ruimoku-v6
@@ -327,20 +353,7 @@ DESCRIPTION (string) is the description string of the charset."
 	  =hanziku-10
 	  =hanziku-11
 	  =hanziku-12
-	  =hanyo-denshi/ja
-	  =hanyo-denshi/jb
-	  =hanyo-denshi/jc
-	  =hanyo-denshi/jd
-	  =hanyo-denshi/ft
-	  =hanyo-denshi/ia
-	  =hanyo-denshi/ib
-	  =hanyo-denshi/hg
-	  =hanyo-denshi/ip
-	  =hanyo-denshi/jt
-	  =hanyo-denshi/ks/mf
-	  =ucs-radicals@unicode
 	  =ucs-sip-ext-b@iso
-	  =ucs-bmp-cjk@unicode
 	  ideograph-daikanwa-2
 	  ideograph-daikanwa
 	  korean-ksc5601
@@ -362,6 +375,41 @@ DESCRIPTION (string) is the description string of the charset."
 	  arabic-iso8859-6
 	  chinese-big5-1
 	  chinese-big5-2
+          ;; =zihai-17xx
+	  =ucs-bmp-itaiji-084
+	  =big5-cdp-var-3
+	  =big5-cdp-var-5
+	  ==jis-x0208@1990
+	  ==ucs-bmp-cjk@gb
+          ==ucs-bmp-cjk@JP/hanazono
+	  ==ucs-sip-ext-b@iso
+	  ==mj-0
+	  ==mj-1
+	  ==hanyo-denshi/ja
+	  ==hanyo-denshi/jb
+	  ==hanyo-denshi/jc
+	  ==hanyo-denshi/jd
+	  ==hanyo-denshi/ft
+	  ==hanyo-denshi/ia
+	  ==hanyo-denshi/ib
+	  ==hanyo-denshi/hg
+	  ==hanyo-denshi/ip
+	  ==hanyo-denshi/jt
+	  ==adobe-japan1-6
+	  ==big5-cdp
+	  ==cns11643-1
+	  ==cns11643-2
+	  ==cns11643-3
+	  ==cns11643-4
+	  ==cns11643-5
+	  ==cns11643-6
+	  ==cns11643-7
+	  ==jis-x0208@1983
+	  ==jis-x0208@1978
+	  ==jis-x0213-1@2000
+	  ==jis-x0212
+	  ==ks-x1001
+	  ==daikanwa
 	  ;; ucs-sip
 	  =>>big5-cdp
 	  =>>jis-x0208
@@ -371,12 +419,15 @@ DESCRIPTION (string) is the description string of the charset."
 	  =>jis-x0213-1
 	  ucs-bmp
 	  ==>ucs-bmp-cjk@bucs
-	  =>>ucs@unicode
-	  =>>gt
-	  =adobe-japan1-6
+	  =>ucs-bmp-cjk@unicode
+          =+>ucs-bmp-cjk@unicode
+          =+>ucs-bmp-cjk-compat@jis
+	  ;; =>>ucs@unicode
 	  =adobe-japan1-base
 	  =>jis-x0208@1997
 	  =>>hanyo-denshi/ft
+	  =>>hanyo-denshi/jt
+	  =>>gt
 	  )))
 
 ;;; mule-charset.el ends here