- Add some `=ucs@cns' features.

- Use `->subsumptive' or `{<-|->}denotational' for some character
  definitions.

diff --git a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
index 7f82245..49aa359 100644 (file)
--- a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
@@ -58,40 +58,41 @@
   '((ideographic-radical . 22) ; ⼕
     (ideographic-strokes . 3)
     (total-strokes      . 5)
-    (hanyu-dazidian    1 82 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-      (=ucs              . #x2FF7)     ; ⿷
-      )
-     ((=ucs              . #x531A)     ; 匚
-      )
-     ((=ucs              . #x4E5F)     ; 也
-      ))
-    (shinjigen-1       . 787)
-    (shinjigen-2       . 787)
     (=ucs              . #x531C)       ; 匜
-    (=jis-x0212                . #x3426)       ; &I-JSP-3426; [20-06]
-    (=iso-ir165                . #x7A28)       ; &I-EGB-7A28; [90-08]
-    (=jis-x0213-1-2000 . #x2E6D)       ; &I-JX1-2E6D; [14-77]
-    (=big5             . #xC96C)       ; &I-B-C96C;
-    (=daikanwa         . 02598)        ; &I-M-02598;
-    (=jef-china3       . #x45B1)       ; &I-JC3-45B1;
-    ))
-(define-char
-  '((=>ucs             . #x531C)       ; 匜
-    (morohashi-daikanwa        2598 0 0)
-    (ideographic-radical . 22) ; ⼕
-    (ideographic-strokes . 3)
-    (total-strokes      . 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-      (=ucs              . #x2FF7)     ; ⿷
-      )
-     ((=ucs              . #x531A)     ; 匚
+    (->subsumptive
+     ((hanyu-dazidian    1 82 6)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+       (=ucs               . #x2FF7)   ; ⿷
+       )
+       ((=ucs              . #x531A)   ; 匚
+       )
+       ((=jis-x0208        . #x4C69)   ; &GT-00231; [44-73]
+       (=gb2312            . #x5232)   ; &I-G0-5232; [50-18]
+       (=ks-x1001          . #x6525)   ; &I-K0-6525; [69-05]
+       (=daikanwa          . 00171)    ; &I-M-00171;
+       ))
+      (shinjigen-1       . 787)
+      (shinjigen-2       . 787)
+      (=jis-x0212        . #x3426)     ; &M-02598; [20-06]
+      (=iso-ir165        . #x7A28)     ; &I-EGB-7A28; [90-08]
+      (=jis-x0213-1-2000  . #x2E6D)    ; &I-JX1-2E6D; [14-77]
+      (=big5             . #xC96C)     ; &I-B-C96C;
+      (=daikanwa         . 02598)      ; &I-M-02598;
+      (=jef-china3       . #x45B1)     ; &I-JC3-45B1;
+      (=ucs@unicode      . #x531C)     ; &M-02598;
       )
-     ((=cns11643-1       . #x443E)     ; &C1-443E; [36-30]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+       (=ucs               . #x2FF7)   ; ⿷
+       )
+       ((=ucs              . #x531A)   ; 匚
+       )
+       ((=cns11643-1       . #x443E)   ; &C1-443E; [36-30]
+       ))
+      (=cns11643-2       . #x214D)     ; &C2-214D; [01-45]
+      (=ucs@cns                  . #x531C)     ; &C2-214D;
       ))
-    (=cns11643-2       . #x214D)       ; &C2-214D; [01-45]
     ))
 (define-char
   '((ideographic-radical . 22) ; ⼕

diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index ae5d6f2..2a2ed83 100644 (file)
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -314,41 +314,54 @@
       ))
     ))
 (define-char
-  '((=>ucs             . #x533D)       ; 匽
-    (ideographic-radical . 23) ; ⼖
+  '((ideographic-radical . 23) ; ⼖
     (ideographic-strokes . 7)
     (total-strokes      . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-      (=ucs              . #x2FF7)     ; ⿷
-      )
-     ((=ucs              . #x5338)     ; 匸
-      )
-     ((=ucs              . #x599F)     ; 妟
-      ))
-    (=daikanwa         . 02684)        ; &M-02684;
+    (=ucs              . #x533D)       ; 匽
     ))
 (define-char
-  '((=>ucs             . #x533D)       ; 匽
-    (morohashi-daikanwa        2684 0 0)
-    (ideographic-radical . 23) ; ⼖
+  '((ideographic-radical . 23) ; ⼖
     (ideographic-strokes . 7)
     (total-strokes      . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-      (=ucs              . #x2FF7)     ; ⿷
-      )
-     ((=ucs              . #x5338)     ; 匸
+    (<-denotational
+     ((=ucs              . #x533D)     ; 匽
+      ))
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+       (=ucs               . #x2FF7)   ; ⿷
+       )
+       ((=jis-x0208        . #x523E)   ; &GT-03427; [50-30]
+       (=cns11643-3        . #x2129)   ; &I-C3-2129; [01-09]
+       (=daikanwa          . 02672)    ; &I-M-02672;
+       )
+       ((=jis-x0212        . #x392E)   ; &CDP-8DD2; [25-14]
+       (=jis-x0213-2-2000  . #x254B)   ; &I-JX2-254B; [05-43]
+       (=daikanwa          . 06099)    ; &I-M-06099;
+       ))
+      (=daikanwa         . 02684)      ; &M-02684;
       )
-     ((=cns11643-3       . #x2551)     ; &C3-2551; [05-49]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+       (=ucs               . #x2FF7)   ; ⿷
+       )
+       ((=jis-x0208        . #x523E)   ; &GT-03427; [50-30]
+       (=cns11643-3        . #x2129)   ; &I-C3-2129; [01-09]
+       (=daikanwa          . 02672)    ; &I-M-02672;
+       )
+       ((=cns11643-3       . #x2551)   ; &C3-2551; [05-49]
+       ))
+      (=cns11643-2       . #x2936)     ; &C2-2936; [09-22]
+      (=ucs@cns                  . #x533D)     ; &C2-2936;
       ))
-    (=cns11643-2       . #x2936)       ; &C2-2936; [09-22]
     ))
 (define-char
-  '((morohashi-daikanwa        2684 0 1)
-    (ideographic-radical . 23) ; ⼖
+  '((ideographic-radical . 23) ; ⼖
     (ideographic-strokes . 7)
     (total-strokes      . 9)
+    (<-denotational
+     ((=ucs              . #x533D)     ; 匽
+      ))
     (hanyu-dazidian    1 85 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -356,12 +369,14 @@
       )
      ((=ucs              . #x531A)     ; 匚
       )
-     ((=ucs              . #x599F)     ; 妟
+     ((=jis-x0212        . #x392E)     ; &CDP-8DD2; [25-14]
+      (=jis-x0213-2-2000  . #x254B)    ; &I-JX2-254B; [05-43]
+      (=daikanwa         . 06099)      ; &I-M-06099;
       ))
-    (=ucs              . #x533D)       ; 匽
-    (=jis-x0212                . #x3434)       ; &I-JSP-3434; [20-20]
+    (=jis-x0212                . #x3434)       ; &JSP-3434; [20-20]
     (=big5             . #xCDF4)       ; &I-B-CDF4;
     (=jef-china3       . #x45BA)       ; &I-JC3-45BA;
+    (=ucs@unicode      . #x533D)       ; &JSP-3434;
     ))
 (define-char
   '((ideographic-radical . 23) ; ⼖