(U-00024568): Modify `ideographic-structure'.

(C7-476F): Unify U-00020442 and HZK1-D6F4; use `ideographic-' instead
of `ideographic-radical' and `ideographic-strokes'; don't use
`->identical'; modify `ideographic-structure'.

diff --git a/lisp/utf-2000/Ideograph-R089-Double-X.el b/lisp/utf-2000/Ideograph-R089-Double-X.el
index 13e801b..d407473 100644 (file)
--- a/lisp/utf-2000/Ideograph-R089-Double-X.el
+++ b/lisp/utf-2000/Ideograph-R089-Double-X.el
@@ -242,13 +242,27 @@
     (total-strokes      . 15)
     (hanyu-dazidian    1 223 7)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs               . #x2FF1)     ; ⿱
+     ((name              . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (ucs               . #x2FFB)     ; ⿻
       )
-     ((name              . "cjk radical person as roof")
-      (chinese-big5-cdp          . #x8B5D)     ; ������
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+       (ucs                . #x2FFB)   ; ⿻
+       )
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+         (ucs                . #x2FF1) ; ⿱
+         )
+        ((name*              . "ideographic component person as roof")
+         (chinese-big5-cdp   . #x8B5D) ; ������
+         )
+        ((chinese-big5-cdp   . #x8B54) ; ������
+         ))
+       )
+       ((ucs               . #x5182)   ; 冂
+       ))
       )
-     ((chinese-big5-cdp          . #x85AE)     ; ������
+     ((ucs               . #x3E1A)     ; 㸚
       ))
     (chinese-cns11643-7                . #x247C)       ; �����
     (ideograph-daikanwa                . 19753)        ; �����
@@ -304,24 +318,41 @@
     (chinese-cns11643-7 . #x476E)      ; �����
     ))
 (define-char
-  '((=>ucs             . #x20442)      ; 𠑂
-    (ideographic-radical . 89) ; ⽘
-    (ideographic-strokes . 15)
+  '((ideographic-      (:radical       89 ; ⽘
+                        :strokes       15
+                        :sources       (morohashi-daikanwa cns-11643))
+                       (:radical       9 ; ⼈
+                        :strokes       17
+                        :sources       (ucs)))
     (total-strokes      . 19)
-    (->identical
-     ((ucs               . #x20442)    ; 𠑂
-      ))
+    (hanyu-dazidian    1 237 5)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs               . #x2FF3)     ; ⿳
+     ((name              . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (ucs               . #x2FFB)     ; ⿻
       )
-     ((name              . "cjk radical person as roof")
-      (chinese-big5-cdp          . #x8B5D)     ; ������
-      )
-     ((ucs               . #x6B62)     ; 止
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+       (ucs                . #x2FFB)   ; ⿻
+       )
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+         (ucs                . #x2FF3) ; ⿳
+         )
+        ((name*              . "ideographic component person as roof")
+         (chinese-big5-cdp   . #x8B5D) ; ������
+         )
+        ((ucs                . #x6B62) ; 止
+         )
+        ((ideograph-gt-k     . 00305)  ; ������
+         ))
+       )
+       ((ucs               . #x5182)   ; 冂
+       ))
       )
-     ((chinese-big5-cdp          . #x88D6)     ; ������
+     ((ucs               . #x3E1A)     ; 㸚
       ))
-    (chinese-cns11643-7 . #x476F)      ; �����
-    (ideograph-daikanwa . 19757)       ; �����
+    (chinese-cns11643-7                . #x476F)       ; �����
+    (ideograph-daikanwa                . 19757)        ; �����
+    (ideograph-hanziku-1       . #xD6F4)       ; ������
+    (ucs                       . #x20442)      ; 𠑂
     ))