Use `=jis-x0208@{1978|1983|1990}' instead of

`=jis-x0208-{1978|1983|1990}'.
(U-000204FD): Use `->subsumptive'.
(U-000204FF): Moved from Ideograph-R009-Man.el; use `->subsumptive'.
(M-01449): Moved into U-000204FF.

diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el
index d87cb7c..66d9f81 100644 (file)
--- a/lisp/utf-2000/Ideograph-R011-Enter.el
+++ b/lisp/utf-2000/Ideograph-R011-Enter.el
@@ -1187,59 +1187,96 @@
   '((ideographic-radical . 11) ; ⼊
     (ideographic-strokes . 15)
     (total-strokes      . 17)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
-      )
-     ((=jis-x0208        . #x467E)     ; &GT-01850; [38-94]
-      (=ks-x1001         . #x6C7D)     ; &I-K0-6C7D; [76-93]
-      (=daikanwa         . 01415)      ; &I-M-01415;
-      )
-     ((=jis-x0208-1978   . #x475A)     ; &M-38398; [39-58]
-      (=jis-x0208-1983   . #x475A)     ; &I-J83-475A; [39-58]
-      (=daikanwa         . 38398)      ; &I-M-38398;
-      ))
     (=ucs              . #x204FD)      ; 𠓽
-    (=daikanwa         . 01448)        ; &I-M-01448;
-    ))
-(define-char
-  '((=>ucs             . #x204FD)      ; 𠓽
-    (morohashi-daikanwa        1448 0 0)
-    (ideographic-radical . 11) ; ⼊
-    (ideographic-strokes . 15)
-    (total-strokes      . 17)
-    (hanyu-dazidian    1 232 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
-      )
-     ((=jis-x0208        . #x467E)     ; &GT-01850; [38-94]
-      (=ks-x1001         . #x6C7D)     ; &I-K0-6C7D; [76-93]
-      (=daikanwa         . 01415)      ; &I-M-01415;
-      )
-     ((=ucs              . #x8F29)     ; 輩
-      ))
-    (=hanziku-1                . #xD5F8)       ; &HZK01-D5F8;
-    ))
-(define-char
-  '((=>ucs             . #x204FD)      ; 𠓽
-    (morohashi-daikanwa        1448 0 1)
-    (ideographic-radical . 11) ; ⼊
-    (ideographic-strokes . 15)
-    (total-strokes      . 17)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=jis-x0208        . #x467E)   ; &GT-01850; [38-94]
+       (=ks-x1001          . #x6C7D)   ; &I-K0-6C7D; [76-93]
+       (=daikanwa          . 01415)    ; &I-M-01415;
+       )
+       ((=jis-x0208@1978    . #x475A)  ; &M-38398; [39-58]
+       (=jis-x0208@1983    . #x475A)   ; &I-J83-475A; [39-58]
+       (=daikanwa          . 38398)    ; &I-M-38398;
+       ))
+      (=daikanwa         . 01448)      ; &M-01448;
+      (=ucs@iso                  . #x204FD)    ; &M-01448;
       )
-     ((=ucs              . #x5165)     ; 入
+     ((hanyu-dazidian    1 232 12)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=jis-x0208        . #x467E)   ; &GT-01850; [38-94]
+       (=ks-x1001          . #x6C7D)   ; &I-K0-6C7D; [76-93]
+       (=daikanwa          . 01415)    ; &I-M-01415;
+       )
+       ((=ucs@unicode      . #x8F29)   ; &UU+8F29;
+       ))
+      (=hanziku-1        . #xD5F8)     ; &HZK01-D5F8;
       )
-     ((=ucs              . #x8F29)     ; 輩
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=ucs@unicode      . #x5165)   ; &UU+5165;
+       )
+       ((=ucs@unicode      . #x8F29)   ; &UU+8F29;
+       ))
+      (=cns11643-5       . #x5A72)     ; &C5-5A72; [58-82]
       ))
-    (=cns11643-5       . #x5A72)       ; &C5-5A72; [58-82]
     ))
 (define-char
   '((ideographic-radical . 11) ; ⼊
     (ideographic-strokes . 18)
     (total-strokes      . 20)
-    (=daikanwa         . 01449)        ; &M-01449;
+    (=ucs              . #x204FF)      ; 𠓿
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+       (=ucs               . #x2FF3)   ; ⿳
+       )
+       ((=jis-x0208        . #x467E)   ; &GT-01850; [38-94]
+       (=ks-x1001          . #x6C7D)   ; &I-K0-6C7D; [76-93]
+       (=daikanwa          . 01415)    ; &I-M-01415;
+       )
+       ((=jis-x0208        . #x4873)   ; &GT-57172; [40-83]
+       (=ks-x1001          . #x5E2A)   ; &I-K0-5E2A; [62-10]
+       (=daikanwa          . 42585)    ; &I-M-42585;
+       )
+       ((=jis-x0208        . #x485B)   ; &GT-03371; [40-59]
+       (=cns11643-1        . #x544D)   ; &I-C1-544D; [52-45]
+       (=daikanwa          . 02629)    ; &I-M-02629;
+       ))
+      (=daikanwa         . 01449)      ; &M-01449;
+      )
+     ((hanyu-dazidian    1 238 5)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+       (=ucs               . #x2FF3)   ; ⿳
+       )
+       ((=jis-x0208        . #x467E)   ; &GT-01850; [38-94]
+       (=ks-x1001          . #x6C7D)   ; &I-K0-6C7D; [76-93]
+       (=daikanwa          . 01415)    ; &I-M-01415;
+       )
+       ((=ucs@unicode      . #x975E)   ; &G0-3747;
+       )
+       ((=ucs@unicode      . #x532A)   ; &UU+532A;
+       ))
+      (=hanziku-1        . #xD755)     ; &HZK01-D755;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+       (=ucs               . #x2FF3)   ; ⿳
+       )
+       ((=ucs              . #x5165)   ; 入
+       )
+       ((=ucs@unicode      . #x975E)   ; &G0-3747;
+       )
+       ((=ucs@unicode      . #x532A)   ; &UU+532A;
+       ))
+      (=ucs@iso                  . #x204FF)    ; &UU+204FF;
+      ))
     ))