(C3-2740): Use `ideographic-{radical|strokes}@{daikanwa|cns}' and

`ideographic-radical@{daikanwa|cns}*sources' instead of
`ideographic-'; unify BC-8CB7.

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index 2aa5570..43888b5 100644 (file)
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -1904,12 +1904,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)        ; ⼀
@@ -1920,6 +1922,7 @@
                 (=daikanwa          . 47663)   ; �����
                 )
       :sources (morohashi-daikanwa)))
+    (hanyu-dazidian    1 24 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
@@ -1959,6 +1962,7 @@
     (=cns11643-3       . #x2740)       ; �����
     (=gt-pj-2          . #x3071)       ; ������
     (=daikanwa         . 00104)        ; �����
+    (=big5-cdp         . #x8CB7)       ; ������
     (=ucs@cns          . #x4E3D)       ; �����
     (=gt               . 00145)        ; ������
     ))
@@ -2048,13 +2052,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 0010314..7adc167 100644 (file)
--- a/lisp/utf-2000/Ideograph-R003-Dot.el
+++ b/lisp/utf-2000/Ideograph-R003-Dot.el
@@ -375,12 +375,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)        ; ⼀
@@ -391,6 +393,7 @@
                 (=daikanwa          . 47663)   ; �����
                 )
       :sources (morohashi-daikanwa)))
+    (hanyu-dazidian    1 24 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
@@ -430,6 +433,7 @@
     (=cns11643-3       . #x2740)       ; �����
     (=gt-pj-2          . #x3071)       ; ������
     (=daikanwa         . 00104)        ; �����
+    (=big5-cdp         . #x8CB7)       ; ������
     (=ucs@cns          . #x4E3D)       ; �����
     (=gt               . 00145)        ; ������
     ))