(M-00395): Use `->subsumptive' to integrate C3-2174; use

`<-denotational' for U+36A2; use `<-ancient*sources' instead of
char-ref in `<-ancient'; use `->mistakable' for M-06040.
(U-00020209): Use `<-ancient*sources' instead of char-ref in
`<-ancient'.
(U+4FDD): Use `->subsumptive'.
(U-00020300): Use `->subsumptive'; use `<-ancient*sources' instead of
char-ref in `<-ancient'.

diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index d2c156b..9ebe4a3 100644 (file)
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -1555,25 +1555,26 @@
     (=hanziku-1                . #xBAC7)       ; &I-HZK01-BAC7;
     ))
 (define-char
-  '((=>ucs             . #x36A2)       ; 㚢
-    (ideographic-radical . 9)  ; ⼈
+  '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 3)
     (total-strokes      . 5)
-    (<-ancient
-     (:sources (morohashi-daikanwa)
-      :char    ((=daikanwa          . 00630)   ; &I-M-00630;
-                )
+    (<-denotational
+     ((=ucs              . #x36A2)     ; 㚢
+      ))
+    (->subsumptive
+     ((->mistakable
+       ((=daikanwa         . 06040)    ; &M-06040;
+       ))
+      (<-ancient
+       ((=ucs              . #xFA30)   ; 侮
+       (=daikanwa          . 00630)    ; &I-M-00630;
+       ))
+      (<-ancient*sources
+       daikanwa)
+      (=daikanwa         . 00395)      ; &M-00395;
+      )
+     ((=cns11643-3       . #x2174)     ; &C3-2174; [01-84]
       ))
-    (comment           . "M-06040 is different character.")
-    (=daikanwa         . 00395)        ; &M-00395;
-    ))
-(define-char
-  '((=>ucs             . #x36A2)       ; 㚢
-    (morohashi-daikanwa        395 0 1)
-    (ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 3)
-    (total-strokes      . 5)
-    (=cns11643-3       . #x2174)       ; &C3-2174; [01-84]
     ))
 (define-char
   '((=>ucs             . #x201B2)      ; 𠆲
@@ -7258,11 +7259,14 @@
     (ideographic-strokes . 6)
     (total-strokes      . 8)
     (<-ancient
-     (:sources (shinjigen-1)
-      :char    ((shinjigen-1        . 211)
-                (=daikanwa          . 00577)   ; &I-M-00577;
-                )
+     ((shinjigen-1       . 211)
+      (=jis-x0208        . #x3426)     ; &GT-00718; [20-06]
+      (=gb2312           . #x5929)     ; &I-G0-5929; [57-09]
+      (=ks-x1001         . #x4A49)     ; &I-K0-4A49; [42-41]
+      (=daikanwa         . 00577)      ; &I-M-00577;
       ))
+    (<-ancient*sources
+     shinjigen-1)
     (hanyu-dazidian    1 148 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -10788,43 +10792,42 @@
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 7)
     (total-strokes      . 9)
-    (hanyu-dazidian    1 160 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x5446)     ; 呆
-      ))
-    (shinjigen-1       . 273)
-    (shinjigen-2       . 273)
     (=ucs              . #x4FDD)       ; 保
-    (=jis-x0208                . #x4A5D)       ; &I-J90-4A5D; [42-61]
-    (=gb2312           . #x3123)       ; &I-G0-3123; [17-03]
-    (=ks-x1001         . #x5C41)       ; &I-K0-5C41; [60-33]
-    (=big5             . #xAB4F)       ; &I-B-AB4F;
-    (=gt               . 00905)        ; &I-GT-00905;
-    (=gt-k             . 05181)        ; &I-GT-K05181;
-    (=gt-pj-1          . #x4A5D)       ; &I-GT-00905; [42-61]
-    (=daikanwa         . 00702)        ; &I-M-00702;
-    ))
-(define-char
-  '((=>ucs             . #x4FDD)       ; 保
-    (morohashi-daikanwa        702 0 1)
-    (ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 7)
-    (total-strokes      . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((name              . "CJK RADICAL PERSON")
-      (=ucs              . #x2E85)     ; ⺅
+    (->subsumptive
+     ((hanyu-dazidian    1 160 4)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
+       )
+       ((=ucs              . #x4EBB)   ; 亻
+       )
+       ((=jis-x0208        . #x4A72)   ; &GT-04295; [42-82]
+       (=gb2312            . #x3474)   ; &I-G0-3474; [20-84]
+       (=daikanwa          . 03395)    ; &I-M-03395;
+       ))
+      (shinjigen-1       . 273)
+      (shinjigen-2       . 273)
+      (=jis-x0208        . #x4A5D)     ; &GT-00905; [42-61]
+      (=gb2312           . #x3123)     ; &I-G0-3123; [17-03]
+      (=ks-x1001         . #x5C41)     ; &I-K0-5C41; [60-33]
+      (=big5             . #xAB4F)     ; &I-B-AB4F;
+      (=gt               . 00905)      ; &I-GT-00905;
+      (=gt-k             . 05181)      ; &I-GT-K05181;
+      (=gt-pj-1                  . #x4A5D)     ; &I-GT-00905; [42-61]
+      (=daikanwa         . 00702)      ; &I-M-00702;
+      (=ucs@unicode      . #x4FDD)     ; &GT-00905;
       )
-     ((=cns11643-1       . #x4944)     ; &C1-4944; [41-36]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
+       )
+       ((name              . "CJK RADICAL PERSON")
+       (=ucs               . #x2E85)   ; ⺅
+       )
+       ((=cns11643-1       . #x4944)   ; &C1-4944; [41-36]
+       ))
+      (=cns11643-1       . #x4F71)     ; &C1-4F71; [47-81]
       ))
-    (=cns11643-1       . #x4F71)       ; &C1-4F71; [47-81]
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
@@ -19891,46 +19894,27 @@
     (=hanziku-1                . #xCF7E)       ; &I-HZK01-CF7E;
     ))
 (define-char
-  '((=>ucs             . #x20300)      ; 𠌀
-    (ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes      . 12)
-    (<-ancient
-     (:sources (jiyun morohashi-daikanwa)
-      :char    ((=daikanwa          . 00702)   ; &I-M-00702;
-                )
-      ))
-    (=daikanwa         . 00981)        ; &M-00981;
-    ))
-(define-char
-  '((=>ucs             . #x20300)      ; 𠌀
-    (morohashi-daikanwa        981 0 0)
-    (ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes      . 12)
-    (hanyu-dazidian    1 203 16)
-    (=hanziku-1                . #xD04B)       ; &HZK01-D04B;
-    ))
-(define-char
-  '((morohashi-daikanwa        981 0 2)
-    (ideographic-radical . 9)  ; ⼈
+  '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 10)
     (total-strokes      . 12)
-    (ideographic-structure
-     (:cdp-combinator  4)
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((name              . "CJK RADICAL PAW ONE")
-      (=ucs              . #x2EA4)     ; ⺤
-      )
-     ((=big5-cdp         . #x8B69)     ; &CDP-8B69;
+    (=ucs              . #x20300)      ; 𠌀
+    (->subsumptive
+     ((<-ancient
+       ((=jis-x0208        . #x4A5D)   ; &GT-00905; [42-61]
+       (=gb2312            . #x3123)   ; &I-G0-3123; [17-03]
+       (=ks-x1001          . #x5C41)   ; &I-K0-5C41; [60-33]
+       (=daikanwa          . 00702)    ; &I-M-00702;
+       ))
+      (<-ancient*sources
+       jiyun daikanwa)
+      (=daikanwa         . 00981)      ; &M-00981;
       )
-     ((=ucs              . #x4E5B)     ; 乛
+     ((hanyu-dazidian    1 203 16)
+      (=hanziku-1        . #xD04B)     ; &HZK01-D04B;
       )
-     ((=ucs              . #x5C0F)     ; 小
+     ((=cns11643-6       . #x4653)     ; &C6-4653; [38-51]
+      (=ucs@iso                  . #x20300)    ; &C6-4653;
       ))
-    (=ucs              . #x20300)      ; 𠌀
-    (=cns11643-6       . #x4653)       ; &I-C6-4653; [38-51]
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈