(parent of BC-8BAA): Use `<-simplified@component/connect-below'

instead of `<-simplified' for J0-3962.
(BC-8C4D): Likewise.
(GT-K04733): New character.
(M-00316): Use `zhengzitong' instead of `zhengzi-tong' in
`<-vulgar*sources'.
(U-00020170): Use `->subsumptive' to integrate M-23981 and C6-4C2D;
use `ideographic-{radical|strokes}@ucs' instead of
`ideographic-{radical|strokes}'; add
`ideographic-{radical|strokes}@cns' and
`ideographic-radical@cns*sources'.

diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index 162717d..c0e50eb 100644 (file)
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -164,11 +164,6 @@
   '((ideographic-radical . 8)  ; ⼇
     (ideographic-strokes . 3)
     (total-strokes      . 5)
-    (<-simplified
-     ((=jis-x0208        . #x3962)     ; &GT-60968; [25-66]
-      (=ks-x1001         . #x4D54)     ; &I-K0-4D54; [45-52]
-      (=daikanwa         . 45313)      ; &I-M-45313;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
@@ -177,6 +172,11 @@
       )
      ((=ucs              . #x53E3)     ; 口
       ))
+    (<-simplified@component/connect-below
+     ((=jis-x0208        . #x3962)     ; &GT-60968; [25-66]
+      (=ks-x1001         . #x4D54)     ; &I-K0-4D54; [45-52]
+      (=daikanwa         . 45313)      ; &I-M-45313;
+      ))
     (->subsumptive
      ((=big5-cdp         . #x8BAA)     ; &CDP-8BAA;
       )
@@ -642,11 +642,6 @@
   '((ideographic-radical . 8)  ; ⼇
     (ideographic-strokes . 5)
     (total-strokes      . 7)
-    (<-simplified
-     ((=jis-x0208        . #x3962)     ; &GT-60968; [25-66]
-      (=ks-x1001         . #x4D54)     ; &I-K0-4D54; [45-52]
-      (=daikanwa         . 45313)      ; &I-M-45313;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs              . #x2FF3)     ; ⿳
@@ -658,6 +653,11 @@
      ((=ucs              . #x5196)     ; 冖
       ))
     (=big5-cdp         . #x8C4D)       ; &CDP-8C4D;
+    (<-simplified@component/connect-below
+     ((=jis-x0208        . #x3962)     ; &GT-60968; [25-66]
+      (=ks-x1001         . #x4D54)     ; &I-K0-4D54; [45-52]
+      (=daikanwa         . 45313)      ; &I-M-45313;
+      ))
     ))
 (define-char
   '((ideographic-radical . 8)  ; ⼇
@@ -831,6 +831,34 @@
     ))
 (define-char
   '((ideographic-radical . 8)  ; ⼇
+    (ideographic-strokes . 6)
+    (total-strokes      . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs              . #x2FF3)     ; ⿳
+      )
+     ((=jis-x0208        . #x5035)     ; &GT-00376; [48-21]
+      )
+     ((=big5-cdp         . #x89CC)     ; &CDP-89CC;
+      )
+     ((=ucs              . #x5196)     ; 冖
+      ))
+    (=gt-k             . 04733)        ; &GT-K04733;
+    (=gt-pj-k1         . #x393A)       ; &GT-K04733; [25-26]
+    (<-simplified@component/connect-below
+     ((=daikanwa         . 45314)      ; &M-45314;
+      ))
+    (<-vulgar@component
+     ((=big5-cdp         . #x8C4D)     ; &CDP-8C4D;
+      ))
+    (<-vulgar@component/connect-below
+     ((=jis-x0208        . #x3962)     ; &GT-60968; [25-66]
+      (=ks-x1001         . #x4D54)     ; &I-K0-4D54; [45-52]
+      (=daikanwa         . 45313)      ; &I-M-45313;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 8)  ; ⼇
     (ideographic-strokes . 7)
     (total-strokes      . 9)
     (sound@ja/on/kan   "tei")
@@ -1034,15 +1062,7 @@
     (sound@ja/on/go    "kyAu")
     (=ucs              . #x4EB0)       ; 亰
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1       . 102)
-       (=jis-x0208         . #x357E)   ; &GT-00397; [21-94]
-       (=ks-x1001          . #x4C48)   ; &I-K0-4C48; [44-40]
-       (=daikanwa          . 00299)    ; &I-M-00299;
-       ))
-      (<-vulgar*sources
-       shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (=ucs               . #x2FF1)   ; ⿱
        )
@@ -1058,6 +1078,14 @@
       (=gt-pj-1                  . #x5037)     ; &I-GT-00402; [48-23]
       (=daikanwa         . 00307)      ; &I-M-00307;
       (=ucs@jis                  . #x4EB0)     ; &GT-00402;
+      (<-vulgar
+       ((shinjigen-1       . 102)
+       (=jis-x0208         . #x357E)   ; &GT-00397; [21-94]
+       (=ks-x1001          . #x4C48)   ; &I-K0-4C48; [44-40]
+       (=daikanwa          . 00299)    ; &I-M-00299;
+       ))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((hanyu-dazidian    1 285 4)
       (ideographic-structure
@@ -1361,34 +1389,25 @@
     (total-strokes      . 10)
     (=ucs              . #x20158)      ; 𠅘
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1       . 104)
-       (=jis-x0208         . #x4462)   ; &GT-00406; [36-66]
-       (=ks-x1001          . #x6F4D)   ; &I-K0-6F4D; [79-45]
-       (=daikanwa          . 00303)    ; &I-M-00303;
-       ))
-      (<-vulgar*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (=ucs               . #x2FF1)   ; ⿱
        )
-       ((ideographic-structure
-        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-         (=ucs               . #x2FF3) ; ⿳
-         )
-        ((=jis-x0208         . #x5035) ; &GT-00376; [48-21]
-         )
-        ((=big5-cdp          . #x89CC) ; &CDP-89CC;
-         )
-        ((=ucs               . #x5196) ; 冖
-         ))
+       ((=gt-k             . 04733)    ; &GT-K04733;
        )
        ((=ucs              . #x4E01)   ; 丁
        ))
       (shinjigen-1       . 105)
       (shinjigen-2       . 105)
       (=daikanwa         . 00316)      ; &M-00316;
+      (<-vulgar
+       ((shinjigen-1       . 104)
+       (=jis-x0208         . #x4462)   ; &GT-00406; [36-66]
+       (=ks-x1001          . #x6F4D)   ; &I-K0-6F4D; [79-45]
+       (=daikanwa          . 00303)    ; &I-M-00303;
+       ))
+      (<-vulgar*sources
+       zhengzitong daikanwa shinjigen-1)
       )
      ((hanyu-dazidian    1 287 6)
       (ideographic-structure
@@ -1399,7 +1418,8 @@
         ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
          (=ucs               . #x2FF3) ; ⿳
          )
-        ((=ucs               . #x4EA0) ; 亠
+        ((=gb2312            . #x596F) ; &GT-00375; [57-79]
+         (=daikanwa          . 00286)  ; &I-M-00286;
          )
         ((=big5-cdp          . #x89CC) ; &CDP-89CC;
          )
@@ -1419,34 +1439,25 @@
     (total-strokes      . 10)
     (=ucs              . #x20159)      ; 𠅙
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1       . 106)
-       (=jis-x0208         . #x4E3C)   ; &GT-00408; [46-28]
-       (=ks-x1001          . #x5555)   ; &I-K0-5555; [53-53]
-       (=daikanwa          . 00304)    ; &I-M-00304;
-       ))
-      (<-vulgar*sources
-       daikanwa shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (=ucs               . #x2FF1)   ; ⿱
        )
-       ((ideographic-structure
-        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-         (=ucs               . #x2FF3) ; ⿳
-         )
-        ((=jis-x0208         . #x5035) ; &GT-00376; [48-21]
-         )
-        ((=big5-cdp          . #x89CC) ; &CDP-89CC;
-         )
-        ((=ucs               . #x5196) ; 冖
-         ))
+       ((=gt-k             . 04733)    ; &GT-K04733;
        )
        ((=ucs              . #x513F)   ; 儿
        ))
       (shinjigen-1       . 108)
       (shinjigen-2       . 108)
       (=daikanwa         . 00317)      ; &M-00317;
+      (<-vulgar
+       ((shinjigen-1       . 106)
+       (=jis-x0208         . #x4E3C)   ; &GT-00408; [46-28]
+       (=ks-x1001          . #x5555)   ; &I-K0-5555; [53-53]
+       (=daikanwa          . 00304)    ; &I-M-00304;
+       ))
+      (<-vulgar*sources
+       daikanwa shinjigen-1)
       )
      ((hanyu-dazidian    1 287 7)
       (ideographic-structure
@@ -1457,7 +1468,8 @@
         ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
          (=ucs               . #x2FF3) ; ⿳
          )
-        ((=ucs               . #x4EA0) ; 亠
+        ((=gb2312            . #x596F) ; &GT-00375; [57-79]
+         (=daikanwa          . 00286)  ; &I-M-00286;
          )
         ((=big5-cdp          . #x89CC) ; &CDP-89CC;
          )
@@ -1468,7 +1480,7 @@
        ))
       (=cns11643-6       . #x3530)     ; &HZK01-E155; [21-16]
       (=hanziku-1        . #xE155)     ; &I-HZK01-E155;
-      (=ucs@unicode      . #x20159)    ; &HZK01-E155;
+      (=ucs@iso                  . #x20159)    ; &HZK01-E155;
       ))
     ))
 (define-char
@@ -2015,32 +2027,64 @@
     (=hanziku-1                . #xE1D2)       ; &I-HZK01-E1D2;
     ))
 (define-char
-  '((ideographic-radical . 8)  ; ⼇
-    (ideographic-strokes . 10)
+  '((ideographic-radical@ucs . 8)      ; ⼇
+    (ideographic-strokes@ucs . 10)
+    (ideographic-radical@cns . 111)    ; ⽮
+    (ideographic-strokes@cns . 7)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes      . 12)
-    (<-same
-     ((=daikanwa         . 23981)      ; &M-23981;
-      ))
-    (hanyu-dazidian    1 290 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
-      )
-     ((=ucs              . #x4EA0)     ; 亠
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
-       (=ucs               . #x2FF2)   ; ⿲
+    (=ucs              . #x20170)      ; 𠅰
+    (->subsumptive
+     ((ideographic-radical . 111)      ; ⽮
+      (ideographic-strokes . 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
        )
-       ((=ucs              . #x571F)   ; 土
+       ((=jis-x0208        . #x5035)   ; &GT-00376; [48-21]
+       )
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+         (=ucs               . #x2FF2) ; ⿲
+         )
+        ((=gt-k              . 00199)  ; &GT-K00199;
+         )
+        ((=gt-k              . 01013)  ; &GT-K01013;
+         )
+        ((=ucs               . #x5315) ; 匕
+         ))
+       ))
+      (=daikanwa         . 23981)      ; &M-23981;
+      )
+     ((ideographic-radical . 8)        ; ⼇
+      (ideographic-strokes . 10)
+      (hanyu-dazidian    1 290 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
        )
-       ((=ucs              . #x77E2)   ; 矢
+       ((=gb2312           . #x596F)   ; &GT-00375; [57-79]
+       (=daikanwa          . 00286)    ; &I-M-00286;
        )
-       ((=ucs              . #x5315)   ; 匕
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+         (=ucs               . #x2FF2) ; ⿲
+         )
+        ((=gt-k              . 00199)  ; &GT-K00199;
+         )
+        ((=gt-k              . 01013)  ; &GT-K01013;
+         )
+        ((=ucs               . #x5315) ; 匕
+         ))
        ))
+      (=hanziku-1        . #xE1D1)     ; &HZK01-E1D1;
+      (=ucs@iso                  . #x20170)    ; &HZK01-E1D1;
+      )
+     ((ideographic-radical . 111)      ; ⽮
+      (ideographic-strokes . 7)
+      (=cns11643-6       . #x4C2D)     ; &C6-4C2D; [44-13]
       ))
-    (=ucs              . #x20170)      ; 𠅰
-    (=hanziku-1                . #xE1D1)       ; &I-HZK01-E1D1;
     ))
 (define-char
   '((ideographic-radical . 8)  ; ⼇