- 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-R172-Short-Tailed-Bird.el b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
index 0f95cab..ad6d458 100644 (file)
--- a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
+++ b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
@@ -558,42 +558,36 @@
     (=cns11643-1       . #x6274)       ; &I-C1-6274; [66-84]
     ))
 (define-char
-  '((=>ucs             . #x96C5)       ; 雅
-    (ideographic-radical . 172)        ; ⾫
-    (ideographic-strokes . 4)
-    (total-strokes      . 12)
-    (=daikanwa         . 41973)        ; &M-41973;
-    ))
-(define-char
-  '((morohashi-daikanwa        41973 0 1)
-    (ideographic-radical . 172)        ; ⾫
-    (ideographic-strokes . 4)
-    (total-strokes      . 12)
+  '((ideographic-radical . 172)        ; ⾫
     (=ucs              . #x96C5)       ; 雅
-    (=gb2312           . #x5145)       ; &I-G0-5145; [49-37]
-    (=cns11643-1       . #x6273)       ; &I-C1-6273; [66-83]
-    ))
-(define-char
-  '((=>ucs             . #x96C5)       ; 雅
-    (morohashi-daikanwa        41973 0 2)
-    (ideographic-radical . 172)        ; ⾫
-    (ideographic-strokes . 5)
-    (total-strokes      . 13)
-    (=jis-x0208-1978   . #x326D)       ; &J83-326D; [18-77]
-    (=jis-x0208-1983   . #x326D)       ; &I-J83-326D; [18-77]
-    ))
-(define-char
-  '((=>ucs             . #x96C5)       ; 雅
-    (morohashi-daikanwa        41973 0 3)
-    (ideographic-radical . 172)        ; ⾫
-    (ideographic-strokes . 5)
-    (total-strokes      . 13)
-    (=ks-x1001         . #x643A)       ; &GT-56402; [68-26]
-    (=jis-x0208-1990   . #x326D)       ; &I-J90-326D; [18-77]
-    (=gt               . 56402)        ; &I-GT-56402;
-    (=gt-k             . 10177)        ; &I-GT-K10177;
-    (=gt-pj-1          . #x326D)       ; &I-GT-56402; [18-77]
-    (=ucs@jis          . #x96C5)       ; &GT-56402;
+    (->subsumptive
+     ((ideographic-strokes . 4)
+      (total-strokes      . 12)
+      (=daikanwa         . 41973)      ; &M-41973;
+      )
+     ((ideographic-strokes . 4)
+      (total-strokes      . 12)
+      (=gb2312           . #x5145)     ; &G0-5145; [49-37]
+      (=ucs@unicode      . #x96C5)     ; &G0-5145;
+      )
+     ((ideographic-strokes . 4)
+      (total-strokes      . 12)
+      (=cns11643-1       . #x6273)     ; &C1-6273; [66-83]
+      )
+     ((ideographic-strokes . 5)
+      (total-strokes      . 13)
+      (=jis-x0208@1978   . #x326D)     ; &J83-326D; [18-77]
+      (=jis-x0208@1983   . #x326D)     ; &I-J83-326D; [18-77]
+      )
+     ((ideographic-strokes . 5)
+      (total-strokes      . 13)
+      (=ks-x1001         . #x643A)     ; &GT-56402; [68-26]
+      (=jis-x0208@1990   . #x326D)     ; &I-J90-326D; [18-77]
+      (=gt               . 56402)      ; &I-GT-56402;
+      (=gt-k             . 10177)      ; &I-GT-K10177;
+      (=gt-pj-1                  . #x326D)     ; &I-GT-56402; [18-77]
+      (=ucs@jis                  . #x96C5)     ; &GT-56402;
+      ))
     ))
 (define-char
   '((=>ucs             . #x96C6)       ; 集
@@ -2681,12 +2675,12 @@
     (->subsumptive
      ((shinjigen-1       . 903)
       (shinjigen-2       . 903)
-      (=jis-x0208-1978   . #x5256)     ; &M-42116; [50-54]
-      (=jis-x0208-1983   . #x5256)     ; &I-J83-5256; [50-54]
+      (=jis-x0208@1978   . #x5256)     ; &M-42116; [50-54]
+      (=jis-x0208@1983   . #x5256)     ; &I-J83-5256; [50-54]
       (=ks-x1001         . #x642A)     ; &I-K0-642A; [68-10]
       (=daikanwa         . 42116)      ; &I-M-42116;
       )
-     ((=jis-x0208-1990   . #x5256)     ; &GT-56567; [50-54]
+     ((=jis-x0208@1990   . #x5256)     ; &GT-56567; [50-54]
       (=gt               . 56567)      ; &I-GT-56567;
       (=gt-pj-1                  . #x5256)     ; &I-GT-56567; [50-54]
       (=ucs@jis                  . #x96D9)     ; &GT-56567;

diff --git a/lisp/utf-2000/Ideograph-R173-Rain.el b/lisp/utf-2000/Ideograph-R173-Rain.el
index 518bfc1..a2d77e9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R173-Rain.el
+++ b/lisp/utf-2000/Ideograph-R173-Rain.el
@@ -307,34 +307,25 @@
     (=cns11643-1       . #x6277)       ; &C1-6277; [66-87]
     ))
 (define-char
-  '((=>ucs             . #x96F0)       ; 雰
-    (ideographic-radical . 173)        ; ⾬
-    (ideographic-strokes . 4)
-    (total-strokes      . 12)
-    (=jis-x0208-1978   . #x4A37)       ; &GT-56715; [42-23]
-    (=jis-x0208-1983   . #x4A37)       ; &I-J83-4A37; [42-23]
-    (=ks-x1001         . #x5D54)       ; &I-K0-5D54; [61-52]
-    (=gt               . 56715)        ; &I-GT-56715;
-    (=gt-pj-8          . #x3425)       ; &I-GT-56715; [20-05]
-    (=daikanwa         . 42231)        ; &I-M-42231;
-    ))
-(define-char
-  '((morohashi-daikanwa        42231 0 0)
-    (ideographic-radical . 173)        ; ⾬
+  '((ideographic-radical . 173)        ; ⾬
     (ideographic-strokes . 4)
     (total-strokes      . 12)
     (=ucs              . #x96F0)       ; 雰
-    (=jis-x0208-1990   . #x4A37)       ; &I-J90-4A37; [42-23]
-    (=gt               . 56716)        ; &I-GT-56716;
-    (=gt-pj-1          . #x4A37)       ; &I-GT-56716; [42-23]
-    ))
-(define-char
-  '((=>ucs             . #x96F0)       ; 雰
-    (morohashi-daikanwa        42231 0 1)
-    (ideographic-radical . 173)        ; ⾬
-    (ideographic-strokes . 4)
-    (total-strokes      . 12)
-    (=cns11643-2       . #x414D)       ; &C2-414D; [33-45]
+    (->subsumptive
+     ((=jis-x0208@1978   . #x4A37)     ; &GT-56715; [42-23]
+      (=jis-x0208@1983   . #x4A37)     ; &I-J83-4A37; [42-23]
+      (=ks-x1001         . #x5D54)     ; &I-K0-5D54; [61-52]
+      (=gt               . 56715)      ; &I-GT-56715;
+      (=gt-pj-8                  . #x3425)     ; &I-GT-56715; [20-05]
+      (=daikanwa         . 42231)      ; &I-M-42231;
+      )
+     ((=jis-x0208@1990   . #x4A37)     ; &GT-56716; [42-23]
+      (=gt               . 56716)      ; &I-GT-56716;
+      (=gt-pj-1                  . #x4A37)     ; &I-GT-56716; [42-23]
+      (=ucs@unicode      . #x96F0)     ; &GT-56716;
+      )
+     ((=cns11643-2       . #x414D)     ; &C2-414D; [33-45]
+      ))
     ))
 (define-char
   '((ideographic-radical . 173)        ; ⾬
@@ -2687,13 +2678,13 @@
     (total-strokes      . 18)
     (=ucs              . #x9724)       ; 霤
     (->subsumptive
-     ((=jis-x0208-1978   . #x7045)     ; &GT-56931; [80-37]
+     ((=jis-x0208@1978   . #x7045)     ; &GT-56931; [80-37]
       (=gt               . 56931)      ; &I-GT-56931;
       (=gt-pj-8                  . #x355C)     ; &I-GT-56931; [21-60]
       (=daikanwa         . 42396)      ; &I-M-42396;
       )
-     ((=jis-x0208-1983   . #x7045)     ; &GT-56932; [80-37]
-      (=jis-x0208-1990   . #x7045)     ; &I-J90-7045; [80-37]
+     ((=jis-x0208@1983   . #x7045)     ; &GT-56932; [80-37]
+      (=jis-x0208@1990   . #x7045)     ; &I-J90-7045; [80-37]
       (=gt               . 56932)      ; &I-GT-56932;
       (=gt-pj-1                  . #x7045)     ; &I-GT-56932; [80-37]
       (=ucs@unicode      . #x9724)     ; &GT-56932;
@@ -4157,7 +4148,7 @@
     (=ucs              . #x973D)       ; 霽
     (->subsumptive
      ((shinjigen-2       . 9026)
-      (=jis-x0208-1990   . #x7049)     ; &GT-57044; [80-41]
+      (=jis-x0208@1990   . #x7049)     ; &GT-57044; [80-41]
       (=gt               . 57044)      ; &I-GT-57044;
       (=gt-pj-1                  . #x7049)     ; &I-GT-57044; [80-41]
       (=daikanwa         . 42499)      ; &I-M-42499;
@@ -4166,8 +4157,8 @@
      ((=gb12345                  . #x762B)     ; &UU+973D; [86-11]
       (=ucs@unicode      . #x973D)     ; &UU+973D;
       )
-     ((=jis-x0208-1978   . #x7049)     ; &J83-7049; [80-41]
-      (=jis-x0208-1983   . #x7049)     ; &I-J83-7049; [80-41]
+     ((=jis-x0208@1978   . #x7049)     ; &J83-7049; [80-41]
+      (=jis-x0208@1983   . #x7049)     ; &I-J83-7049; [80-41]
       (=ks-x1001         . #x7038)     ; &I-K0-7038; [80-24]
       )
      ((=cns11643-1       . #x7B7E)     ; &C1-7B7E; [91-94]