- 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-R114-Track.el b/lisp/utf-2000/Ideograph-R114-Track.el
index d0bec29..fba78b1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R114-Track.el
+++ b/lisp/utf-2000/Ideograph-R114-Track.el
@@ -37,14 +37,14 @@
     (total-strokes      . 9)
     (=ucs              . #x79BA)       ; 禺
     (->subsumptive
-     ((=jis-x0208-1978   . #x633C)     ; &M-24886; [67-28]
-      (=jis-x0208-1983   . #x633C)     ; &I-J83-633C; [67-28]
+     ((=jis-x0208@1978   . #x633C)     ; &M-24886; [67-28]
+      (=jis-x0208@1983   . #x633C)     ; &I-J83-633C; [67-28]
       (=cns11643-1       . #x526E)     ; &I-C1-526E; [50-78]
       (=big5             . #xACEB)     ; &I-B-ACEB;
       (=daikanwa         . 24886)      ; &I-M-24886;
       )
      ((=gb2312           . #x582E)     ; &GT-32088; [56-14]
-      (=jis-x0208-1990   . #x633C)     ; &I-J90-633C; [67-28]
+      (=jis-x0208@1990   . #x633C)     ; &I-J90-633C; [67-28]
       (=gt               . 32088)      ; &I-GT-32088;
       (=gt-k             . 05272)      ; &I-GT-K05272;
       (=gt-pj-1                  . #x633C)     ; &I-GT-32088; [67-28]
@@ -55,54 +55,50 @@
   '((ideographic-radical . 114)        ; ⽱
     (ideographic-strokes . 4)
     (total-strokes      . 9)
-    (hanyu-dazidian    1 143 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
-      )
-     ((ideographic-structure
+    (=ucs              . #x2573C)      ; 𥜼
+    (->subsumptive
+     ((hanyu-dazidian    1 143 9)
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (=ucs               . #x2FF1)   ; ⿱
        )
-       ((name*             . "ideographic component person as roof")
-       (=big5-cdp          . #x8B5D)   ; &GT-00458;
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+         (=ucs               . #x2FF1) ; ⿱
+         )
+        ((name*              . "ideographic component person as roof")
+         (=big5-cdp          . #x8B5D) ; &GT-00458;
+         )
+        ((=ucs               . #x4E37) ; 丷
+         ))
        )
-       ((=ucs              . #x4E37)   ; 丷
+       ((=ucs              . #x79B8)   ; 禸
        ))
-      )
-     ((=ucs              . #x79B8)     ; 禸
-      ))
-    (=ucs              . #x2573C)      ; 𥜼
-    (=daikanwa         . 24887)        ; &I-M-24887;
-    (=hanziku-1                . #xC15F)       ; &I-HZK01-C15F;
-    ))
-(define-char
-  '((=>ucs             . #x2573C)      ; 𥜼
-    (morohashi-daikanwa        24887 0 2)
-    (ideographic-radical . 114)        ; ⽱
-    (ideographic-strokes . 4)
-    (total-strokes      . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
+      (=daikanwa         . 24887)      ; &M-24887;
+      (=hanziku-1        . #xC15F)     ; &I-HZK01-C15F;
+      (=ucs@iso                  . #x2573C)    ; &M-24887;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (=ucs               . #x2FF1)   ; ⿱
        )
-       ((name*             . "ideographic component person as roof")
-       (=big5-cdp          . #x8B5D)   ; &GT-00458;
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+         (=ucs               . #x2FF1) ; ⿱
+         )
+        ((name*              . "ideographic component person as roof")
+         (=big5-cdp          . #x8B5D) ; &GT-00458;
+         )
+        ((=ucs               . #x4E37) ; 丷
+         ))
        )
-       ((=ucs              . #x4E37)   ; 丷
+       ((=cns11643-2       . #x2167)   ; &C2-2167; [01-71]
        ))
-      )
-     ((=cns11643-2       . #x2167)     ; &C2-2167; [01-71]
+      (=cns11643-6       . #x334D)     ; &C6-334D; [19-45]
       ))
-    (=cns11643-6       . #x334D)       ; &C6-334D; [19-45]
     ))
 (define-char
-  '((=>daikanwa                . 24888)        ; &M-24888;
-    (ideographic-radical . 114)        ; ⽱
+  '((ideographic-radical . 114)        ; ⽱
     (ideographic-strokes . 6)
     (total-strokes      . 11)
     (=ucs              . #x79BB)       ; 离
@@ -310,18 +306,15 @@
   '((ideographic-radical . 114)        ; ⽱
     (ideographic-strokes . 11)
     (total-strokes      . 16)
-    (hanyu-dazidian    5 3043 3)
     (=ucs              . #x25745)      ; 𥝅
-    (=daikanwa         . 24900)        ; &I-M-24900;
-    (=hanziku-8                . #xCCE9)       ; &I-HZK08-CCE9;
-    ))
-(define-char
-  '((=>ucs             . #x25745)      ; 𥝅
-    (morohashi-daikanwa        24900 0 2)
-    (ideographic-radical . 114)        ; ⽱
-    (ideographic-strokes . 11)
-    (total-strokes      . 16)
-    (=cns11643-7       . #x305F)       ; &C7-305F; [16-63]
+    (->subsumptive
+     ((hanyu-dazidian    5 3043 3)
+      (=daikanwa         . 24900)      ; &M-24900;
+      (=hanziku-8        . #xCCE9)     ; &I-HZK08-CCE9;
+      (=ucs@iso                  . #x25745)    ; &M-24900;
+      )
+     ((=cns11643-7       . #x305F)     ; &C7-305F; [16-63]
+      ))
     ))
 (define-char
   '((ideographic-radical . 114)        ; ⽱
@@ -334,18 +327,15 @@
   '((ideographic-radical . 114)        ; ⽱
     (ideographic-strokes . 13)
     (total-strokes      . 18)
-    (hanyu-dazidian    5 3043 10)
     (=ucs              . #x25748)      ; 𥝈
-    (=daikanwa         . 24903)        ; &I-M-24903;
-    (=hanziku-8                . #xCCF0)       ; &I-HZK08-CCF0;
-    ))
-(define-char
-  '((=>ucs             . #x25748)      ; 𥝈
-    (morohashi-daikanwa        24903 0 2)
-    (ideographic-radical . 114)        ; ⽱
-    (ideographic-strokes . 13)
-    (total-strokes      . 18)
-    (=cns11643-7       . #x412D)       ; &C7-412D; [33-13]
+    (->subsumptive
+     ((hanyu-dazidian    5 3043 10)
+      (=daikanwa         . 24903)      ; &M-24903;
+      (=hanziku-8        . #xCCF0)     ; &I-HZK08-CCF0;
+      (=ucs@iso                  . #x25748)    ; &M-24903;
+      )
+     ((=cns11643-7       . #x412D)     ; &C7-412D; [33-13]
+      ))
     ))
 (define-char
   '((ideographic-radical . 114)        ; ⽱
@@ -361,18 +351,15 @@
   '((ideographic-radical . 114)        ; ⽱
     (ideographic-strokes . 20)
     (total-strokes      . 25)
-    (hanyu-dazidian    5 3044 14)
     (=ucs              . #x2574B)      ; 𥝋
-    (=daikanwa         . 24905)        ; &I-M-24905;
-    (=hanziku-8                . #xCD55)       ; &I-HZK08-CD55;
-    ))
-(define-char
-  '((=>ucs             . #x2574B)      ; 𥝋
-    (morohashi-daikanwa        24905 0 2)
-    (ideographic-radical . 114)        ; ⽱
-    (ideographic-strokes . 20)
-    (total-strokes      . 25)
-    (=cns11643-7       . #x6128)       ; &C7-6128; [65-08]
+    (->subsumptive
+     ((hanyu-dazidian    5 3044 14)
+      (=daikanwa         . 24905)      ; &M-24905;
+      (=hanziku-8        . #xCD55)     ; &I-HZK08-CD55;
+      (=ucs@iso                  . #x2574B)    ; &M-24905;
+      )
+     ((=cns11643-7       . #x6128)     ; &C7-6128; [65-08]
+      ))
     ))
 (define-char
   '((ideographic-radical . 114)        ; ⽱