- Add some `=ucs@cns' features.

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

diff --git a/lisp/utf-2000/Ideograph-R033-Scholar.el b/lisp/utf-2000/Ideograph-R033-Scholar.el
index 431b3e0..7d032b0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R033-Scholar.el
+++ b/lisp/utf-2000/Ideograph-R033-Scholar.el
@@ -72,8 +72,9 @@
     (ideographic-strokes . 3)
     (total-strokes      . 6)
     (<-simplified@JP/Jouyou
-     ((=ucs              . #x58EF)     ; 壯
-      (=jis-x0208        . #x5463)     ; &I-J90-5463; [52-67]
+     ((=jis-x0208        . #x5463)     ; &GT-07142; [52-67]
+      (=ks-x1001         . #x6D60)     ; &I-K0-6D60; [77-64]
+      (=daikanwa         . 05643)      ; &I-M-05643;
       ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -97,25 +98,39 @@
   '((ideographic-radical . 33) ; ⼠
     (ideographic-strokes . 4)
     (total-strokes      . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x723F)     ; 爿
+    (=ucs              . #x58EF)       ; 壯
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
+       )
+       ((=jis-x0208        . #x602D)   ; &GT-25375; [64-13]
+       (=gb2312            . #x635D)   ; &I-G0-635D; [67-61]
+       (=daikanwa          . 19758)    ; &I-M-19758;
+       )
+       ((=ucs              . #x58EB)   ; 士
+       ))
+      (shinjigen-2       . 1527)
+      (=jis-x0208        . #x5463)     ; &GT-07142; [52-67]
+      (=ks-x1001         . #x6D60)     ; &I-K0-6D60; [77-64]
+      (=gb12345                  . #x5733)     ; &GT-07142; [55-19]
+      (=big5             . #xA7A7)     ; &I-B-A7A7;
+      (=gt               . 07142)      ; &I-GT-07142;
+      (=gt-k             . 02691)      ; &I-GT-K02691;
+      (=gt-pj-1                  . #x5463)     ; &I-GT-07142; [52-67]
+      (=daikanwa         . 05643)      ; &I-M-05643;
+      (=ucs@unicode      . #x58EF)     ; &GT-07142;
       )
-     ((=ucs              . #x58EB)     ; 士
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
+       )
+       ((=cns11643-2       . #x2142)   ; &C2-2142; [01-34]
+       )
+       ((=ucs              . #x58EB)   ; 士
+       ))
+      (=cns11643-1       . #x4967)     ; &C1-4967; [41-71]
       ))
-    (shinjigen-2       . 1527)
-    (=ucs              . #x58EF)       ; 壯
-    (=jis-x0208                . #x5463)       ; &I-J90-5463; [52-67]
-    (=ks-x1001         . #x6D60)       ; &I-K0-6D60; [77-64]
-    (=cns11643-1       . #x4967)       ; &I-C1-4967; [41-71]
-    (=gb12345          . #x5733)       ; 壯 [55-19]
-    (=big5             . #xA7A7)       ; &I-B-A7A7;
-    (=gt               . 07142)        ; &I-GT-07142;
-    (=gt-k             . 02691)        ; &I-GT-K02691;
-    (=gt-pj-1          . #x5463)       ; &I-GT-07142; [52-67]
-    (=daikanwa         . 05643)        ; &I-M-05643;
     ))
 (define-char
   '((ideographic-radical . 33) ; ⼠
@@ -763,6 +778,7 @@
        ((=cns11643-1       . #x5E71)   ; &C1-5E71; [62-81]
        ))
       (=cns11643-2       . #x4F7A)     ; &C2-4F7A; [47-90]
+      (=ucs@cns                  . #x58FF)     ; &C2-4F7A;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")

diff --git a/lisp/utf-2000/Ideograph-R034-Go.el b/lisp/utf-2000/Ideograph-R034-Go.el
index 36cdfda..eaca9d9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R034-Go.el
+++ b/lisp/utf-2000/Ideograph-R034-Go.el
@@ -42,38 +42,44 @@
     (=big5-cdp         . #x8874)       ; &I-CDP-8874;
     ))
 (define-char
-  '((=>ucs             . #x5903)       ; 夃
-    (ideographic-radical . 34) ; ⼡
+  '((ideographic-radical . 34) ; ⼡
     (ideographic-strokes . 1)
     (total-strokes      . 4)
-    (=gt               . 07202)        ; &GT-07202;
-    (=gt-pj-2          . #x652C)       ; &GT-07202; [69-12]
-    (=daikanwa         . 05693)        ; &I-M-05693;
+    (=ucs              . #x5903)       ; 夃
+    (=big5             . #xC95A)       ; &I-B-C95A;
     ))
 (define-char
-  '((=>ucs             . #x5903)       ; 夃
-    (morohashi-daikanwa        5693 0 0)
-    (ideographic-radical . 34) ; ⼡
+  '((ideographic-radical . 34) ; ⼡
     (ideographic-strokes . 1)
     (total-strokes      . 4)
-    (=cns11643-2       . #x213A)       ; &C2-213A; [01-26]
-    (=big5             . #xC95A)       ; &I-B-C95A;
-    (=ucs@big5         . #x5903)       ; &C2-213A;
+    (<-denotational
+     ((=ucs              . #x5903)     ; 夃
+      ))
+    (->subsumptive
+     ((=gt               . 07202)      ; &GT-07202;
+      (=gt-pj-2                  . #x652C)     ; &GT-07202; [69-12]
+      (=daikanwa         . 05693)      ; &I-M-05693;
+      )
+     ((=cns11643-2       . #x213A)     ; &C2-213A; [01-26]
+      (=ucs@cns                  . #x5903)     ; &C2-213A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        5693 0 5)
-    (ideographic-radical . 34) ; ⼡
+  '((ideographic-radical . 34) ; ⼡
     (ideographic-strokes . 1)
     (total-strokes      . 4)
+    (<-denotational
+     ((=ucs              . #x5903)     ; 夃
+      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (=ucs              . #x2FF5)     ; ⿵
       )
      ((=ucs              . #x4E43)     ; 乃
       )
-     ((=ucs              . #x53C8)     ; 又
+     ((=gt-k             . 00064)      ; &GT-K00064;
       ))
-    (=ucs              . #x5903)       ; 夃
+    (=ucs@unicode      . #x5903)       ; &UU+5903;
     ))
 (define-char
   '((ideographic-radical . 34) ; ⼡

diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el
index 3940d53..7395801 100644 (file)
--- a/lisp/utf-2000/Ideograph-R037-Big.el
+++ b/lisp/utf-2000/Ideograph-R037-Big.el
@@ -28,31 +28,27 @@
     (=daikanwa         . 05832)        ; &I-M-05832;
     ))
 (define-char
-  '((=>ucs             . #x5929)       ; 天
-    (ideographic-radical . 37) ; ⼤
-    (ideographic-strokes . 1)
-    (total-strokes      . 4)
-    (shinjigen-2       . 1559)
-    (=jis-x0208                . #x4537)       ; &GT-07370; [37-23]
-    (=ks-x1001         . #x7438)       ; &I-K0-7438; [84-24]
-    (=big5             . #xA4D1)       ; &I-B-A4D1;
-    (=gt               . 07370)        ; &I-GT-07370;
-    (=gt-k             . 00467)        ; &I-GT-K00467;
-    (=gt-pj-1          . #x4537)       ; &I-GT-07370; [37-23]
-    (=daikanwa         . 05833)        ; &I-M-05833;
-    (=ucs@jis          . #x5929)       ; &GT-07370;
-    (=ucs@big5         . #x5929)       ; &GT-07370;
-    ))
-(define-char
-  '((morohashi-daikanwa        5833 0 1)
-    (ideographic-radical . 37) ; ⼤
+  '((ideographic-radical . 37) ; ⼤
     (ideographic-strokes . 1)
     (total-strokes      . 4)
     (=ucs              . #x5929)       ; 天
-    (=gb2312           . #x4C6C)       ; &I-G0-4C6C; [44-76]
-    (=cns11643-1       . #x4532)       ; &I-C1-4532; [37-18]
-    (=gt-k             . 00468)        ; &I-GT-K00468;
-    (=gt-pj-k2         . #x4377)       ; 天 [35-87]
+    (=big5             . #xA4D1)       ; &I-B-A4D1;
+    (->subsumptive
+     ((shinjigen-2       . 1559)
+      (=jis-x0208        . #x4537)     ; &GT-07370; [37-23]
+      (=ks-x1001         . #x7438)     ; &I-K0-7438; [84-24]
+      (=gt               . 07370)      ; &I-GT-07370;
+      (=gt-k             . 00467)      ; &I-GT-K00467;
+      (=gt-pj-1                  . #x4537)     ; &I-GT-07370; [37-23]
+      (=daikanwa         . 05833)      ; &I-M-05833;
+      (=ucs@jis                  . #x5929)     ; &GT-07370;
+      )
+     ((=gb2312           . #x4C6C)     ; &GT-K00468; [44-76]
+      (=cns11643-1       . #x4532)     ; &I-C1-4532; [37-18]
+      (=gt-k             . 00468)      ; &I-GT-K00468;
+      (=gt-pj-k2         . #x4377)     ; &GT-K00468; [35-87]
+      (=ucs@unicode      . #x5929)     ; &GT-K00468;
+      ))
     ))
 (define-char
   '((ideographic-radical . 37) ; ⼤
@@ -90,39 +86,35 @@
   '((ideographic-radical . 37) ; ⼤
     (ideographic-strokes . 1)
     (total-strokes      . 4)
-    (shinjigen-2       . 1557)
     (=ucs              . #x592C)       ; 夬
-    (=jis-x0208                . #x546F)       ; &I-J90-546F; [52-79]
-    (=iso-ir165                . #x7A25)       ; &I-EGB-7A25; [90-05]
-    (=big5             . #xC95B)       ; &I-B-C95B;
-    (=gt               . 07367)        ; &I-GT-07367;
-    (=gt-k             . 00523)        ; &I-GT-K00523;
-    (=gt-pj-1          . #x546F)       ; &I-GT-07367; [52-79]
-    (=daikanwa         . 05836)        ; &I-M-05836;
-    ))
-(define-char
-  '((=>ucs             . #x592C)       ; 夬
-    (morohashi-daikanwa        5836 0 1)
-    (ideographic-radical . 37) ; ⼤
-    (ideographic-strokes . 1)
-    (total-strokes      . 4)
-    (=cns11643-2       . #x213B)       ; &C2-213B; [01-27]
-    ))
-(define-char
-  '((=>ucs             . #x215D2)      ; 𡗒
-    (ideographic-radical . 37) ; ⼤
-    (ideographic-strokes . 1)
-    (total-strokes      . 4)
-    (=daikanwa         . 05837)        ; &M-05837;
+    (->subsumptive
+     ((shinjigen-2       . 1557)
+      (=jis-x0208        . #x546F)     ; &GT-07367; [52-79]
+      (=iso-ir165        . #x7A25)     ; &I-EGB-7A25; [90-05]
+      (=big5             . #xC95B)     ; &I-B-C95B;
+      (=gt               . 07367)      ; &I-GT-07367;
+      (=gt-k             . 00523)      ; &I-GT-K00523;
+      (=gt-pj-1                  . #x546F)     ; &I-GT-07367; [52-79]
+      (=daikanwa         . 05836)      ; &I-M-05836;
+      (=ucs@unicode      . #x592C)     ; &GT-07367;
+      )
+     ((=cns11643-2       . #x213B)     ; &C2-213B; [01-27]
+      (=ucs@cns                  . #x592C)     ; &C2-213B;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        5837 0 0)
-    (ideographic-radical . 37) ; ⼤
+  '((ideographic-radical . 37) ; ⼤
     (ideographic-strokes . 1)
     (total-strokes      . 4)
     (=ucs              . #x215D2)      ; 𡗒
-    (=cns11643-6       . #x2167)       ; &I-C6-2167; [01-71]
-    (=big5-cdp         . #x87D3)       ; &I-CDP-87D3;
+    (->subsumptive
+     ((=daikanwa         . 05837)      ; &M-05837;
+      )
+     ((=cns11643-6       . #x2167)     ; &C6-2167; [01-71]
+      )
+     ((=big5-cdp         . #x87D3)     ; &CDP-87D3;
+      (=ucs@iso                  . #x215D2)    ; &CDP-87D3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 37) ; ⼤
@@ -1127,20 +1119,20 @@
     ))
 (define-char
   '((ideographic-radical . 37) ; ⼤
-    (ideographic-strokes . 6)
-    (total-strokes      . 9)
     (=ucs              . #x594A)       ; 奊
-    (=big5             . #xD15A)       ; &I-B-D15A;
-    (=daikanwa@rev1    . 05897)        ; 奊
-    (=daikanwa@rev2    . 05909)        ; &M-05909;
-    ))
-(define-char
-  '((=>ucs             . #x594A)       ; 奊
-    (morohashi-daikanwa        5909 0 5)
-    (ideographic-radical . 37) ; ⼤
-    (ideographic-strokes . 7)
-    (total-strokes      . 10)
-    (=cns11643-2       . #x2E5C)       ; &C2-2E5C; [14-60]
+    (->subsumptive
+     ((ideographic-strokes . 6)
+      (total-strokes      . 9)
+      (=big5             . #xD15A)     ; &B-D15A;
+      (=daikanwa@rev1    . 05897)      ; &B-D15A;
+      (=daikanwa@rev2    . 05909)      ; &M-05909;
+      (=ucs@unicode      . #x594A)     ; &B-D15A;
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes      . 10)
+      (=cns11643-2       . #x2E5C)     ; &C2-2E5C; [14-60]
+      (=ucs@cns                  . #x594A)     ; &C2-2E5C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 37) ; ⼤