(U+5342): Use `->denotational' and `->subsumptive'.

(BC-88EC): New character; map to U+5342.
(BC-89D7): New character; map to U+5345.

diff --git a/lisp/utf-2000/Ideograph-R024-Ten.el b/lisp/utf-2000/Ideograph-R024-Ten.el
index 825a828..4fe4dac 100644 (file)
--- a/lisp/utf-2000/Ideograph-R024-Ten.el
+++ b/lisp/utf-2000/Ideograph-R024-Ten.el
@@ -21,6 +21,15 @@
   '((ideographic-radical . 24) ; ⼗
     (ideographic-strokes . 1)
     (total-strokes      . 3)
+    (=ucs              . #x5342)       ; 卂
+    ))
+(define-char
+  '((ideographic-radical . 24) ; ⼗
+    (ideographic-strokes . 1)
+    (total-strokes      . 3)
+    (<-denotational
+     ((=ucs              . #x5342)     ; 卂
+      ))
     (hanyu-dazidian    1 50 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
@@ -31,8 +40,7 @@
       )
      ((=ucs              . #x5341)     ; 十
       ))
-    (=ucs              . #x5342)       ; 卂
-    (=jis-x0212                . #x3436)       ; &I-JSP-3436; [20-22]
+    (=jis-x0212                . #x3436)       ; &GT-03454; [20-22]
     (=jis-x0213-2-2000 . #x2351)       ; &I-JX2-2351; [03-49]
     (=big5-cdp         . #x8D45)       ; &I-CDP-8D45;
     (=gt               . 03454)        ; &I-GT-03454;
@@ -40,13 +48,15 @@
     (=gt-pj-2          . #x482F)       ; &I-GT-03454; [40-15]
     (=daikanwa         . 02696)        ; &I-M-02696;
     (=jef-china3       . #x45C2)       ; &I-JC3-45C2;
+    (=ucs@unicode      . #x5342)       ; &GT-03454;
     ))
 (define-char
-  '((=>ucs             . #x5342)       ; 卂
-    (morohashi-daikanwa        2696 0 0)
-    (ideographic-radical . 24) ; ⼗
+  '((ideographic-radical . 24) ; ⼗
     (ideographic-strokes . 1)
     (total-strokes      . 3)
+    (<-denotational
+     ((=ucs              . #x5342)     ; 卂
+      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
       (=ucs              . #x2FF9)     ; ⿹
@@ -54,44 +64,50 @@
      ((name              . "CJK RADICAL SECOND THREE")
       (=ucs              . #x2E84)     ; ⺄
       )
-     ((=ucs              . #x20087)    ; 𠂇
+     ((=ucs              . #x5341)     ; 十
       ))
-    (=gt-k             . 00252)        ; &GT-K00252;
-    (=gt-pj-k1         . #x3A26)       ; &GT-K00252; [26-06]
+    (=cns11643-4       . #x2130)       ; &C4-2130; [01-16]
     ))
 (define-char
-  '((=>ucs             . #x5342)       ; 卂
-    (morohashi-daikanwa        2696 0 1)
-    (ideographic-radical . 24) ; ⼗
+  '((ideographic-radical . 24) ; ⼗
     (ideographic-strokes . 1)
     (total-strokes      . 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs              . #x2FF9)     ; ⿹
-      )
-     ((=gt-k             . 00007)      ; &GT-K00007;
-      )
-     ((=ucs              . #x20087)    ; 𠂇
+    (<-denotational
+     ((=ucs              . #x5342)     ; 卂
       ))
-    (=gt-k             . 00251)        ; &GT-K00251;
-    (=gt-pj-k1         . #x3163)       ; &GT-K00251; [17-67]
+    (=big5-cdp         . #x88EC)       ; &CDP-88EC;
     ))
 (define-char
-  '((=>ucs             . #x5342)       ; 卂
-    (morohashi-daikanwa        2696 0 2)
-    (ideographic-radical . 24) ; ⼗
+  '((ideographic-radical . 24) ; ⼗
     (ideographic-strokes . 1)
     (total-strokes      . 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs              . #x2FF9)     ; ⿹
-      )
-     ((name              . "CJK RADICAL SECOND THREE")
-      (=ucs              . #x2E84)     ; ⺄
+    (<-denotational
+     ((=ucs              . #x5342)     ; 卂
+      ))
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+       (=ucs               . #x2FF9)   ; ⿹
+       )
+       ((name              . "CJK RADICAL SECOND THREE")
+       (=ucs               . #x2E84)   ; ⺄
+       )
+       ((=ucs              . #x20087)  ; 𠂇
+       ))
+      (=gt-k             . 00252)      ; &GT-K00252;
+      (=gt-pj-k1         . #x3A26)     ; &GT-K00252; [26-06]
       )
-     ((=ucs              . #x5341)     ; 十
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+       (=ucs               . #x2FF9)   ; ⿹
+       )
+       ((=gt-k             . 00007)    ; &GT-K00007;
+       )
+       ((=ucs              . #x20087)  ; 𠂇
+       ))
+      (=gt-k             . 00251)      ; &GT-K00251;
+      (=gt-pj-k1         . #x3163)     ; &GT-K00251; [17-67]
       ))
-    (=cns11643-4       . #x2130)       ; &C4-2130; [01-16]
     ))
 (define-char
   '((ideographic-radical . 24) ; ⼗
@@ -151,6 +167,15 @@
   '((ideographic-radical . 24) ; ⼗
     (ideographic-strokes . 2)
     (total-strokes      . 4)
+    (<-denotational
+     ((=ucs              . #x5345)     ; 卅
+      ))
+    (=big5-cdp         . #x89D7)       ; &CDP-89D7;
+    ))
+(define-char
+  '((ideographic-radical . 24) ; ⼗
+    (ideographic-strokes . 2)
+    (total-strokes      . 4)
     (<-vulgar
      ((shinjigen-1       . 823)
       (=jis-x0208        . #x4234)     ; &GT-03504; [34-20]