- Use `=jis-x0208@{1978|1983|1990}' instead of

  `=jis-x0208-{1978|1983|1990}'.
- Use `->subsumptive' or `{<-|->}denotational' for some character
  definitions.

diff --git a/lisp/utf-2000/Ideograph-R088-Father.el b/lisp/utf-2000/Ideograph-R088-Father.el
index 36d703c..d1782f2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R088-Father.el
+++ b/lisp/utf-2000/Ideograph-R088-Father.el
@@ -1,30 +1,27 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
-  '((=>ucs             . #x7236)       ; 父
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 0)
-    (total-strokes      . 4)
-    (=jis-x0208-1978   . #x4963)       ; &GT-25336; [41-67]
-    (=jis-x0208-1983   . #x4963)       ; &I-J83-4963; [41-67]
-    (=ks-x1001         . #x5D2B)       ; &I-K0-5D2B; [61-11]
-    (=big5             . #xA4F7)       ; &I-B-A4F7;
-    (=gt               . 25336)        ; &I-GT-25336;
-    (=gt-k             . 00483)        ; &I-GT-K00483;
-    (=gt-pj-4          . #x6271)       ; &I-GT-25336; [66-81]
-    (=daikanwa         . 19721)        ; &I-M-19721;
-    (=jef-china3       . #x58B2)       ; &I-JC3-58B2;
-    ))
-(define-char
-  '((morohashi-daikanwa        19721 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 0)
     (total-strokes      . 4)
     (=ucs              . #x7236)       ; 父
-    (=gb2312           . #x3838)       ; &I-G0-3838; [24-24]
-    (=jis-x0208-1990   . #x4963)       ; &I-J90-4963; [41-67]
-    (=cns11643-1       . #x4558)       ; &I-C1-4558; [37-56]
-    (=gt               . 25337)        ; &I-GT-25337;
-    (=gt-pj-1          . #x4963)       ; &I-GT-25337; [41-67]
+    (=big5             . #xA4F7)       ; &I-B-A4F7;
+    (->subsumptive
+     ((=jis-x0208@1978   . #x4963)     ; &GT-25336; [41-67]
+      (=jis-x0208@1983   . #x4963)     ; &I-J83-4963; [41-67]
+      (=ks-x1001         . #x5D2B)     ; &I-K0-5D2B; [61-11]
+      (=gt               . 25336)      ; &I-GT-25336;
+      (=gt-k             . 00483)      ; &I-GT-K00483;
+      (=gt-pj-4                  . #x6271)     ; &I-GT-25336; [66-81]
+      (=daikanwa         . 19721)      ; &I-M-19721;
+      (=jef-china3       . #x58B2)     ; &I-JC3-58B2;
+      )
+     ((=gb2312           . #x3838)     ; &GT-25337; [24-24]
+      (=jis-x0208@1990   . #x4963)     ; &I-J90-4963; [41-67]
+      (=cns11643-1       . #x4558)     ; &I-C1-4558; [37-56]
+      (=gt               . 25337)      ; &I-GT-25337;
+      (=gt-pj-1                  . #x4963)     ; &I-GT-25337; [41-67]
+      (=ucs@unicode      . #x7236)     ; &GT-25337;
+      ))
     ))
 (define-char
   '((ideographic-radical . 88) ; ⽗
@@ -34,252 +31,205 @@
     (=gb2312           . #x522F)       ; &I-G0-522F; [50-15]
     ))
 (define-char
-  '((=>ucs             . #x24550)      ; 𤕐
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 4)
-    (total-strokes      . 8)
-    (=daikanwa         . 19722)        ; &M-19722;
-    ))
-(define-char
-  '((morohashi-daikanwa        19722 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 4)
     (total-strokes      . 8)
     (=ucs              . #x24550)      ; 𤕐
-    (=cns11643-6       . #x2C64)       ; &I-C6-2C64; [12-68]
+    (->subsumptive
+     ((=daikanwa         . 19722)      ; &M-19722;
+      )
+     ((=cns11643-6       . #x2C64)     ; &C6-2C64; [12-68]
+      (=ucs@iso                  . #x24550)    ; &C6-2C64;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x7238)       ; 爸
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 4)
-    (total-strokes      . 8)
-    (=jis-x0212                . #x4A4B)       ; &M-19723; [42-43]
-    (=jis-x0213-2-2000 . #x702C)       ; &I-JX2-702C; [80-12]
-    (=big5             . #xAAA8)       ; &I-B-AAA8;
-    (=daikanwa         . 19723)        ; &I-M-19723;
-    (=ucs@jis          . #x7238)       ; &M-19723;
-    ))
-(define-char
-  '((morohashi-daikanwa        19723 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 4)
     (total-strokes      . 8)
     (=ucs              . #x7238)       ; 爸
-    (=gb2312           . #x3056)       ; &I-G0-3056; [16-54]
-    (=cns11643-1       . #x4E69)       ; &I-C1-4E69; [46-73]
-    (=jef-china3       . #x58B3)       ; &I-JC3-58B3;
-    ))
-(define-char
-  '((=>ucs             . #x24551)      ; 𤕑
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 4)
-    (total-strokes      . 8)
-    (=daikanwa         . 19724)        ; &M-19724;
+    (=big5             . #xAAA8)       ; &I-B-AAA8;
+    (->subsumptive
+     ((=jis-x0212        . #x4A4B)     ; &M-19723; [42-43]
+      (=jis-x0213-2-2000  . #x702C)    ; &I-JX2-702C; [80-12]
+      (=daikanwa         . 19723)      ; &I-M-19723;
+      (=ucs@jis                  . #x7238)     ; &M-19723;
+      )
+     ((=gb2312           . #x3056)     ; &C1-4E69; [16-54]
+      (=cns11643-1       . #x4E69)     ; &I-C1-4E69; [46-73]
+      (=jef-china3       . #x58B3)     ; &I-JC3-58B3;
+      (=ucs@unicode      . #x7238)     ; &C1-4E69;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        19724 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 4)
     (total-strokes      . 8)
     (=ucs              . #x24551)      ; 𤕑
-    (=cns11643-6       . #x2C65)       ; &I-C6-2C65; [12-69]
-    ))
-(define-char
-  '((=>ucs             . #x3E16)       ; 㸖
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 5)
-    (total-strokes      . 9)
-    (=daikanwa         . 19725)        ; &M-19725;
+    (->subsumptive
+     ((=daikanwa         . 19724)      ; &M-19724;
+      )
+     ((=cns11643-6       . #x2C65)     ; &C6-2C65; [12-69]
+      (=ucs@iso                  . #x24551)    ; &C6-2C65;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        19725 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 5)
     (total-strokes      . 9)
     (=ucs              . #x3E16)       ; 㸖
-    (=cns11643-3       . #x2D6A)       ; &I-C3-2D6A; [13-74]
+    (->subsumptive
+     ((=daikanwa         . 19725)      ; &M-19725;
+      )
+     ((=cns11643-3       . #x2D6A)     ; &C3-2D6A; [13-74]
+      (=ucs@unicode      . #x3E16)     ; &C3-2D6A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 5)
     (total-strokes      . 9)
-    (=daikanwa         . 19726)        ; &M-19726;
+    (=ucs              . #x24552)      ; 𤕒
+    (->subsumptive
+     ((=daikanwa         . 19726)      ; &M-19726;
+      )
+     ((=ucs@iso                  . #x24552)    ; &UU+24552;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x7239)       ; 爹
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=jis-x0212                . #x4A4C)       ; &M-19727; [42-44]
-    (=jis-x0213-2-2000 . #x702D)       ; &I-JX2-702D; [80-13]
-    (=big5             . #xAF52)       ; &I-B-AF52;
-    (=daikanwa         . 19727)        ; &I-M-19727;
-    (=ucs@jis          . #x7239)       ; &M-19727;
-    ))
-(define-char
-  '((morohashi-daikanwa        19727 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 6)
     (total-strokes      . 10)
     (=ucs              . #x7239)       ; 爹
-    (=gb2312           . #x3579)       ; &I-G0-3579; [21-89]
-    (=cns11643-1       . #x5655)       ; &I-C1-5655; [54-53]
-    (=jef-china3       . #x58B4)       ; &I-JC3-58B4;
-    ))
-(define-char
-  '((=>ucs             . #x3E17)       ; 㸗
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=daikanwa         . 19728)        ; &M-19728;
+    (=big5             . #xAF52)       ; &I-B-AF52;
+    (->subsumptive
+     ((=jis-x0212        . #x4A4C)     ; &M-19727; [42-44]
+      (=jis-x0213-2-2000  . #x702D)    ; &I-JX2-702D; [80-13]
+      (=daikanwa         . 19727)      ; &I-M-19727;
+      (=ucs@jis                  . #x7239)     ; &M-19727;
+      )
+     ((=gb2312           . #x3579)     ; &C1-5655; [21-89]
+      (=cns11643-1       . #x5655)     ; &I-C1-5655; [54-53]
+      (=jef-china3       . #x58B4)     ; &I-JC3-58B4;
+      (=ucs@unicode      . #x7239)     ; &C1-5655;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        19728 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 6)
     (total-strokes      . 10)
     (=ucs              . #x3E17)       ; 㸗
-    (=cns11643-4       . #x2D76)       ; &I-C4-2D76; [13-86]
+    (->subsumptive
+     ((=daikanwa         . 19728)      ; &M-19728;
+      )
+     ((=cns11643-4       . #x2D76)     ; &C4-2D76; [13-86]
+      (=ucs@unicode      . #x3E17)     ; &C4-2D76;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x24553)      ; 𤕓
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (=daikanwa         . 19729)        ; &M-19729;
-    ))
-(define-char
-  '((morohashi-daikanwa        19729 0 1)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (=ucs              . #x24553)      ; 𤕓
-    (=cns11643-6       . #x4159)       ; &I-C6-4159; [33-57]
+    (->subsumptive
+     ((=daikanwa         . 19729)      ; &M-19729;
+      )
+     ((=cns11643-6       . #x4159)     ; &C6-4159; [33-57]
+      (=ucs@iso                  . #x24553)    ; &C6-4159;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x24555)      ; 𤕕
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (=daikanwa         . 19730)        ; &M-19730;
-    ))
-(define-char
-  '((morohashi-daikanwa        19730 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (=ucs              . #x24555)      ; 𤕕
-    (=cns11643-6       . #x415A)       ; &I-C6-415A; [33-58]
-    ))
-(define-char
-  '((=>ucs             . #x3E18)       ; 㸘
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (=daikanwa         . 19731)        ; &M-19731;
+    (->subsumptive
+     ((=daikanwa         . 19730)      ; &M-19730;
+      )
+     ((=cns11643-6       . #x415A)     ; &C6-415A; [33-58]
+      (=ucs@iso                  . #x24555)    ; &C6-415A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        19731 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (=ucs              . #x3E18)       ; 㸘
-    (=cns11643-3       . #x3736)       ; &I-C3-3736; [23-22]
+    (->subsumptive
+     ((=daikanwa         . 19731)      ; &M-19731;
+      )
+     ((=cns11643-3       . #x3736)     ; &C3-3736; [23-22]
+      (=ucs@unicode      . #x3E18)     ; &C3-3736;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x24558)      ; 𤕘
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
-    (=daikanwa         . 19732)        ; &M-19732;
-    ))
-(define-char
-  '((morohashi-daikanwa        19732 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 9)
     (total-strokes      . 13)
     (=ucs              . #x24558)      ; 𤕘
+    (->subsumptive
+     ((=daikanwa         . 19732)      ; &M-19732;
+      )
+     ((=ucs@iso                  . #x24558)    ; &UU+24558;
+      )
+     ((=cns11643-6       . #x546A)     ; &C6-546A; [52-74]
+      ))
     ))
 (define-char
-  '((=>ucs             . #x24558)      ; 𤕘
-    (morohashi-daikanwa        19732 0 1)
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
-    (=cns11643-6       . #x546A)       ; &C6-546A; [52-74]
-    ))
-(define-char
-  '((=>ucs             . #x3E19)       ; 㸙
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
-    (=daikanwa         . 19733)        ; &M-19733;
-    ))
-(define-char
-  '((morohashi-daikanwa        19733 0 3)
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 8)
-    (total-strokes      . 12)
+  '((ideographic-radical . 88) ; ⽗
     (=ucs              . #x3E19)       ; 㸙
-    (=cns11643-4       . #x386B)       ; &I-C4-386B; [24-75]
-    ))
-(define-char
-  '((=>ucs             . #x723A)       ; 爺
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
-    (shinjigen-2       . 4711)
-    (=jis-x0208                . #x4C6C)       ; &GT-25352; [44-76]
-    (=ks-x1001         . #x652C)       ; &I-K0-652C; [69-12]
-    (=big5             . #xB7DD)       ; &I-B-B7DD;
-    (=gt               . 25352)        ; &I-GT-25352;
-    (=gt-pj-1          . #x4C6C)       ; &I-GT-25352; [44-76]
-    (=daikanwa         . 19734)        ; &I-M-19734;
-    (=ucs@jis          . #x723A)       ; &GT-25352;
+    (->subsumptive
+     ((ideographic-strokes . 9)
+      (total-strokes      . 13)
+      (=daikanwa         . 19733)      ; &M-19733;
+      )
+     ((ideographic-strokes . 8)
+      (total-strokes      . 12)
+      (=cns11643-4       . #x386B)     ; &C4-386B; [24-75]
+      (=ucs@unicode      . #x3E19)     ; &C4-386B;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x723A)       ; 爺
-    (morohashi-daikanwa        19734 0 0)
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
-    (=cns11643-1       . #x6525)       ; &C1-6525; [69-05]
-    ))
-(define-char
-  '((morohashi-daikanwa        19734 0 1)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 9)
     (total-strokes      . 13)
     (=ucs              . #x723A)       ; 爺
-    (=gb12345          . #x522F)       ; 爺 [50-15]
-    ))
-(define-char
-  '((=>ucs             . #x2455A)      ; 𤕚
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 10)
-    (total-strokes      . 14)
-    (=daikanwa         . 19735)        ; &M-19735;
+    (=big5             . #xB7DD)       ; &I-B-B7DD;
+    (->subsumptive
+     ((shinjigen-2       . 4711)
+      (=jis-x0208        . #x4C6C)     ; &GT-25352; [44-76]
+      (=ks-x1001         . #x652C)     ; &I-K0-652C; [69-12]
+      (=gt               . 25352)      ; &I-GT-25352;
+      (=gt-pj-1                  . #x4C6C)     ; &I-GT-25352; [44-76]
+      (=daikanwa         . 19734)      ; &I-M-19734;
+      (=ucs@jis                  . #x723A)     ; &GT-25352;
+      )
+     ((=cns11643-1       . #x6525)     ; &C1-6525; [69-05]
+      )
+     ((=gb12345                  . #x522F)     ; &UU+723A; [50-15]
+      (=ucs@unicode      . #x723A)     ; &UU+723A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        19735 0 1)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 10)
     (total-strokes      . 14)
     (=ucs              . #x2455A)      ; 𤕚
-    (=cns11643-5       . #x4724)       ; &I-C5-4724; [39-04]
+    (->subsumptive
+     ((=daikanwa         . 19735)      ; &M-19735;
+      )
+     ((=cns11643-5       . #x4724)     ; &C5-4724; [39-04]
+      (=ucs@iso                  . #x2455A)    ; &C5-4724;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x2455B)      ; 𤕛
-    (ideographic-radical . 88) ; ⽗
-    (ideographic-strokes . 12)
-    (total-strokes      . 16)
-    (=daikanwa         . 19736)        ; &M-19736;
-    ))
-(define-char
-  '((morohashi-daikanwa        19736 0 0)
-    (ideographic-radical . 88) ; ⽗
+  '((ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 12)
     (total-strokes      . 16)
     (=ucs              . #x2455B)      ; 𤕛
-    (=cns11643-5       . #x5540)       ; &I-C5-5540; [53-32]
+    (->subsumptive
+     ((=daikanwa         . 19736)      ; &M-19736;
+      )
+     ((=cns11643-5       . #x5540)     ; &C5-5540; [53-32]
+      (=ucs@iso                  . #x2455B)    ; &C5-5540;
+      ))
     ))