- 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-R198-Deer.el b/lisp/utf-2000/Ideograph-R198-Deer.el
index 422ebf3..876d3dc 100644 (file)
--- a/lisp/utf-2000/Ideograph-R198-Deer.el
+++ b/lisp/utf-2000/Ideograph-R198-Deer.el
@@ -822,8 +822,8 @@
     (=ucs              . #x9E97)       ; 麗
     (->subsumptive
      ((shinjigen-2       . 9782)
-      (=jis-x0208-1978   . #x4E6F)     ; &GT-64844; [46-79]
-      (=jis-x0208-1983   . #x4E6F)     ; &I-J83-4E6F; [46-79]
+      (=jis-x0208@1978   . #x4E6F)     ; &GT-64844; [46-79]
+      (=jis-x0208@1983   . #x4E6F)     ; &I-J83-4E6F; [46-79]
       (=ks-x1001         . #x5572)     ; &I-K0-5572; [53-82]
       (=gt               . 64844)      ; &I-GT-64844;
       (=gt-pj-1                  . #x4E6F)     ; &I-GT-64844; [46-79]
@@ -832,7 +832,7 @@
      ((=gb12345                  . #x4076)     ; &UU+9E97; [32-86]
       (=ucs@unicode      . #x9E97)     ; &UU+9E97;
       )
-     ((=jis-x0208-1990   . #x4E6F)     ; &J90-4E6F; [46-79]
+     ((=jis-x0208@1990   . #x4E6F)     ; &J90-4E6F; [46-79]
       (=ucs@jis                  . #x9E97)     ; &J90-4E6F;
       )
      ((=cns11643-1       . #x795E)     ; &C1-795E; [89-62]
@@ -1159,47 +1159,34 @@
   '((ideographic-radical . 198)        ; ⿅
     (ideographic-strokes . 12)
     (total-strokes      . 23)
-    (->synonyms
-     (:sources (setsumon-tsuukun-teisei morohashi-daikanwa)
-      :char    ((=daikanwa          . 47643)   ; &I-M-47643;
-                )
+    (=ucs              . #x9E9F)       ; 麟
+    (->subsumptive
+     ((->synonyms@daikanwa
+       ((=daikanwa         . 19417)    ; &I-M-19417;
+       ))
+      (->synonyms@daikanwa*sources
+       daikanwa)
+      (->synonyms@shuowen-tongxun-dingsheng
+       ((=daikanwa         . 47643)    ; &I-M-47643;
+       ))
+      (->synonyms@shuowen-tongxun-dingsheng*sources
+       shuowen-tongxun-dingsheng daikanwa)
+      (=daikanwa         . 47690)      ; &M-47690;
+      )
+     ((=gb2312           . #x776B)     ; &G0-776B; [87-75]
+      (=ucs@unicode      . #x9E9F)     ; &G0-776B;
       )
-     (:sources (morohashi-daikanwa)
-      :char    ((=daikanwa          . 19417)   ; &I-M-19417;
-                )
+     ((=cns11643-1       . #x7C5B)     ; &C1-7C5B; [92-59]
+      )
+     ((=jis-x0208@1978   . #x4E5B)     ; &J83-4E5B; [46-59]
+      (=jis-x0208@1983   . #x4E5B)     ; &I-J83-4E5B; [46-59]
+      )
+     ((=ks-x1001         . #x5778)     ; &GT-64883; [55-88]
+      (=jis-x0208@1990   . #x4E5B)     ; &I-J90-4E5B; [46-59]
+      (=gt               . 64883)      ; &I-GT-64883;
+      (=gt-pj-1                  . #x4E5B)     ; &I-GT-64883; [46-59]
+      (=ucs@jis                  . #x9E9F)     ; &GT-64883;
       ))
-    (=ucs              . #x9E9F)       ; 麟
-    (=gb2312           . #x776B)       ; &I-G0-776B; [87-75]
-    (=daikanwa         . 47690)        ; &I-M-47690;
-    ))
-(define-char
-  '((=>ucs             . #x9E9F)       ; 麟
-    (morohashi-daikanwa        47690 0 0)
-    (ideographic-radical . 198)        ; ⿅
-    (ideographic-strokes . 12)
-    (total-strokes      . 23)
-    (=cns11643-1       . #x7C5B)       ; &C1-7C5B; [92-59]
-    ))
-(define-char
-  '((=>ucs             . #x9E9F)       ; 麟
-    (morohashi-daikanwa        47690 0 1)
-    (ideographic-radical . 198)        ; ⿅
-    (ideographic-strokes . 12)
-    (total-strokes      . 23)
-    (=jis-x0208-1978   . #x4E5B)       ; &J83-4E5B; [46-59]
-    (=jis-x0208-1983   . #x4E5B)       ; &I-J83-4E5B; [46-59]
-    ))
-(define-char
-  '((=>ucs             . #x9E9F)       ; 麟
-    (morohashi-daikanwa        47690 0 2)
-    (ideographic-radical . 198)        ; ⿅
-    (ideographic-strokes . 12)
-    (total-strokes      . 23)
-    (=ks-x1001         . #x5778)       ; &GT-64883; [55-88]
-    (=jis-x0208-1990   . #x4E5B)       ; &I-J90-4E5B; [46-59]
-    (=gt               . 64883)        ; &I-GT-64883;
-    (=gt-pj-1          . #x4E5B)       ; &I-GT-64883; [46-59]
-    (=ucs@jis          . #x9E9F)       ; &GT-64883;
     ))
 (define-char
   '((ideographic-radical . 198)        ; ⿅

diff --git a/lisp/utf-2000/Ideograph-R203-Black.el b/lisp/utf-2000/Ideograph-R203-Black.el
index 6f0f466..53798a1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R203-Black.el
+++ b/lisp/utf-2000/Ideograph-R203-Black.el
@@ -406,24 +406,41 @@
 (define-char
   '((ideographic-radical . 203)        ; ⿊
     (ideographic-strokes . 5)
-    (total-strokes      . 17)
     (=ucs              . #x9EDB)       ; 黛
-    (=jis-x0208-1978   . #x4263)       ; &I-J78-4263; [34-67]
+    ))
+(define-char
+  '((ideographic-radical . 203)        ; ⿊
+    (ideographic-strokes . 5)
+    (total-strokes      . 17)
+    (<-denotational
+     ((=ucs              . #x9EDB)     ; 黛
+      ))
+    (=jis-x0208@1978   . #x4263)       ; &M-48075; [34-67]
     (=gb2312           . #x776C)       ; &I-G0-776C; [87-76]
     (=ks-x1001         . #x536A)       ; &I-K0-536A; [51-74]
     (=cns11643-1       . #x7638)       ; &I-C1-7638; [86-24]
     (=daikanwa         . 48075)        ; &I-M-48075;
+    (=ucs@unicode      . #x9EDB)       ; &M-48075;
     ))
 (define-char
-  '((=>ucs             . #x9EDB)       ; 黛
-    (morohashi-daikanwa        48075 0 4)
-    (ideographic-radical . 203)        ; ⿊
+  '((ideographic-radical . 203)        ; ⿊
     (ideographic-strokes . 5)
     (total-strokes      . 16)
-    (=jis-x0208-1983   . #x4263)       ; &GT-65587; [34-67]
-    (=jis-x0208-1990   . #x4263)       ; &I-J90-4263; [34-67]
+    (<-denotational
+     ((=ucs              . #x9EDB)     ; 黛
+      ))
+    (<-simplified@JP
+     ((=jis-x0208@1978   . #x4263)     ; &M-48075; [34-67]
+      (=gb2312           . #x776C)     ; &I-G0-776C; [87-76]
+      (=ks-x1001         . #x536A)     ; &I-K0-536A; [51-74]
+      (=cns11643-1       . #x7638)     ; &I-C1-7638; [86-24]
+      (=daikanwa         . 48075)      ; &I-M-48075;
+      ))
+    (=jis-x0208@1983   . #x4263)       ; &GT-65587; [34-67]
+    (=jis-x0208@1990   . #x4263)       ; &I-J90-4263; [34-67]
     (=gt               . 65587)        ; &I-GT-65587;
     (=gt-pj-1          . #x4263)       ; &I-GT-65587; [34-67]
+    (=jef-china3       . #x6FD8)       ; &I-JC3-6FD8;
     (=ucs@jis          . #x9EDB)       ; &GT-65587;
     ))
 (define-char