(U-00025608): Use `->subsumptive'.

(U-0002560A): Likewise.
(U-0002560B): Likewise.
(U+40FE): Likewise.
(U+4104): Likewise.
(U+4105): Likewise.
(U+7966): Likewise.

diff --git a/lisp/utf-2000/Ideograph-R113-Spirit.el b/lisp/utf-2000/Ideograph-R113-Spirit.el
index a2ab55b..0c2ad2a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R113-Spirit.el
+++ b/lisp/utf-2000/Ideograph-R113-Spirit.el
@@ -152,47 +152,46 @@
       ))
     ))
 (define-char
-  '((=>ucs             . #x25608)      ; 𥘈
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 2)
-    (total-strokes      . 7)
-    (=daikanwa         . 24630)        ; &M-24630;
-    ))
-(define-char
-  '((morohashi-daikanwa        24630 0 0)
-    (ideographic-radical . 113)        ; ⽰
+  '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 2)
     (total-strokes      . 7)
     (=ucs              . #x25608)      ; 𥘈
-    (=cns11643-6       . #x286E)       ; &I-C6-286E;
+    (->subsumptive
+     ((=daikanwa         . 24630)      ; &M-24630;
+      )
+     ((=cns11643-6       . #x286E)     ; &C6-286E;
+      (=ucs@iso                  . #x25608)    ; &C6-286E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 2)
     (total-strokes      . 7)
     (=ucs              . #x2560A)      ; 𥘊
-    ))
-(define-char
-  '((=>ucs             . #x2560A)      ; 𥘊
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 2)
-    (total-strokes      . 7)
-    (hanyu-dazidian    4 2385 4)
-    (=hanziku-6                . #xED45)       ; &HZK06-ED45;
+    (->subsumptive
+     ((hanyu-dazidian    4 2385 4)
+      (=hanziku-6        . #xED45)     ; &HZK06-ED45;
+      )
+     ((=ucs@iso                  . #x2560A)    ; &UU+2560A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 2)
     (total-strokes      . 7)
     (=ucs              . #x2560B)      ; 𥘋
+    (->subsumptive
+     ((hanyu-dazidian    4 2385 5)
+      (=hanziku-6        . #xED46)     ; &HZK06-ED46;
+      )
+     ((=ucs@iso                  . #x2560B)    ; &UU+2560B;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x2560B)      ; 𥘋
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 2)
-    (total-strokes      . 7)
-    (hanyu-dazidian    4 2385 5)
-    (=hanziku-6                . #xED46)       ; &HZK06-ED46;
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 3)
+    (total-strokes      . 8)
+    (=ucs              . #x793E)       ; 社
     ))
 (define-char
   '((=>ucs*            . #x793E)       ; 社
@@ -213,12 +212,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 3)
     (total-strokes      . 8)
-    (=ucs              . #x793E)       ; 社
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 3)
-    (total-strokes      . 8)
     (<-denotational
      ((=ucs              . #x793E)     ; 社
       ))
@@ -570,6 +563,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 4)
+    (total-strokes      . 9)
+    (=ucs              . #x7948)       ; 祈
+    ))
+(define-char
   '((=>ucs*            . #x7948)       ; 祈
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 4)
@@ -588,12 +587,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 4)
     (total-strokes      . 9)
-    (=ucs              . #x7948)       ; 祈
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 4)
-    (total-strokes      . 9)
     (<-denotational
      ((=ucs              . #x7948)     ; 祈
       ))
@@ -615,6 +608,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 4)
+    (total-strokes      . 9)
+    (=ucs              . #x7949)       ; 祉
+    ))
+(define-char
   '((=>ucs*            . #x7949)       ; 祉
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 4)
@@ -633,12 +632,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 4)
     (total-strokes      . 9)
-    (=ucs              . #x7949)       ; 祉
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 4)
-    (total-strokes      . 9)
     (<-denotational
      ((=ucs              . #x7949)     ; 祉
       ))
@@ -660,19 +653,17 @@
       ))
     ))
 (define-char
-  '((=>ucs             . #x40FE)       ; 䃾
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 4)
-    (total-strokes      . 9)
-    (=daikanwa         . 24642)        ; &M-24642;
-    ))
-(define-char
-  '((morohashi-daikanwa        24642 0 5)
-    (ideographic-radical . 113)        ; ⽰
+  '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 4)
     (total-strokes      . 9)
     (=ucs              . #x40FE)       ; 䃾
-    (=cns11643-4       . #x2A67)       ; &I-C4-2A67;
+    (->subsumptive
+     ((=daikanwa         . 24642)      ; &M-24642;
+      )
+     ((=ucs@unicode      . #x40FE)     ; &UU+40FE;
+      )
+     ((=cns11643-4       . #x2A67)     ; &C4-2A67;
+      ))
     ))
 (define-char
   '((ideographic-radical . 113)        ; ⽰
@@ -930,6 +921,12 @@
     (=jef-china3       . #x8CCB)       ; &JC3-8CCB;
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 5)
+    (total-strokes      . 10)
+    (=ucs              . #x7950)       ; 祐
+    ))
+(define-char
   '((=>ucs*            . #x7950)       ; 祐
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 5)
@@ -948,12 +945,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (=ucs              . #x7950)       ; 祐
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 5)
-    (total-strokes      . 10)
     (<-denotational
      ((=ucs              . #x7950)     ; 祐
       ))
@@ -1053,6 +1044,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 5)
+    (total-strokes      . 10)
+    (=ucs              . #x7956)       ; 祖
+    ))
+(define-char
   '((=>ucs*            . #x7956)       ; 祖
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 5)
@@ -1071,12 +1068,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (=ucs              . #x7956)       ; 祖
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 5)
-    (total-strokes      . 10)
     (<-denotational
      ((=ucs              . #x7956)     ; 祖
       ))
@@ -1219,6 +1210,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 5)
+    (total-strokes      . 10)
+    (=ucs              . #x795D)       ; 祝
+    ))
+(define-char
   '((=>ucs*            . #x795D)       ; 祝
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 5)
@@ -1237,12 +1234,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (=ucs              . #x795D)       ; 祝
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 5)
-    (total-strokes      . 10)
     (<-denotational
      ((=ucs              . #x795D)     ; 祝
       ))
@@ -1265,6 +1256,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 5)
+    (total-strokes      . 10)
+    (=ucs              . #x795E)       ; 神
+    ))
+(define-char
   '((name              . "CJK COMPATIBILITY IDEOGRAPH-FA19")
     (=>ucs*            . #x795E)       ; 神
     (ideographic-radical . 113)        ; ⽰
@@ -1284,12 +1281,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (=ucs              . #x795E)       ; 神
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 5)
-    (total-strokes      . 10)
     (<-denotational
      ((=ucs              . #x795E)     ; 神
       ))
@@ -1762,6 +1753,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 6)
+    (total-strokes      . 11)
+    (=ucs              . #x7965)       ; 祥
+    ))
+(define-char
   '((name              . "CJK COMPATIBILITY IDEOGRAPH-FA1A")
     (=>ucs*            . #x7965)       ; 祥
     (ideographic-radical . 113)        ; ⽰
@@ -1781,12 +1778,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 6)
     (total-strokes      . 11)
-    (=ucs              . #x7965)       ; 祥
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 6)
-    (total-strokes      . 11)
     (<-denotational
      ((=ucs              . #x7965)     ; 祥
       ))
@@ -1810,72 +1801,49 @@
       ))
     ))
 (define-char
-  '((=>ucs             . #x4104)       ; 䄄
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 6)
-    (total-strokes      . 11)
-    (=daikanwa         . 24690)        ; &M-24690;
-    ))
-(define-char
-  '((morohashi-daikanwa        24690 0 5)
-    (ideographic-radical . 113)        ; ⽰
+  '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 6)
     (total-strokes      . 11)
     (=ucs              . #x4104)       ; 䄄
-    (=cns11643-3       . #x3764)       ; &I-C3-3764;
-    ))
-(define-char
-  '((=>ucs             . #x4105)       ; 䄅
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 6)
-    (total-strokes      . 11)
-    (=daikanwa         . 24691)        ; &M-24691;
-    ))
-(define-char
-  '((=>ucs             . #x4105)       ; 䄅
-    (morohashi-daikanwa        24691 0 0)
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 6)
-    (total-strokes      . 11)
-    (=jef-china3       . #x5CD2)       ; &JC3-5CD2;
+    (->subsumptive
+     ((=daikanwa         . 24690)      ; &M-24690;
+      )
+     ((=cns11643-3       . #x3764)     ; &C3-3764;
+      (=ucs@unicode      . #x4104)     ; &C3-3764;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        24691 0 2)
-    (ideographic-radical . 113)        ; ⽰
+  '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 6)
     (total-strokes      . 11)
     (=ucs              . #x4105)       ; 䄅
-    (=jis-x0213-2-2000 . #x7264)       ; &I-JX2-7264;
-    ))
-(define-char
-  '((=>ucs             . #x4105)       ; 䄅
-    (morohashi-daikanwa        24691 0 3)
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 6)
-    (total-strokes      . 11)
-    (=cns11643-4       . #x3363)       ; &C4-3363;
-    ))
-(define-char
-  '((=>ucs             . #x7966)       ; 祦
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 6)
-    (total-strokes      . 11)
-    (=daikanwa         . 24692)        ; &M-24692;
-    ))
-(define-char
-  '((=>ucs             . #x7966)       ; 祦
-    (morohashi-daikanwa        24692 0 3)
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 7)
-    (total-strokes      . 12)
-    (=cns11643-3       . #x3D5E)       ; &C3-3D5E;
+    (->subsumptive
+     ((=daikanwa         . 24691)      ; &M-24691;
+      )
+     ((=jef-china3       . #x5CD2)     ; &JC3-5CD2;
+      )
+     ((=cns11643-4       . #x3363)     ; &C4-3363;
+      )
+     ((=jis-x0213-2-2000  . #x7264)    ; &JX2-7264;
+      (=ucs@unicode      . #x4105)     ; &JX2-7264;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        24692 0 5)
-    (ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 7)
-    (total-strokes      . 12)
+  '((ideographic-radical . 113)        ; ⽰
     (=ucs              . #x7966)       ; 祦
+    (->subsumptive
+     ((ideographic-strokes . 6)
+      (total-strokes      . 11)
+      (=daikanwa         . 24692)      ; &M-24692;
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes      . 12)
+      (=cns11643-3       . #x3D5E)     ; &C3-3D5E;
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes      . 12)
+      (=ucs@unicode      . #x7966)     ; &UU+7966;
+      ))
     ))
 (define-char
   '((ideographic-radical . 113)        ; ⽰
@@ -3052,6 +3020,10 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (=ucs              . #x798D)       ; 禍
+    ))
+(define-char
   '((=>ucs*            . #x798D)       ; 禍
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 9)
@@ -3067,12 +3039,6 @@
     (=ucs@ks           . #x798D)       ; 禍
     ))
 (define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 9)
-    (total-strokes      . 14)
-    (=ucs              . #x798D)       ; 禍
-    ))
-(define-char
   '((<-denotational
      ((=ucs              . #x798D)     ; 禍
       ))
@@ -3104,6 +3070,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 9)
+    (total-strokes      . 14)
+    (=ucs              . #x798E)       ; 禎
+    ))
+(define-char
   '((=>ucs*            . #x798E)       ; 禎
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 9)
@@ -3122,12 +3094,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 9)
     (total-strokes      . 14)
-    (=ucs              . #x798E)       ; 禎
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 9)
-    (total-strokes      . 14)
     (<-denotational
      ((=ucs              . #x798E)     ; 禎
       ))
@@ -3145,6 +3111,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)        ; ⽰
+    (ideographic-strokes . 9)
+    (total-strokes      . 14)
+    (=ucs              . #x798F)       ; 福
+    ))
+(define-char
   '((name              . "CJK COMPATIBILITY IDEOGRAPH-FA1B")
     (=>ucs*            . #x798F)       ; 福
     (ideographic-radical . 113)        ; ⽰
@@ -3164,12 +3136,6 @@
   '((ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 9)
     (total-strokes      . 14)
-    (=ucs              . #x798F)       ; 福
-    ))
-(define-char
-  '((ideographic-radical . 113)        ; ⽰
-    (ideographic-strokes . 9)
-    (total-strokes      . 14)
     (<-denotational
      ((=ucs              . #x798F)     ; 福
       ))