Sync up with r21-4-15-chise-0_21-31-ucs-at-jis-at.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14e31e4..3e6ab7f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mule/mule-conf.el (=ucs@jis/1990): Renamed from `=ucs@jis-1990';
+       define `=ucs@jis-1990' as an alias for `=ucs@jis/1990'.
+       (=ucs@jis/2000): Renamed from `=ucs@jis-2000'; define
+       `=ucs@jis-2000' as an alias for `=ucs@jis/2000'.
+       (=ucs@JP): Renamed from `=ucs@jp'; define `=ucs@jp' as an alias
+       for `=ucs@JP'.
+
 2004-09-02  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * mule/mule-conf.el (=daikanwa@rev1): Renamed from

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index e553d06..c2d5e06 100644 (file)
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -299,7 +299,7 @@
 
   (make-charset '=big5-pua
                "Big5 with private used area"
-               `(long-name     "Big5-PUA"
+               '(long-name     "Big5-PUA"
                  chars         256
                  dimension     2
                  columns       2
@@ -310,7 +310,7 @@
   (define-charset-alias 'chinese-big5-pua '=big5-pua)
   (make-charset '=big5-eten
                "Big5 ETEN"
-               `(long-name     "Big5-ETEN"
+               '(long-name     "Big5-ETEN"
                  chars         256
                  dimension     2
                  columns       2
@@ -323,7 +323,7 @@
   (define-charset-alias 'chinese-big5-eten '=big5-eten)
   (make-charset 'chinese-big5-eten-a
                "Big5 ETEN (#xF9D6 .. #xF9FE)"
-               `(long-name     "Big5-ETEN-a"
+               '(long-name     "Big5-ETEN-a"
                  chars         256
                  dimension     2
                  columns       2
@@ -335,7 +335,7 @@
                  registry      "Big5\\.ETEN"))
   (make-charset 'chinese-big5-eten-b
                "Big5 ETEN (#xC6A1 .. #xC8FE)"
-               `(long-name     "Big5-ETEN-b"
+               '(long-name     "Big5-ETEN-b"
                  chars         256
                  dimension     2
                  columns       2
@@ -385,7 +385,7 @@
 
   (make-charset '=jef-china3
                "JEF + CHINA3 private characters"
-               `(long-name     "JEF + CHINA3"
+               '(long-name     "JEF + CHINA3"
                  chars         256
                  dimension     2
                  columns       2
@@ -413,7 +413,7 @@
 
   (make-charset '=ucs@iso
                "ISO/IEC 10646 for its representative glyphs"
-               `(long-name     "UCS for ISO"
+               '(long-name     "UCS for ISO"
                  chars         256
                  dimension     3
                  columns       2
@@ -422,7 +422,7 @@
                  mother        =ucs))
   (make-charset '=ucs@unicode
                "Unicode for its representative glyphs"
-               `(long-name     "UCS for Unicode"
+               '(long-name     "UCS for Unicode"
                  chars         256
                  dimension     3
                  columns       2
@@ -431,7 +431,7 @@
                  mother        =ucs@iso))
   (make-charset '=ucs@gb
                "ISO/IEC 10646 for GB"
-               `(long-name     "UCS for GB"
+               '(long-name     "UCS for GB"
                  chars         256
                  dimension     3
                  columns       2
@@ -441,7 +441,7 @@
   (define-charset-alias 'ucs-gb '=ucs@gb)
   (make-charset '=ucs@cns
                "ISO/IEC 10646 for CNS 11643"
-               `(long-name     "UCS for CNS"
+               '(long-name     "UCS for CNS"
                  chars         256
                  dimension     3
                  columns       2
@@ -451,7 +451,7 @@
   (define-charset-alias 'ucs-cns '=ucs@cns)
   (make-charset '=ucs@jis
                "ISO/IEC 10646 for JIS X0208/0212/0213"
-               `(long-name     "UCS for JIS"
+               '(long-name     "UCS for JIS"
                  chars         256
                  dimension     3
                  columns       2
@@ -459,35 +459,38 @@
                  direction     l2r
                  mother        =ucs@unicode))
   (define-charset-alias 'ucs-jis '=ucs@jis)
-  (make-charset '=ucs@jis-1990
+  (make-charset '=ucs@jis/1990
                "ISO/IEC 10646 for JIS X 0208/0212:1990"
-               `(long-name     "UCS for JIS:1990"
+               '(long-name     "UCS for JIS:1990"
                  chars         256
                  dimension     3
                  columns       2
                  graphic       2
                  direction     l2r
                  mother        ucs-jis))
-  (define-charset-alias '=ucs-jis-1990 '=ucs@jis-1990)
-  (make-charset '=ucs@jis-2000
+  (define-charset-alias '=ucs@jis-1990 '=ucs@jis/1990)
+  (define-charset-alias '=ucs-jis-1990 '=ucs@jis/1990)
+  (make-charset '=ucs@jis/2000
                "ISO/IEC 10646 for JIS X 0213:2000"
-               `(long-name     "UCS for JIS:2000"
+               '(long-name     "UCS for JIS:2000"
                  chars         256
                  dimension     3
                  columns       2
                  graphic       2
                  direction     l2r
                  mother        ucs-jis))
-  (define-charset-alias '=ucs-jis-2000 '=ucs@jis-2000)
-  (make-charset '=ucs@jp
+  (define-charset-alias '=ucs@jis-2000 '=ucs@jis/2000)
+  (define-charset-alias '=ucs-jis-2000 '=ucs@jis/2000)
+  (make-charset '=ucs@JP
                "UCS for common glyphs used in Japan"
-               `(long-name     "UCS for Japan"
+               '(long-name     "UCS for Japan"
                  chars         256
                  dimension     3
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        =ucs@jis-2000))
+                 mother        =ucs@jis/2000))
+  (define-charset-alias '=ucs@jp '=ucs@JP)
   (make-charset '=ucs@ks
                "ISO/IEC 10646 for Korean Standards"
                `(long-name     "UCS for KS"

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index b7f89ba..313a8a5 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,62 @@
+2004-09-06  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R115-Grain.el (JSP-5142): Moved into B-EAB0.
+
+2004-09-06  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R163-City.el (U+913C): Use `->subsumptive'.
+       (JSP-6251): Use `=ucs@jis' instead of `=ucs@jis-1990'.
+
+       * Ideograph-R159-Cart.el (U+8F2C): Use `->subsumptive'.
+       (JSP-6075): Use `=ucs@jis' instead of `=ucs@jis-1990'.
+       (U+8F41): Use `->subsumptive'.
+       (JSP-607E): Use `=ucs@jis' instead of `=ucs@jis-1990'.
+
+       * Ideograph-R157-Foot.el (U+8E95): Use `->subsumptive'.
+       (JSP-6046): Use `=ucs@jis' instead of `=ucs@jis-1990'.
+
+       * Ideograph-R140-Grass.el (U+8362): Use `->subsumptive'.
+       (JX1-7A6D): Use `=ucs@jis' instead of `=ucs@jis-2000'.
+       (U+842F): Use `->subsumptive'.
+       (JSP-584D): Use `=ucs@jis' instead of `=ucs@jis-1990'.
+
+       * Ideograph-R170-Mound.el (JSP-666E): Unify JC3-68DA; use
+       `=ucs@jis/1990' instead of `=ucs@jis-1990'.
+
+       * Ideograph-R085-Water.el: Use `=ucs@jis/2000' instead of
+       `=ucs@jis-2000'.
+       (U+6FF9): Use `->subsumptive'.
+
+       * Ideograph-R188-Bone.el (JSP-695C): Use `=ucs@jis' instead of
+       `=ucs@jis-1990'.
+
+       * Ideograph-R118-Bamboo.el (JX1-795A): Use `=ucs@jis' instead of
+       `=ucs@jis-2000'.
+
+       * Ideograph-R116-Cave.el (JSP-5157): Use `=ucs@jis' instead of
+       `=ucs@jis-1990'.
+
+       * Ideograph-R064-Hand.el (JSP-3F3C): Use `=ucs@jis' instead of
+       `=ucs@jis-1990' and `=ucs@jis-2000'.
+
+2004-09-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R172-Short-Tailed-Bird.el: Use `=ucs@jis/{1990|2000}'
+       instead of `=ucs@jis-{1990|2000}'.
+
+2004-09-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R096-Jade.el, Ideograph-R086-Fire.el: Use
+       `=ucs@jis/1990' instead of `=ucs@jis-1990'.
+
+       * Ideograph-R072-Sun.el: Use `=ucs@jis/{1990|2000}' instead of
+       `=ucs@jis-{1990|2000}'.
+
+       * Ideograph-R059-Bristle.el: Use `=ucs@JP' instead of `=ucs@jp'.
+
+       * Ideograph-R046-Mountain.el: Use `=ucs@jis/2000' instead of
+       `=ucs@jis-2000'.
+
 2004-09-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * Ideograph-R037-Big.el: Use `=daikanwa@rev{1|2}' instead of

diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el
index 63a7776..e7660e8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R046-Mountain.el
+++ b/lisp/utf-2000/Ideograph-R046-Mountain.el
@@ -8526,7 +8526,7 @@
     (->subsumptive
      ((=jis-x0213-2-2000  . #x2864)    ; &M-08532; [08-68]
       (=daikanwa         . 08532)      ; &I-M-08532;
-      (=ucs@jis-2000     . #x5DB2)     ; &M-08532;
+      (=ucs@jis/2000     . #x5DB2)     ; &M-08532;
       )
      ((=cns11643-2       . #x5671)     ; &C2-5671; [54-81]
       (=ucs@unicode      . #x5DB2)     ; &C2-5671;

diff --git a/lisp/utf-2000/Ideograph-R059-Bristle.el b/lisp/utf-2000/Ideograph-R059-Bristle.el
index 1c3b180..5cd9e59 100644 (file)
--- a/lisp/utf-2000/Ideograph-R059-Bristle.el
+++ b/lisp/utf-2000/Ideograph-R059-Bristle.el
@@ -476,7 +476,7 @@
     (=gt-pj-3          . #x4A6E)       ; &GT-12606; [42-78]
     (=daikanwa         . 09995)        ; &I-M-09995;
     (=jef-china3       . #x4DA7)       ; &I-JC3-4DA7;
-    (=ucs@jp           . #x2F89A)      ; &GT-12606;
+    (=ucs@JP           . #x2F89A)      ; &GT-12606;
     ))
 (define-char
   '((=>ucs*            . #x5F6B)       ; 彫

diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el
index feb386d..0e8b6f6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R064-Hand.el
+++ b/lisp/utf-2000/Ideograph-R064-Hand.el
@@ -310,8 +310,7 @@
       (=gt-pj-3                  . #x5C23)     ; &I-GT-14901; [60-03]
       (=daikanwa         . 11788)      ; &I-M-11788;
       (=jef-china3       . #x4FAB)     ; &I-JC3-4FAB;
-      (=ucs@jis-1990     . #x6256)     ; &GT-14901;
-      (=ucs@jis-2000     . #x6256)     ; &GT-14901;
+      (=ucs@jis                  . #x6256)     ; &GT-14901;
       )
      ((=ucs@unicode      . #x6256)     ; &UU+6256;
       ))

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index dfcf788..7da96ac 100644 (file)
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -3517,7 +3517,7 @@
     (=ks-x1001         . #x4F7C)       ; &M-14005; [47-92]
     (=jis-x0212                . #x4247)       ; &I-JSP-4247; [34-39]
     (=daikanwa         . 14005)        ; &I-M-14005;
-    (=ucs@jis-1990     . #x6677)       ; &M-14005;
+    (=ucs@jis/1990     . #x6677)       ; &M-14005;
     (=ucs@ks           . #x6677)       ; &M-14005;
     ))
 (define-char
@@ -3541,7 +3541,7 @@
     (=big5             . #xB4BE)       ; &I-B-B4BE;
     (=jef-china3       . #x51A7)       ; &I-JC3-51A7;
     (=ucs@cns          . #x6677)       ; &JX1-7540;
-    (=ucs@jis-2000     . #x6677)       ; &JX1-7540;
+    (=ucs@jis/2000     . #x6677)       ; &JX1-7540;
     (=ucs@big5         . #x6677)       ; &JX1-7540;
     (mojikyo           . 014005)       ; &MCS-600036B5;
     ))

diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 5936d56..eb59cc7 100644 (file)
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -1096,7 +1096,7 @@
     (ideographic-strokes . 4)
     (total-strokes      . 7)
     (=jis-x0213-1-2000 . #x7654)       ; &JX1-7654; [86-52]
-    (=ucs@jis-2000     . #x6C74)       ; &JX1-7654;
+    (=ucs@jis/2000     . #x6C74)       ; &JX1-7654;
     (mojikyo           . 017165)       ; &MCS-6000430D;
     ))
 (define-char
@@ -21352,13 +21352,6 @@
   '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 14)
     (total-strokes      . 17)
-    (=ucs              . #x6FF9)       ; 濹
-    (=jis-x0212                . #x4927)       ; &I-JSP-4927; [41-07]
-    ))
-(define-char
-  '((ideographic-radical . 85) ; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes      . 17)
     (=ucs              . #x23FDF)      ; 𣿟
     (=cns11643-5       . #x5B77)       ; &I-C5-5B77; [59-87]
     ))
@@ -22029,12 +22022,19 @@
     (=iso-ir165                . #x2E60)       ; &I-EGB-2E60; [14-64]
     ))
 (define-char
-  '((=>ucs             . #x6FF9)       ; 濹
-    (ideographic-radical . 85) ; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes      . 18)
-    (=jis-x0213-1-2000 . #x7739)       ; &JX1-7739; [87-25]
-    (=ucs@jis-2000     . #x6FF9)       ; &JX1-7739;
+  '((ideographic-radical . 85) ; ⽔
+    (=ucs              . #x6FF9)       ; 濹
+    (->subsumptive
+     ((ideographic-strokes . 15)
+      (total-strokes      . 18)
+      (=jis-x0213-1-2000  . #x7739)    ; &JX1-7739; [87-25]
+      (=ucs@jis/2000     . #x6FF9)     ; &JX1-7739;
+      )
+     ((ideographic-strokes . 14)
+      (total-strokes      . 17)
+      (=jis-x0212        . #x4927)     ; &JSP-4927; [41-07]
+      (=ucs@unicode      . #x6FF9)     ; &JSP-4927;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85) ; ⽔

diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el
index f12761e..34815d8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R086-Fire.el
+++ b/lisp/utf-2000/Ideograph-R086-Fire.el
@@ -9490,7 +9490,7 @@
     (ideographic-strokes . 11)
     (total-strokes      . 15)
     (=jis-x0212                . #x4A2F)       ; &JSP-4A2F; [42-15]
-    (=ucs@jis-1990     . #x71B3)       ; &JSP-4A2F;
+    (=ucs@jis/1990     . #x71B3)       ; &JSP-4A2F;
     ))
 (define-char
   '((=>ucs             . #x71B3)       ; 熳

diff --git a/lisp/utf-2000/Ideograph-R096-Jade.el b/lisp/utf-2000/Ideograph-R096-Jade.el
index 2e054a4..58995e0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R096-Jade.el
+++ b/lisp/utf-2000/Ideograph-R096-Jade.el
@@ -2188,7 +2188,7 @@
     (total-strokes      . 11)
     (=jis-x0212                . #x4B7B)       ; &M-20994; [43-91]
     (=daikanwa         . 20994)        ; &I-M-20994;
-    (=ucs@jis-1990     . #x73F9)       ; &M-20994;
+    (=ucs@jis/1990     . #x73F9)       ; &M-20994;
     ))
 (define-char
   '((morohashi-daikanwa        20994 0 1)

diff --git a/lisp/utf-2000/Ideograph-R115-Grain.el b/lisp/utf-2000/Ideograph-R115-Grain.el
index 665eb3f..0d358d9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R115-Grain.el
+++ b/lisp/utf-2000/Ideograph-R115-Grain.el
@@ -3819,11 +3819,12 @@
     (total-strokes      . 16)
     (=ucs              . #x7A48)       ; 穈
     (->subsumptive
-     ((=jis-x0212        . #x5142)     ; &M-25257; [49-34]
-      (=daikanwa         . 25257)      ; &I-M-25257;
-      (=ucs@jis-1990     . #x7A48)     ; &M-25257;
-      )
      ((=big5             . #xEAB0)     ; &B-EAB0;
+      (->subsumptive
+       ((=jis-x0212        . #x5142)   ; &M-25257; [49-34]
+       (=daikanwa          . 25257)    ; &I-M-25257;
+       (=ucs@jis           . #x7A48)   ; &M-25257;
+       ))
       )
      ((=cns11643-2       . #x587A)     ; &C2-587A; [56-90]
       )

diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el
index 0687187..6d6cec5 100644 (file)
--- a/lisp/utf-2000/Ideograph-R116-Cave.el
+++ b/lisp/utf-2000/Ideograph-R116-Cave.el
@@ -754,7 +754,7 @@
      ((=jis-x0212        . #x5157)     ; &M-25469; [49-55]
       (=daikanwa         . 25469)      ; &I-M-25469;
       (=jef-china3       . #x9FDC)     ; &I-JC3-9FDC;
-      (=ucs@jis-1990     . #x7A8B)     ; &M-25469;
+      (=ucs@jis                  . #x7A8B)     ; &M-25469;
       )
      ((=cns11643-2       . #x315C)     ; &C2-315C; [17-60]
       )

diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el
index ee1c5a6..a3c71b6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R118-Bamboo.el
+++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el
@@ -458,7 +458,7 @@
      ((=cns11643-2       . #x316A)     ; &M-25886; [17-74]
       (=jis-x0213-1-2000  . #x795A)    ; &I-JX1-795A; [89-58]
       (=daikanwa         . 25886)      ; &I-M-25886;
-      (=ucs@jis-2000     . #x7B12)     ; &M-25886;
+      (=ucs@jis                  . #x7B12)     ; &M-25886;
       )
      ((=ucs@unicode      . #x7B12)     ; &UU+7B12;
       ))

diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el
index baac64d..ae9260e 100644 (file)
--- a/lisp/utf-2000/Ideograph-R140-Grass.el
+++ b/lisp/utf-2000/Ideograph-R140-Grass.el
@@ -6770,31 +6770,24 @@
     (=daikanwa         . 49582)        ; &I-M-49582;
     ))
 (define-char
-  '((=>ucs             . #x8362)       ; 荢
-    (morohashi-daikanwa        ho 521)
-    (ideographic-radical . 140)        ; ⾋
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=gt               . 40268)        ; &GT-40268;
-    (=gt-pj-11         . #x5277)       ; &GT-40268; [50-87]
-    (mojikyo           . 059885)       ; &MCS-6000E9ED;
-    ))
-(define-char
-  '((=>ucs             . #x8362)       ; 荢
-    (morohashi-daikanwa        ho 521 1)
-    (ideographic-radical . 140)        ; ⾋
-    (ideographic-strokes . 6)
-    (total-strokes      . 9)
-    (=jis-x0213-1-2000 . #x7A6D)       ; &JX1-7A6D; [90-77]
-    (=ucs@jis-2000     . #x8362)       ; &JX1-7A6D;
-    ))
-(define-char
-  '((morohashi-daikanwa        ho 521 2)
-    (ideographic-radical . 140)        ; ⾋
+  '((ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 6)
-    (total-strokes      . 9)
     (=ucs              . #x8362)       ; 荢
-    (mojikyo           . 079242)       ; &MCS-6001358A;
+    (->subsumptive
+     ((morohashi-daikanwa      ho 521)
+      (total-strokes      . 10)
+      (=gt               . 40268)      ; &GT-40268;
+      (=gt-pj-11         . #x5277)     ; &GT-40268; [50-87]
+      (mojikyo           . 059885)     ; &MCS-6000E9ED;
+      )
+     ((total-strokes      . 9)
+      (=jis-x0213-1-2000  . #x7A6D)    ; &JX1-7A6D; [90-77]
+      (=ucs@jis                  . #x8362)     ; &JX1-7A6D;
+      (mojikyo           . 079242)     ; &MCS-6001358A;
+      )
+     ((total-strokes      . 9)
+      (=ucs@unicode      . #x8362)     ; &UU+8362;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)        ; ⾋
@@ -13778,36 +13771,24 @@
     (=hanziku-8                . #xF8AD)       ; &I-HZK08-F8AD;
     ))
 (define-char
-  '((=>ucs             . #x842F)       ; 萯
-    (ideographic-radical . 140)        ; ⾋
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
-    (=daikanwa         . 31343)        ; &M-31343;
-    ))
-(define-char
-  '((=>ucs             . #x842F)       ; 萯
-    (morohashi-daikanwa        31343 0 1)
-    (ideographic-radical . 140)        ; ⾋
-    (ideographic-strokes . 9)
-    (total-strokes      . 12)
-    (=jis-x0212                . #x584D)       ; &JSP-584D; [56-45]
-    (=big5             . #xDFCA)       ; &I-B-DFCA;
-    (=ucs@jis-1990     . #x842F)       ; &JSP-584D;
-    ))
-(define-char
-  '((=>ucs             . #x842F)       ; 萯
-    (morohashi-daikanwa        31343 0 2)
-    (ideographic-radical . 140)        ; ⾋
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
-    (=cns11643-2       . #x466F)       ; &C2-466F; [38-79]
-    ))
-(define-char
-  '((morohashi-daikanwa        31343 0 3)
-    (ideographic-radical . 140)        ; ⾋
+  '((ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 9)
-    (total-strokes      . 12)
     (=ucs              . #x842F)       ; 萯
+    (=big5             . #xDFCA)       ; &I-B-DFCA;
+    (->subsumptive
+     ((total-strokes      . 13)
+      (=daikanwa         . 31343)      ; &M-31343;
+      )
+     ((total-strokes      . 12)
+      (=jis-x0212        . #x584D)     ; &JSP-584D; [56-45]
+      (=ucs@jis                  . #x842F)     ; &JSP-584D;
+      )
+     ((total-strokes      . 13)
+      (=cns11643-2       . #x466F)     ; &C2-466F; [38-79]
+      )
+     ((total-strokes      . 12)
+      (=ucs@unicode      . #x842F)     ; &UU+842F;
+      ))
     ))
 (define-char
   '((=>ucs             . #x8430)       ; 萰

diff --git a/lisp/utf-2000/Ideograph-R157-Foot.el b/lisp/utf-2000/Ideograph-R157-Foot.el
index 0b3d4b2..18377f8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R157-Foot.el
+++ b/lisp/utf-2000/Ideograph-R157-Foot.el
@@ -6914,21 +6914,18 @@
     (=daikanwa         . 37971)        ; &I-M-37971;
     ))
 (define-char
-  '((=>ucs             . #x8E95)       ; 躕
-    (ideographic-radical . 157)        ; ⾜
-    (ideographic-strokes . 15)
-    (total-strokes      . 22)
-    (=jis-x0212                . #x6046)       ; &M-37972; [64-38]
-    (=daikanwa         . 37972)        ; &I-M-37972;
-    (=ucs@jis-1990     . #x8E95)       ; &M-37972;
-    ))
-(define-char
-  '((morohashi-daikanwa        37972 0 0)
-    (ideographic-radical . 157)        ; ⾜
+  '((ideographic-radical . 157)        ; ⾜
     (ideographic-strokes . 15)
     (total-strokes      . 22)
     (=ucs              . #x8E95)       ; 躕
-    (=cns11643-2       . #x6E2C)       ; &I-C2-6E2C; [78-12]
+    (->subsumptive
+     ((=jis-x0212        . #x6046)     ; &M-37972; [64-38]
+      (=daikanwa         . 37972)      ; &I-M-37972;
+      (=ucs@jis                  . #x8E95)     ; &M-37972;
+      )
+     ((=cns11643-2       . #x6E2C)     ; &C2-6E2C; [78-12]
+      (=ucs@unicode      . #x8E95)     ; &C2-6E2C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 157)        ; ⾜

diff --git a/lisp/utf-2000/Ideograph-R159-Cart.el b/lisp/utf-2000/Ideograph-R159-Cart.el
index db84010..7457eac 100644 (file)
--- a/lisp/utf-2000/Ideograph-R159-Cart.el
+++ b/lisp/utf-2000/Ideograph-R159-Cart.el
@@ -2608,21 +2608,18 @@
     (=cns11643-5       . #x515F)       ; &I-C5-515F; [49-63]
     ))
 (define-char
-  '((=>ucs             . #x8F2C)       ; 輬
-    (ideographic-radical . 159)        ; ⾞
-    (ideographic-strokes . 8)
-    (total-strokes      . 15)
-    (=jis-x0212                . #x6075)       ; &M-38402; [64-85]
-    (=daikanwa         . 38402)        ; &I-M-38402;
-    (=ucs@jis-1990     . #x8F2C)       ; &M-38402;
-    ))
-(define-char
-  '((morohashi-daikanwa        38402 0 0)
-    (ideographic-radical . 159)        ; ⾞
+  '((ideographic-radical . 159)        ; ⾞
     (ideographic-strokes . 8)
     (total-strokes      . 15)
     (=ucs              . #x8F2C)       ; 輬
-    (=cns11643-2       . #x546F)       ; &I-C2-546F; [52-79]
+    (->subsumptive
+     ((=jis-x0212        . #x6075)     ; &M-38402; [64-85]
+      (=daikanwa         . 38402)      ; &I-M-38402;
+      (=ucs@jis                  . #x8F2C)     ; &M-38402;
+      )
+     ((=cns11643-2       . #x546F)     ; &C2-546F; [52-79]
+      (=ucs@unicode      . #x8F2C)     ; &C2-546F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 159)        ; ⾞
@@ -3526,21 +3523,18 @@
     (=cns11643-5       . #x5F28)       ; &I-C5-5F28; [63-08]
     ))
 (define-char
-  '((=>ucs             . #x8F41)       ; 轁
-    (ideographic-radical . 159)        ; ⾞
-    (ideographic-strokes . 10)
-    (total-strokes      . 17)
-    (=jis-x0212                . #x607E)       ; &M-38477; [64-94]
-    (=daikanwa         . 38477)        ; &I-M-38477;
-    (=ucs@jis-1990     . #x8F41)       ; &M-38477;
-    ))
-(define-char
-  '((morohashi-daikanwa        38477 0 2)
-    (ideographic-radical . 159)        ; ⾞
+  '((ideographic-radical . 159)        ; ⾞
     (ideographic-strokes . 10)
     (total-strokes      . 17)
     (=ucs              . #x8F41)       ; 轁
-    (=cns11643-3       . #x565A)       ; &I-C3-565A; [54-58]
+    (->subsumptive
+     ((=jis-x0212        . #x607E)     ; &M-38477; [64-94]
+      (=daikanwa         . 38477)      ; &I-M-38477;
+      (=ucs@jis                  . #x8F41)     ; &M-38477;
+      )
+     ((=cns11643-3       . #x565A)     ; &C3-565A; [54-58]
+      (=ucs@unicode      . #x8F41)     ; &C3-565A;
+      ))
     ))
 (define-char
   '((=>ucs             . #x28379)      ; 𨍹

diff --git a/lisp/utf-2000/Ideograph-R163-City.el b/lisp/utf-2000/Ideograph-R163-City.el
index 20ab9a1..6d72e5f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R163-City.el
+++ b/lisp/utf-2000/Ideograph-R163-City.el
@@ -5524,21 +5524,18 @@
     (=daikanwa         . 39714)        ; &I-M-39714;
     ))
 (define-char
-  '((=>ucs             . #x913C)       ; 鄼
-    (ideographic-radical . 163)        ; ⾢
-    (ideographic-strokes . 15)
-    (total-strokes      . 18)
-    (=jis-x0212                . #x6251)       ; &M-39715; [66-49]
-    (=daikanwa         . 39715)        ; &I-M-39715;
-    (=ucs@jis-1990     . #x913C)       ; &M-39715;
-    ))
-(define-char
-  '((morohashi-daikanwa        39715 0 0)
-    (ideographic-radical . 163)        ; ⾢
+  '((ideographic-radical . 163)        ; ⾢
     (ideographic-strokes . 15)
     (total-strokes      . 18)
     (=ucs              . #x913C)       ; 鄼
-    (=cns11643-3       . #x593C)       ; &I-C3-593C; [57-28]
+    (->subsumptive
+     ((=jis-x0212        . #x6251)     ; &M-39715; [66-49]
+      (=daikanwa         . 39715)      ; &I-M-39715;
+      (=ucs@jis                  . #x913C)     ; &M-39715;
+      )
+     ((=cns11643-3       . #x593C)     ; &C3-593C; [57-28]
+      (=ucs@unicode      . #x913C)     ; &C3-593C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 163)        ; ⾢

diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el
index 44482fe..546e3ac 100644 (file)
--- a/lisp/utf-2000/Ideograph-R170-Mound.el
+++ b/lisp/utf-2000/Ideograph-R170-Mound.el
@@ -4270,7 +4270,8 @@
     (->subsumptive
      ((=jis-x0212        . #x666E)     ; &M-41885; [70-78]
       (=daikanwa         . 41885)      ; &I-M-41885;
-      (=ucs@jis-1990     . #x96AE)     ; &M-41885;
+      (=jef-china3       . #x68DA)     ; &I-JC3-68DA;
+      (=ucs@jis                  . #x96AE)     ; &M-41885;
       )
      ((=cns11643-2       . #x6041)     ; &C2-6041; [64-33]
       (=ucs@unicode      . #x96AE)     ; &C2-6041;

diff --git a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
index efa72c2..fc56ab0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
+++ b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
@@ -2024,7 +2024,7 @@
     (->subsumptive
      ((=jis-x0212        . #x6674)     ; &M-42071; [70-84]
       (=daikanwa         . 42071)      ; &I-M-42071;
-      (=ucs@jis-1990     . #x5DB2)     ; &M-42071;
+      (=ucs@jis/1990     . #x5DB2)     ; &M-42071;
       )
      ((=cns11643-7       . #x3535)     ; &C7-3535; [21-21]
       (=ucs@iso                  . #x2F9F4)    ; &C7-3535;
@@ -2745,7 +2745,7 @@
        (=gt                . 56559)    ; &I-GT-56559;
        (=gt-pj-8           . #x326E)   ; &I-GT-56559; [18-78]
        (=daikanwa          . 42120)    ; &I-M-42120;
-       (=ucs@jis-1990      . #x96DA)   ; &GT-56559;
+       (=ucs@jis/1990      . #x96DA)   ; &GT-56559;
        )
        ((=cns11643-2       . #x643D)   ; &C2-643D; [68-29]
        (=ucs@cns           . #x96DA)   ; &C2-643D;
@@ -2763,7 +2763,7 @@
        (=jis-x0213-2-2000  . #x7B73)   ; &GT-56531; [91-83]
        (=gt                . 56531)    ; &I-GT-56531;
        (=gt-pj-10          . #x7344)   ; &I-GT-56531; [83-36]
-       (=ucs@jis-2000      . #x96DA)   ; &GT-56531;
+       (=ucs@jis/2000      . #x96DA)   ; &GT-56531;
        )
        ((=ucs@unicode      . #x96DA)   ; &UU+96DA;
        ))

diff --git a/lisp/utf-2000/Ideograph-R188-Bone.el b/lisp/utf-2000/Ideograph-R188-Bone.el
index 8ec66d1..09dad8c 100644 (file)
--- a/lisp/utf-2000/Ideograph-R188-Bone.el
+++ b/lisp/utf-2000/Ideograph-R188-Bone.el
@@ -732,7 +732,7 @@
      ((total-strokes      . 15)
       (=jis-x0212        . #x695C)     ; &M-45151; [73-60]
       (=daikanwa         . 45151)      ; &I-M-45151;
-      (=ucs@jis-1990     . #x9AB5)     ; &M-45151;
+      (=ucs@jis                  . #x9AB5)     ; &M-45151;
       )
      ((total-strokes      . 15)
       (=cns11643-3       . #x4F77)     ; &C3-4F77; [47-87]