Sync up with r21-4-11-chise-0_21-pre2.

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index aadd0d4..2883b55 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-16  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * Ideograph-R003-Dot.el, Ideograph-R001-One.el (C3-2740): Use
+       `ideographic-{radical|strokes}@{daikanwa|cns}' and
+       `ideographic-radical@{daikanwa|cns}*sources' instead of
+       `ideographic-'; unify BC-8CB7.
+
 2003-05-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * Ideograph-R114-Track.el (U-00020398): Use

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index 1d21a0c..d4ce3b6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -1981,12 +1981,14 @@
     ))
 (define-char
   '((=>ucs             . #x4E3D)       ; 丽
-    (ideographic-      (:radical       1 ; ⼀
-                        :strokes       7
-                        :sources       (cns-11643))
-                       (:radical       3 ; ⼂
-                        :strokes       7
-                        :sources       (morohashi-daikanwa gt)))
+    (ideographic-radical@daikanwa . 3) ; ⼂
+    (ideographic-strokes@daikanwa . 7)
+    (ideographic-radical@daikanwa*sources
+     daikanwa gt)
+    (ideographic-radical@cns . 1)      ; ⼀
+    (ideographic-strokes@cns . 7)
+    (ideographic-radical@cns*sources
+     cns-11643)
     (total-strokes      . 8)
     (->same-ideograph
      ((ideographic-radical . 1)        ; ⼀
@@ -1997,6 +1999,7 @@
                 (=daikanwa          . 47663)   ; �����
                 )
       :sources (morohashi-daikanwa)))
+    (hanyu-dazidian    1 24 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
@@ -2036,6 +2039,7 @@
     (=cns11643-3       . #x2740)       ; �����
     (=gt-pj-2          . #x3071)       ; ������
     (=daikanwa         . 00104)        ; �����
+    (=big5-cdp         . #x8CB7)       ; ������
     (=ucs@cns          . #x4E3D)       ; �����
     (=gt               . 00145)        ; ������
     (mojikyo           . 000104)       ; ������
@@ -2127,13 +2131,6 @@
     ))
 (define-char
   '((ideographic-radical . 1)  ; ⼀
-    (ideographic-strokes . 7)
-    (total-strokes      . 8)
-    (hanyu-dazidian    1 24 5)
-    (=big5-cdp         . #x8CB7)       ; ������
-    ))
-(define-char
-  '((ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 8)
     (total-strokes      . 9)
     (=gt-pj-2          . #x304D)       ; ������

diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el
index 4568bda..538aee6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R003-Dot.el
+++ b/lisp/utf-2000/Ideograph-R003-Dot.el
@@ -395,12 +395,14 @@
     ))
 (define-char
   '((=>ucs             . #x4E3D)       ; 丽
-    (ideographic-      (:radical       1 ; ⼀
-                        :strokes       7
-                        :sources       (cns-11643))
-                       (:radical       3 ; ⼂
-                        :strokes       7
-                        :sources       (morohashi-daikanwa gt)))
+    (ideographic-radical@daikanwa . 3) ; ⼂
+    (ideographic-strokes@daikanwa . 7)
+    (ideographic-radical@daikanwa*sources
+     daikanwa gt)
+    (ideographic-radical@cns . 1)      ; ⼀
+    (ideographic-strokes@cns . 7)
+    (ideographic-radical@cns*sources
+     cns-11643)
     (total-strokes      . 8)
     (->same-ideograph
      ((ideographic-radical . 1)        ; ⼀
@@ -411,6 +413,7 @@
                 (=daikanwa          . 47663)   ; �����
                 )
       :sources (morohashi-daikanwa)))
+    (hanyu-dazidian    1 24 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
@@ -450,6 +453,7 @@
     (=cns11643-3       . #x2740)       ; �����
     (=gt-pj-2          . #x3071)       ; ������
     (=daikanwa         . 00104)        ; �����
+    (=big5-cdp         . #x8CB7)       ; ������
     (=ucs@cns          . #x4E3D)       ; �����
     (=gt               . 00145)        ; ������
     (mojikyo           . 000104)       ; ������

diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index e98567a..add9c8d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -1708,6 +1708,7 @@
     (shinjigen-2       . 136)
     (=jis-x0208                . #x5041)       ; �����
     (=gt-pj-1          . #x5041)       ; ������
+    (=ucs@jis          . #x4EED)       ; �����
     (=gt               . 00506)        ; ������
     ))
 (define-char
@@ -15154,7 +15155,6 @@
      ((=jis-x0208        . #x3563)     ; �����
       (=ks-x1001         . #x6B68)     ; �����
       (=daikanwa         . 17309)      ; �����
-      (=gt-k             . 03667)      ; ������
       ))
     (=gt-pj-11         . #x4372)       ; ������
     (=gt               . 00945)        ; ������
@@ -18438,9 +18438,7 @@
      ((=ucs              . #x4EBB)     ; 亻
       )
      ((=cns11643-1       . #x5326)     ; �����
-      (=jis-x0208-1990   . #x4C6D)     ; �����
       (=daikanwa         . 29008)      ; �����
-      (=gt-k             . 05192)      ; ������
       ))
     (=jis-x0212                . #x3176)       ; �����
     (=jis-x0213-1-2000 . #x2E42)       ; �����

diff --git a/lisp/utf-2000/Ideograph-R017-Open-Box.el b/lisp/utf-2000/Ideograph-R017-Open-Box.el
index d6e608e..d9a3971 100644 (file)
--- a/lisp/utf-2000/Ideograph-R017-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R017-Open-Box.el
@@ -378,7 +378,6 @@
      ((=ucs              . #x51F5)     ; 凵
       )
      ((=jis-x0208        . #x4A38)     ; �����
-      (=gt-k             . 00487)      ; ������
       ))
     (=daikanwa         . 01822)        ; �����
     ))