Sync up with r21-4-22-chise-0_25-cns7-completed.

[chise/xemacs-chise.git-] / lisp / mule / mule-charset.el

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index 10d2856..366a7d5 100644 (file)
--- 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 MORIOKA Tomohiko
 
 ;; Author: Unknown
 ;; Keywords: i18n, mule, internal
@@ -281,7 +281,14 @@ 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@unicode
+          ;; =ucs-bmp-cjk@JP
+         =ucs-bmp-cjk@JP/hanazono
+         =ucs-bmp-cjk-compat
+          =ucs-bmp-cjk-compat@unicode
+          japanese-jisx0208-1978
          =jis-x0212
          =gt-pj-2
          =gt-pj-3
@@ -310,7 +317,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
@@ -338,9 +344,7 @@ DESCRIPTION (string) is the description string of the charset."
          =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
@@ -371,12 +375,15 @@ DESCRIPTION (string) is the description string of the charset."
          =>jis-x0213-1
          ucs-bmp
          ==>ucs-bmp-cjk@bucs
-         =>>ucs@unicode
-         =>>gt
+         =>ucs-bmp-cjk@unicode
+          =+>ucs-bmp-cjk@unicode
+          ;; =>>ucs@unicode
          =adobe-japan1-6
          =adobe-japan1-base
          =>jis-x0208@1997
          =>>hanyo-denshi/ft
+         =>>hanyo-denshi/jt
+         =>>gt
          )))
 
 ;;; mule-charset.el ends here