(C5-3F46): Unify HZK1-D0CF and U-000203B6; use `ideographic-' instead

of `ideographic-radical' and `ideographic-strokes'; complete
`ideographic-structure'.

diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index cf8261d..15f3f2d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R062-Halberd.el
+++ b/lisp/utf-2000/Ideograph-R062-Halberd.el
@@ -1059,22 +1059,34 @@
     (ucs               . #x6224)       ; 戤
     ))
 (define-char
-  '((=>ucs             . #x203B6)      ; 𠎶
-    (ideographic-radical . 62) ; ⼽
-    (ideographic-strokes . 9)
+  '((ideographic-      (:radical       62 ; ⼽
+                        :strokes       9
+                        :sources       (morohashi-daikanwa))
+                       (:radical       9 ; ⼈
+                        :strokes       11
+                        :sources       (ucs)))
     (total-strokes      . 13)
     (hanyu-dazidian    1 206 18)
     (ideographic-structure
-     (:cdp-combinator  4)
-     ((ucs               . #x672A)     ; 未
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
       )
-     ((ucs               . #x6210)     ; 成
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (ucs                . #x2FF0)   ; ⿰
+       )
+       ((ucs               . #x672A)   ; 未
+       )
+       ((ucs               . #x6210)   ; 成
+       ))
       )
-     ((name              . "cjk radical person as roof")
+     ((name*             . "ideographic component person as roof")
       (chinese-big5-cdp          . #x8B5D)     ; ������
       ))
-    (chinese-cns11643-5 . #x3F46)      ; �����
-    (ideograph-daikanwa . 11626)       ; �����
+    (chinese-cns11643-5                . #x3F46)       ; �����
+    (ideograph-daikanwa                . 11626)        ; �����
+    (ideograph-hanziku-1       . #xD0CF)       ; ������
+    (ucs                       . #x203B6)      ; 𠎶
     ))
 (define-char
   '((ideographic-radical . 62) ; ⼽
@@ -1208,17 +1220,25 @@
     (ucs               . #x229E4)      ; 𢧤
     ))
 (define-char
-  '((ideographic-radical . 62) ; ⼽
+  '((=>ucs             . #x622A)       ; 截
+    (ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 10)
     (total-strokes      . 14)
     (shinjigen-2       . 2782)
-    (chinese-gb2312    . #x3D58)       ; �����
     (=jis-x0208                . #x5923)       ; �����
     (korean-ksc5601    . #x6F38)       ; �����
-    (chinese-isoir165  . #x3D58)       ; �����
-    (chinese-cns11643-1 . #x6870)      ; �����
     (chinese-big5      . #xBA49)       ; ������
     (ideograph-daikanwa . 11639)       ; �����
+    (ucs-jis           . #x622A)       ; �����
+    ))
+(define-char
+  '((morohashi-daikanwa        11639 0 1)
+    (ideographic-radical . 62) ; ⼽
+    (ideographic-strokes . 10)
+    (total-strokes      . 14)
+    (chinese-gb2312    . #x3D58)       ; �����
+    (chinese-isoir165  . #x3D58)       ; �����
+    (chinese-cns11643-1 . #x6870)      ; �����
     (ucs               . #x622A)       ; 截
     ))
 (define-char
@@ -1569,12 +1589,27 @@
      ((ucs               . #x6208)     ; 戈
       ))
     (korean-ksc5601    . #x7D74)       ; �����
-    (chinese-cns11643-3 . #x506D)      ; �����
     (ideograph-daikanwa . 11668)       ; �����
     (ideograph-cbeta   . 00554)        ; �����
     (ucs               . #x6231)       ; 戱
     ))
 (define-char
+  '((=>ucs             . #x6231)       ; 戱
+    (morohashi-daikanwa        11668 0 0)
+    (ideographic-radical . 62) ; ⼽
+    (ideographic-strokes . 12)
+    (total-strokes      . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs               . #x2FF0)     ; ⿰
+      )
+     ((chinese-cns11643-1 . #x6170)    ; �����
+      )
+     ((ucs               . #x6208)     ; 戈
+      ))
+    (chinese-cns11643-3 . #x506D)      ; �����
+    ))
+(define-char
   '((ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 12)
     (total-strokes      . 16)