(U-0002577C): Unify M-24974.

(U-00025780): Use `->subsumptive'; integrate M-24979.
(U+79DA): Use `->denotational' instead of `->subsumptive'.
(U+4136): Unify M-24984.
(U+4173): Use `->subsumptive'; integrate M-25206.
(U+7A37): Use `->denotational' instead of `->subsumptive'.
(U+7A43): Use `->subsumptive'.
(U-00025900): Use `->subsumptive'; integrate M-25376.
(U-00025901): Use `->subsumptive'; integrate M-25377.
(U+418A): Use `->subsumptive'; integrate M-25378.
(U-00025902): Use `->subsumptive'; integrate M-25379.
(U+418D): Use `->subsumptive'; integrate M-25382.
(U-0002A6BC): Use `ideographic-{radical|strokes}@cns' instead of
`ideographic-{radical|strokes}'; add
`ideographic-{radical|strokes}@ucs' and
`ideographic-radical@ucs*sources'; use `->subsumptive'; integrate
M-48870.

diff --git a/lisp/utf-2000/Ideograph-R115-Grain.el b/lisp/utf-2000/Ideograph-R115-Grain.el
index 6381a99..c3b73d0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R115-Grain.el
+++ b/lisp/utf-2000/Ideograph-R115-Grain.el
@@ -489,6 +489,14 @@
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 4)
     (total-strokes      . 9)
+    (=ucs              . #x2577C)      ; 𥝼
+    (=cns11643-6       . #x334E)       ; &I-C6-334E; [19-46]
+    (=daikanwa         . 24974)        ; &I-M-24974;
+    ))
+(define-char
+  '((ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 4)
+    (total-strokes      . 9)
     (=ucs              . #x25784)      ; 𥞄
     (->subsumptive
      ((=daikanwa         . 25006)      ; &M-25006;
@@ -639,19 +647,8 @@
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 4)
-    (total-strokes      . 9)
-    (=ucs              . #x2577C)      ; 𥝼
-    (=cns11643-6       . #x334E)       ; &I-C6-334E; [19-46]
-    ))
-(define-char
-  '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208        . #x6330)     ; &GT-31649; [67-16]
-      (=daikanwa         . 24663)      ; &I-M-24663;
-      ))
     (shinjigen-2       . 5536)
     (=ucs              . #x79D8)       ; 秘
     (=jis-x0208                . #x486B)       ; &I-J90-486B; [40-75]
@@ -663,6 +660,10 @@
     (=gt-k             . 06537)        ; &I-GT-K06537;
     (=gt-pj-1          . #x486B)       ; &I-GT-32244; [40-75]
     (=daikanwa         . 24977)        ; &I-M-24977;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208        . #x6330)     ; &GT-31649; [67-16]
+      (=daikanwa         . 24663)      ; &I-M-24663;
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲
@@ -676,21 +677,46 @@
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (=ucs              . #x79DA)       ; 秚
+    (=ucs              . #x25780)      ; 𥞀
     (->subsumptive
-     ((=jis-x0212        . #x507C)     ; &M-24980; [48-92]
-      (=daikanwa         . 24980)      ; &I-M-24980;
-      (=jef-china3       . #x5CFB)     ; &I-JC3-5CFB;
-      (=ucs@jis                  . #x79DA)     ; &M-24980;
+     ((=daikanwa         . 24979)      ; &M-24979;
+      (=ucs@iso                  . #x25780)    ; &M-24979;
       )
-     ((=cns11643-3       . #x3273)     ; &C3-3273; [18-83]
-      (=ucs@unicode      . #x79DA)     ; &C3-3273;
+     ((=cns11643-6       . #x3A45)     ; &C6-3A45; [26-37]
       ))
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 5)
     (total-strokes      . 10)
+    (=ucs              . #x79DA)       ; 秚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x79DA)     ; 秚
+      ))
+    (ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 5)
+    (total-strokes      . 10)
+    (=jis-x0212                . #x507C)       ; &M-24980; [48-92]
+    (=daikanwa         . 24980)        ; &I-M-24980;
+    (=jef-china3       . #x5CFB)       ; &I-JC3-5CFB;
+    (=ucs@jis          . #x79DA)       ; &M-24980;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x79DA)     ; 秚
+      ))
+    (ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 5)
+    (total-strokes      . 10)
+    (=cns11643-3       . #x3273)       ; &C3-3273; [18-83]
+    (=ucs@unicode      . #x79DA)       ; &C3-3273;
+    ))
+(define-char
+  '((ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 5)
+    (total-strokes      . 10)
     (=ucs              . #x79DB)       ; 秛
     (=cns11643-3       . #x3279)       ; &I-C3-3279; [18-89]
     (=daikanwa         . 24981)        ; &I-M-24981;
@@ -723,6 +749,14 @@
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 5)
     (total-strokes      . 10)
+    (=ucs              . #x4136)       ; 䄶
+    (=cns11643-4       . #x2E65)       ; &I-C4-2E65; [14-69]
+    (=daikanwa         . 24984)        ; &I-M-24984;
+    ))
+(define-char
+  '((ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 5)
+    (total-strokes      . 10)
     (=ucs              . #x79DE)       ; 秞
     (=jis-x0212                . #x507E)       ; &I-JSP-507E; [48-94]
     (=cns11643-2       . #x3157)       ; &I-C2-3157; [17-55]
@@ -1035,23 +1069,16 @@
     (ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208@1983   . #x634A)     ; &GT-32460; [67-42]
-      (=jis-x0208@1990   . #x634A)     ; &I-J90-634A; [67-42]
-      ))
     (=jis-x0208                . #x3E4E)       ; &GT-32225; [30-46]
     (=gt               . 32225)        ; &I-GT-32225;
     (=gt-pj-1          . #x3E4E)       ; &I-GT-32225; [30-46]
     (=cbeta            . 00379)        ; &I-CB00379;
     (=ucs@cns          . #x79F0)       ; &GT-32225;
     (=ucs@jis          . #x79F0)       ; &GT-32225;
-    ))
-(define-char
-  '((ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 5)
-    (total-strokes      . 10)
-    (=ucs              . #x4136)       ; 䄶
-    (=cns11643-4       . #x2E65)       ; &I-C4-2E65; [14-69]
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208@1983   . #x634A)     ; &GT-32460; [67-42]
+      (=jis-x0208@1990   . #x634A)     ; &I-J90-634A; [67-42]
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲
@@ -1085,13 +1112,6 @@
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (=ucs              . #x25780)      ; 𥞀
-    (=cns11643-6       . #x3A45)       ; &I-C6-3A45; [26-37]
-    ))
-(define-char
-  '((ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 5)
-    (total-strokes      . 10)
     (=ucs              . #x25781)      ; 𥞁
     (=cns11643-5       . #x2F3D)       ; &I-C5-2F3D; [15-29]
     ))
@@ -2760,16 +2780,16 @@
     (ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 9)
     (total-strokes      . 14)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208        . #x634B)     ; &GT-32541; [67-43]
-      (=ks-x1001         . #x542B)     ; &I-K0-542B; [52-11]
-      (=daikanwa         . 25216)      ; &I-M-25216;
-      ))
     (=ucs              . #x7A32)       ; 稲
     (=jis-x0208                . #x3070)       ; &I-J90-3070; [16-80]
     (=cns11643-3       . #x4852)       ; &I-C3-4852; [40-50]
     (=gt               . 32476)        ; &I-GT-32476;
     (=gt-pj-1          . #x3070)       ; &I-GT-32476; [16-80]
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208        . #x634B)     ; &GT-32541; [67-43]
+      (=ks-x1001         . #x542B)     ; &I-K0-542B; [52-11]
+      (=daikanwa         . 25216)      ; &I-M-25216;
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲
@@ -2791,16 +2811,16 @@
     (=ucs              . #x2F959)      ; 穀
     (->subsumptive
      ((morohashi-daikanwa      25188 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs              . #xFA54)   ; 穀
-       (=jis-x0213-1-2000  . #x794D)   ; &I-JX1-794D; [89-45]
-       ))
       (=jis-x0208        . #x3972)     ; &GT-32448; [25-82]
       (=gt               . 32448)      ; &I-GT-32448;
       (=gt-k             . 11664)      ; &I-GT-K11664;
       (=gt-pj-1                  . #x3972)     ; &I-GT-32448; [25-82]
       (=jef-china3       . #x5CF4)     ; &I-JC3-5CF4;
       (=ucs@jis                  . #x7A40)     ; &GT-32448;
+      (<-simplified@JP/Jouyou
+       ((=ucs              . #xFA54)   ; 穀
+       (=jis-x0213-1-2000  . #x794D)   ; &I-JX1-794D; [89-45]
+       ))
       )
      ((=cns11643-4       . #x455F)     ; &C4-455F; [37-63]
       (=ucs@iso                  . #x2F959)    ; &C4-455F;
@@ -3158,24 +3178,65 @@
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 10)
     (total-strokes      . 15)
+    (=ucs              . #x4173)       ; 䅳
+    (->subsumptive
+     ((=daikanwa         . 25206)      ; &M-25206;
+      (=ucs@unicode      . #x4173)     ; &M-25206;
+      )
+     ((=cns11643-4       . #x4B68)     ; &C4-4B68; [43-72]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 10)
+    (total-strokes      . 15)
     (=ucs              . #x7A37)       ; 稷
+    ))
+(define-char
+  '((<-denotational
+     ((=big5             . #xBD5E)     ; &B-BD5E;
+      ))
+    (ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 10)
+    (total-strokes      . 15)
     (->subsumptive
      ((=daikanwa         . 25207)      ; &M-25207;
       )
      ((=cns11643-1       . #x6E29)     ; &C1-6E29; [78-09]
-      )
-     ((shinjigen-2       . 5654)
-      (=jis-x0208        . #x634D)     ; &GT-32523; [67-45]
-      (=ks-x1001         . #x7243)     ; &I-K0-7243; [82-35]
-      (=gt               . 32523)      ; &I-GT-32523;
-      (=gt-pj-1                  . #x634D)     ; &I-GT-32523; [67-45]
-      (=ucs@jis                  . #x7A37)     ; &GT-32523;
-      )
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x7A37)     ; 稷
+      ))
+    (ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 10)
+    (total-strokes      . 15)
+    (=big5             . #xBD5E)       ; &B-BD5E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x7A37)     ; 稷
+      ))
+    (ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 10)
+    (total-strokes      . 15)
+    (=gb2312           . #x7022)       ; &G0-7022; [80-02]
+    (=ucs@unicode      . #x7A37)       ; &G0-7022;
+    ))
+(define-char
+  '((<-denotational
      ((=big5             . #xBD5E)     ; &B-BD5E;
-      )
-     ((=gb2312           . #x7022)     ; &G0-7022; [80-02]
-      (=ucs@unicode      . #x7A37)     ; &G0-7022;
       ))
+    (ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 10)
+    (total-strokes      . 15)
+    (shinjigen-2       . 5654)
+    (=jis-x0208                . #x634D)       ; &GT-32523; [67-45]
+    (=ks-x1001         . #x7243)       ; &I-K0-7243; [82-35]
+    (=gt               . 32523)        ; &I-GT-32523;
+    (=gt-pj-1          . #x634D)       ; &I-GT-32523; [67-45]
+    (=ucs@jis          . #x7A37)       ; &GT-32523;
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲
@@ -3572,38 +3633,29 @@
     (ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 10)
     (total-strokes      . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs              . #x7A57)     ; 穗
-      (=jis-x0208        . #x634F)     ; &I-J90-634F; [67-47]
-      ))
     (=ucs              . #x7A42)       ; 穂
     (=jis-x0208                . #x4A66)       ; &I-J90-4A66; [42-70]
     (=cns11643-3       . #x4D57)       ; &I-C3-4D57; [45-55]
     (=gt               . 32528)        ; &I-GT-32528;
     (=gt-pj-1          . #x4A66)       ; &I-GT-32528; [42-70]
-    ))
-(define-char
-  '((ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 10)
-    (total-strokes      . 15)
-    (=ucs              . #x4173)       ; 䅳
-    (=cns11643-4       . #x4B68)       ; &I-C4-4B68; [43-72]
+    (<-simplified@JP/Jouyou
+     ((=ucs              . #x7A57)     ; 穗
+      (=jis-x0208        . #x634F)     ; &I-J90-634F; [67-47]
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 10)
     (total-strokes      . 15)
     (=ucs              . #x7A43)       ; 穃
-    ))
-(define-char
-  '((=>ucs             . #x7A43)       ; 穃
-    (ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 10)
-    (total-strokes      . 15)
-    (=jis-x0208                . #x634E)       ; &GT-32549; [67-46]
-    (=gt               . 32549)        ; &I-GT-32549;
-    (=gt-pj-1          . #x634E)       ; &I-GT-32549; [67-46]
-    (=ucs@jis          . #x7A43)       ; &GT-32549;
+    (->subsumptive
+     ((=jis-x0208        . #x634E)     ; &GT-32549; [67-46]
+      (=gt               . 32549)      ; &I-GT-32549;
+      (=gt-pj-1                  . #x634E)     ; &I-GT-32549; [67-46]
+      (=ucs@jis                  . #x7A43)     ; &GT-32549;
+      )
+     ((=ucs@unicode      . #x7A43)     ; &UU+7A43;
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲
@@ -4077,16 +4129,16 @@
     (total-strokes      . 16)
     (->subsumptive
      ((morohashi-daikanwa      25280 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208        . #x6353)   ; &GT-32701; [67-51]
-       (=ks-x1001          . #x6831)   ; &I-K0-6831; [72-17]
-       (=daikanwa          . 25344)    ; &I-M-25344;
-       ))
       (=jis-x0208        . #x323A)     ; &GT-32561; [18-26]
       (=cns11643-3       . #x522C)     ; &I-C3-522C; [50-12]
       (=gt               . 32561)      ; &I-GT-32561;
       (=gt-pj-1                  . #x323A)     ; &I-GT-32561; [18-26]
       (=ucs@unicode      . #x7A4F)     ; &GT-32561;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208        . #x6353)   ; &GT-32701; [67-51]
+       (=ks-x1001          . #x6831)   ; &I-K0-6831; [72-17]
+       (=daikanwa          . 25344)    ; &I-M-25344;
+       ))
       )
      ((=cns11643-7       . #x3066)     ; &C7-3066; [16-70]
       ))
@@ -5293,6 +5345,55 @@
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 16)
     (total-strokes      . 21)
+    (=ucs              . #x25900)      ; 𥤀
+    (->subsumptive
+     ((=daikanwa         . 25376)      ; &M-25376;
+      (=ucs@iso                  . #x25900)    ; &M-25376;
+      )
+     ((=cns11643-7       . #x5428)     ; &C7-5428; [52-08]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 16)
+    (total-strokes      . 21)
+    (=ucs              . #x25901)      ; 𥤁
+    (->subsumptive
+     ((=daikanwa         . 25377)      ; &M-25377;
+      )
+     ((=cns11643-7       . #x5427)     ; &C7-5427; [52-07]
+      (=ucs@iso                  . #x25901)    ; &C7-5427;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 16)
+    (total-strokes      . 21)
+    (=ucs              . #x418A)       ; 䆊
+    (->subsumptive
+     ((=daikanwa         . 25378)      ; &M-25378;
+      (=ucs@unicode      . #x418A)     ; &M-25378;
+      )
+     ((=cns11643-4       . #x6665)     ; &C4-6665; [70-69]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 16)
+    (total-strokes      . 21)
+    (=ucs              . #x25902)      ; 𥤂
+    (->subsumptive
+     ((=daikanwa         . 25379)      ; &M-25379;
+      )
+     ((=ucs@iso                  . #x25902)    ; &U-00025902;
+      )
+     ((=cns11643-5       . #x7058)     ; &C5-7058; [80-56]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)        ; ⽲
+    (ideographic-strokes . 16)
+    (total-strokes      . 21)
     (=ucs              . #x25903)      ; 𥤃
     (->subsumptive
      ((=daikanwa         . 25380)      ; &M-25380;
@@ -5317,6 +5418,8 @@
     (ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 16)
     (total-strokes      . 21)
+    (=cns11643-3       . #x5E47)       ; &M-25381; [62-39]
+    (=daikanwa         . 25381)        ; &I-M-25381;
     (<-ancient
      ((=jis-x0208        . #x3D29)     ; &GT-32182; [29-09]
       (=gb2312           . #x476F)     ; &I-G0-476F; [39-79]
@@ -5325,50 +5428,42 @@
       ))
     (<-ancient*sources
      zihui daikanwa)
-    (=cns11643-3       . #x5E47)       ; &M-25381; [62-39]
-    (=daikanwa         . 25381)        ; &I-M-25381;
-    ))
-(define-char
-  '((ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 16)
-    (total-strokes      . 21)
-    (=ucs              . #x418A)       ; 䆊
-    (=cns11643-4       . #x6665)       ; &I-C4-6665; [70-69]
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 16)
     (total-strokes      . 21)
     (=ucs              . #x418D)       ; 䆍
-    (=cns11643-4       . #x6664)       ; &I-C4-6664; [70-68]
-    ))
-(define-char
-  '((ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 16)
-    (total-strokes      . 21)
-    (=ucs              . #x25900)      ; 𥤀
-    (=cns11643-7       . #x5428)       ; &I-C7-5428; [52-08]
-    ))
-(define-char
-  '((ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 16)
-    (total-strokes      . 21)
-    (=ucs              . #x25901)      ; 𥤁
-    (=cns11643-7       . #x5427)       ; &I-C7-5427; [52-07]
-    ))
-(define-char
-  '((ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 16)
-    (total-strokes      . 21)
-    (=ucs              . #x25902)      ; 𥤂
-    (=cns11643-5       . #x7058)       ; &I-C5-7058; [80-56]
+    (->subsumptive
+     ((=daikanwa         . 25382)      ; &M-25382;
+      )
+     ((=ucs@unicode      . #x418D)     ; &UU+418D;
+      )
+     ((=cns11643-4       . #x6664)     ; &C4-6664; [70-68]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 115)        ; ⽲
-    (ideographic-strokes . 16)
+  '((ideographic-radical@ucs . 213)    ; ⿔
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 115)    ; ⽲
+    (ideographic-strokes@cns . 16)
     (total-strokes      . 21)
     (=ucs              . #x2A6BC)      ; 𪚼
-    (=cns11643-7       . #x542A)       ; &I-C7-542A; [52-10]
+    (->subsumptive
+     ((ideographic-radical . 213)      ; ⿔
+      (ideographic-strokes . 5)
+      (=daikanwa         . 48870)      ; &M-48870;
+      )
+     ((ideographic-radical . 115)      ; ⽲
+      (ideographic-strokes . 16)
+      (=cns11643-7       . #x542A)     ; &C7-542A; [52-10]
+      )
+     ((ideographic-radical . 213)      ; ⿔
+      (ideographic-strokes . 5)
+      (=ucs@iso                  . #x2A6BC)    ; &U-0002A6BC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲