(U-000202DC): Add `ideographic-strokes' and `total-strokes'.

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

diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index 34b9757..371ada4 100644 (file)
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -483,7 +483,6 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 2)
     (total-strokes      . 4)
-    (hanyu-dazidian    1 105 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
@@ -506,9 +505,7 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 2)
     (total-strokes      . 4)
-    (hanyu-dazidian-vol         . 1)
-    (hanyu-dazidian-page . 105)
-    (hanyu-dazidian-char . 5)
+    (hanyu-dazidian    1 105 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
@@ -17340,6 +17337,34 @@
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 9)
     (total-strokes      . 11)
+    (hanyu-dazidian    1 189 3)
+    (ideographic-structure
+     (:cdp-combinator  4)
+     ((ucs               . #x4EBB)     ; 亻
+      )
+     ((name              . "CJK RADICAL SMALL ONE")
+      (ucs               . #x2E8C)     ; ⺌
+      )
+     ((ucs               . #x4E00)     ; 一
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (ucs                . #x2FF1)   ; ⿱
+       )
+       ((ucs               . #x4E00)   ; 一
+       )
+       ((ucs               . #x4E00)   ; 一
+       ))
+      )
+     ((ucs               . #x53E3)     ; 口
+      ))
+    (ideograph-hanziku-1       . #xCD55)       ; ������
+    (ucs                       . #x202DC)      ; 𠋜
+    ))
+(define-char
+  '((ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 9)
+    (total-strokes      . 11)
     (hanyu-dazidian    8 8 19)
     (chinese-cns11643-6                . #x3D26)       ; �����
     (ideograph-hanziku-12      . #xEB6A)       ; ������
@@ -28998,24 +29023,41 @@
     (ucs                       . #x20444)      ; 𠑄
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 17)
+  '((ideographic-      (:radical       89 ; ⽘
+                        :strokes       15
+                        :sources       (morohashi-daikanwa cns-11643))
+                       (:radical       9 ; ⼈
+                        :strokes       17
+                        :sources       (ucs)))
     (total-strokes      . 19)
-    (->identical
-     ((ideograph-daikanwa . 19757)     ; �����
-      ))
     (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*             . "ideographic component 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)        ; �����
     (ideograph-hanziku-1       . #xD6F4)       ; ������
     (ucs                       . #x20442)      ; 𠑂
     ))
@@ -30780,31 +30822,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
-    (hanyu-dazidian    1 189 3)
-    (ideographic-structure
-     (:cdp-combinator  4)
-     ((ucs               . #x4EBB)     ; 亻
-      )
-     ((chinese-big5-cdp          . #x8B54)     ; ������
-      )
-     ((ucs               . #x4E00)     ; 一
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (ucs                . #x2FF1)   ; ⿱
-       )
-       ((ucs               . #x4E00)   ; 一
-       )
-       ((ucs               . #x4E00)   ; 一
-       ))
-      )
-     ((ucs               . #x53E3)     ; 口
-      ))
-    (ideograph-hanziku-1       . #xCD55)       ; ������
-    (ucs                       . #x202DC)      ; 𠋜
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
     (hanyu-dazidian    1 191 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
@@ -31680,7 +31697,8 @@
       )
      ((chinese-big5-cdp          . #x88B9)     ; ������
       )
-     ((chinese-big5-cdp          . #x8B54)     ; ������
+     ((name              . "CJK RADICAL SMALL ONE")
+      (ucs               . #x2E8C)     ; ⺌
       )
      ((ucs               . #x4E00)     ; 一
       ))