Sync up with r21-2-44-utf-2000-m0_18-simplified-jp-jouyou.

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index 09c8fe3..305bbe7 100644 (file)
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -277,6 +277,19 @@ DESCRIPTION (string) is the description string of the charset."
          greek-iso8859-7
          thai-tis620
          =jis-x0208
+         =big5-cdp
+         =gt-pj-2
+         =gt-pj-3
+         =gt-pj-4
+         =gt-pj-5
+         =gt-pj-6
+         =gt-pj-7
+         =gt-pj-8
+         =gt-pj-9
+         =gt-pj-10
+         =gt-pj-11
+         =gt-pj-k1
+         =gt-pj-k2
          japanese-jisx0208
          =jis-x0208-1990
          japanese-jisx0212
@@ -306,23 +319,10 @@ DESCRIPTION (string) is the description string of the charset."
          arabic-digit
          arabic-1-column
          arabic-2-column
-         =big5-cdp
+         =gt-pj-1
          chinese-big5-eten-a
          chinese-big5-eten-b
          chinese-big5
-         =gt-pj-1
-         =gt-pj-2
-         =gt-pj-3
-         =gt-pj-4
-         =gt-pj-5
-         =gt-pj-6
-         =gt-pj-7
-         =gt-pj-8
-         =gt-pj-9
-         =gt-pj-10
-         =gt-pj-11
-         =gt-pj-k1
-         =gt-pj-k2
          ideograph-daikanwa-2
          ideograph-daikanwa
          =hanziku-1

diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el
index 59b43d7..fb1247f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R038-Woman.el
+++ b/lisp/utf-2000/Ideograph-R038-Woman.el
@@ -12036,7 +12036,7 @@
     ))
 (define-char
   '((=>ucs             . #x5B22)       ; 嬢
-    (morohashi-daikanwa        6807 1 1)
+    (morohashi-daikanwa        6807 1 2)
     (ideographic-radical . 38) ; â¼¥
     (ideographic-strokes . 13)
     (total-strokes      . 16)

diff --git a/lisp/utf-2000/Ideograph-R060-Step.el b/lisp/utf-2000/Ideograph-R060-Step.el
index 9f40706..4f67954 100644 (file)
--- a/lisp/utf-2000/Ideograph-R060-Step.el
+++ b/lisp/utf-2000/Ideograph-R060-Step.el
@@ -2728,7 +2728,7 @@
     (=ucs@jis          . #x5FB4)       ; ø½Š©œ
     ))
 (define-char
-  '((morohashi-daikanwa        10238 1 0)
+  '((morohashi-daikanwa        10238 1 1)
     (ideographic-radical . 60) ; â¼»
     (ideographic-strokes . 11)
     (total-strokes      . 14)

diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index 1c1db76..160b2f1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -114,7 +114,7 @@
     ))
 (define-char
   '((=>ucs             . #x6BB4)       ; æ®´
-    (morohashi-daikanwa        16618 1 1)
+    (morohashi-daikanwa        16618 1 2)
     (ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 4)
     (total-strokes      . 8)