Rename `japanese-jisx0208-1978' to `=jis-x0208-1978'.

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index ac61395..18049f1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -265,16 +265,16 @@
     (total-strokes      . 3)
     (shinjigen-1       . 10)
     (shinjigen-2       . 10)
-    (japanese-jisx0208-1978    . #x3E66)       ; �����
-    (japanese-jisx0208         . #x3E66)       ; �����
-    (korean-ksc5601            . #x6D5B)       ; �����
-    (=gt-pj-2                  . #x3027)       ; ������
-    (chinese-big5              . #xA456)       ; ������
-    (ideograph-daikanwa                . 00011)        ; �����
-    (=gt-k                     . 00189)        ; ������
-    (=jef-china3               . #x41A5)       ; �����
-    (=ucs@big5                 . #x4E08)       ; �����
-    (=gt                       . 00018)        ; ������
+    (=jis-x0208-1978   . #x3E66)       ; �����
+    (japanese-jisx0208 . #x3E66)       ; �����
+    (korean-ksc5601    . #x6D5B)       ; �����
+    (=gt-pj-2          . #x3027)       ; ������
+    (chinese-big5      . #xA456)       ; ������
+    (ideograph-daikanwa . 00011)       ; �����
+    (=gt-k             . 00189)        ; ������
+    (=jef-china3       . #x41A5)       ; �����
+    (=ucs@big5         . #x4E08)       ; �����
+    (=gt               . 00018)        ; ������
     ))
 (define-char
   '((morohashi-daikanwa        11 0 0)
@@ -638,10 +638,10 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
       (=ucs              . #x2FFA)     ; ⿺
       )
-     ((japanese-jisx0208-1978    . #x3E66)     ; �����
-      (japanese-jisx0208         . #x3E66)     ; �����
-      (korean-ksc5601            . #x6D5B)     ; �����
-      (ideograph-daikanwa        . 00011)      ; �����
+     ((=jis-x0208-1978   . #x3E66)     ; �����
+      (japanese-jisx0208  . #x3E66)    ; �����
+      (korean-ksc5601    . #x6D5B)     ; �����
+      (ideograph-daikanwa . 00011)     ; �����
       )
      ((=ucs              . #x4E36)     ; 丶
       ))

diff --git a/lisp/utf-2000/Ideograph-R007-Two.el b/lisp/utf-2000/Ideograph-R007-Two.el
index 3cfa95d..2b8715a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R007-Two.el
+++ b/lisp/utf-2000/Ideograph-R007-Two.el
@@ -796,11 +796,11 @@
       )
      ((=ucs              . #x4E8C)     ; 二
       )
-     ((japanese-jisx0208-1978    . #x5423)     ; �����
-      (japanese-jisx0208         . #x5423)     ; �����
-      (korean-ksc5601            . #x6A4C)     ; �����
-      (chinese-cns11643-1        . #x5E58)     ; �����
-      (ideograph-daikanwa        . 04806)      ; �����
+     ((=jis-x0208-1978   . #x5423)     ; �����
+      (japanese-jisx0208  . #x5423)    ; �����
+      (korean-ksc5601    . #x6A4C)     ; �����
+      (chinese-cns11643-1 . #x5E58)    ; �����
+      (ideograph-daikanwa . 04806)     ; �����
       ))
     (ideograph-daikanwa . 00285)       ; �����
     (=hanziku-1                . #xA9A1)       ; ������

diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index 8548a1a..f6ea809 100644 (file)
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -205,19 +205,19 @@
       )
      ((=jis-x0208        . #x5035)     ; �����
       )
-     ((japanese-jisx0208-1978    . #x4963)     ; �����
-      (japanese-jisx0208         . #x4963)     ; �����
-      (korean-ksc5601            . #x5D2B)     ; �����
-      (ideograph-daikanwa        . 19721)      ; �����
+     ((=jis-x0208-1978   . #x4963)     ; �����
+      (japanese-jisx0208  . #x4963)    ; �����
+      (korean-ksc5601    . #x5D2B)     ; �����
+      (ideograph-daikanwa . 19721)     ; �����
       ))
     (shinjigen-1       . 97)
     (shinjigen-2       . 97)
-    (japanese-jisx0208-1978    . #x3872)       ; �����
-    (japanese-jisx0208         . #x3872)       ; �����
-    (korean-ksc5601            . #x4E5F)       ; �����
-    (chinese-big5              . #xA5E6)       ; ������
-    (ideograph-daikanwa                . 00291)        ; �����
-    (=jef-china3               . #x41D6)       ; �����
+    (=jis-x0208-1978   . #x3872)       ; �����
+    (japanese-jisx0208 . #x3872)       ; �����
+    (korean-ksc5601    . #x4E5F)       ; �����
+    (chinese-big5      . #xA5E6)       ; ������
+    (ideograph-daikanwa . 00291)       ; �����
+    (=jef-china3       . #x41D6)       ; �����
     ))
 (define-char
   '((=>ucs             . #x4EA4)       ; 交
@@ -2819,11 +2819,11 @@
       )
      ((=jis-x0208        . #x5035)     ; �����
       )
-     ((japanese-jisx0208-1978    . #x5423)     ; �����
-      (japanese-jisx0208         . #x5423)     ; �����
-      (korean-ksc5601            . #x6A4C)     ; �����
-      (chinese-cns11643-1        . #x5E58)     ; �����
-      (ideograph-daikanwa        . 04806)      ; �����
+     ((=jis-x0208-1978   . #x5423)     ; �����
+      (japanese-jisx0208  . #x5423)    ; �����
+      (korean-ksc5601    . #x6A4C)     ; �����
+      (chinese-cns11643-1 . #x5E58)    ; �����
+      (ideograph-daikanwa . 04806)     ; �����
       )
      ((=ucs              . #x53C8)     ; 又
       ))
@@ -2841,11 +2841,11 @@
       )
      ((=ucs              . #x4EA0)     ; 亠
       )
-     ((japanese-jisx0208-1978    . #x5423)     ; �����
-      (japanese-jisx0208         . #x5423)     ; �����
-      (korean-ksc5601            . #x6A4C)     ; �����
-      (chinese-cns11643-1        . #x5E58)     ; �����
-      (ideograph-daikanwa        . 04806)      ; �����
+     ((=jis-x0208-1978   . #x5423)     ; �����
+      (japanese-jisx0208  . #x5423)    ; �����
+      (korean-ksc5601    . #x6A4C)     ; �����
+      (chinese-cns11643-1 . #x5E58)    ; �����
+      (ideograph-daikanwa . 04806)     ; �����
       )
      ((=ucs              . #x53C8)     ; 又
       ))

diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index a569023..22af49f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -945,10 +945,10 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x3E66)     ; �����
-      (japanese-jisx0208         . #x3E66)     ; �����
-      (korean-ksc5601            . #x6D5B)     ; �����
-      (ideograph-daikanwa        . 00011)      ; �����
+     ((=jis-x0208-1978   . #x3E66)     ; �����
+      (japanese-jisx0208  . #x3E66)    ; �����
+      (korean-ksc5601    . #x6D5B)     ; �����
+      (ideograph-daikanwa . 00011)     ; �����
       ))
     (shinjigen-1       . 134)
     (shinjigen-2       . 134)
@@ -2329,10 +2329,10 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x4A2C)     ; �����
-      (japanese-jisx0208         . #x4A2C)     ; �����
-      (korean-ksc5601            . #x5D42)     ; �����
-      (ideograph-daikanwa        . 01853)      ; �����
+     ((=jis-x0208-1978   . #x4A2C)     ; �����
+      (japanese-jisx0208  . #x4A2C)    ; �����
+      (korean-ksc5601    . #x5D42)     ; �����
+      (ideograph-daikanwa . 01853)     ; �����
       ))
     (japanese-jisx0212 . #x304F)       ; �����
     (=jis-x0213-1-2000 . #x2E29)       ; �����
@@ -2438,10 +2438,10 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x3878)     ; �����
-      (japanese-jisx0208         . #x3878)     ; �����
-      (korean-ksc5601            . #x4D6B)     ; �����
-      (ideograph-daikanwa        . 01452)      ; �����
+     ((=jis-x0208-1978   . #x3878)     ; �����
+      (japanese-jisx0208  . #x3878)    ; �����
+      (korean-ksc5601    . #x4D6B)     ; �����
+      (ideograph-daikanwa . 01452)     ; �����
       ))
     (japanese-jisx0212 . #x3052)       ; �����
     (=jis-x0213-2-2000 . #x213F)       ; �����
@@ -5722,10 +5722,9 @@
        )
        ((=ucs              . #x200CC)  ; 𠃌
        )
-       ((japanese-jisx0208-1978            . #x4A2C)   ; �����
-       (japanese-jisx0208          . #x4A2C)   ; �����
-       (korean-ksc5601             . #x5D42)   ; �����
-       (ideograph-daikanwa         . 01853)    ; �����
+       ((japanese-jisx0208  . #x4A2C)  ; �����
+       (korean-ksc5601     . #x5D42)   ; �����
+       (ideograph-daikanwa . 01853)    ; �����
        ))
       ))
     (ideograph-daikanwa . 00530)       ; �����
@@ -6753,10 +6752,10 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x3872)     ; �����
-      (japanese-jisx0208         . #x3872)     ; �����
-      (korean-ksc5601            . #x4E5F)     ; �����
-      (ideograph-daikanwa        . 00291)      ; �����
+     ((=jis-x0208-1978   . #x3872)     ; �����
+      (japanese-jisx0208  . #x3872)    ; �����
+      (korean-ksc5601    . #x4E5F)     ; �����
+      (ideograph-daikanwa . 00291)     ; �����
       ))
     (shinjigen-1       . 218)
     (shinjigen-2       . 218)
@@ -6927,18 +6926,18 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x4D79)     ; �����
-      (japanese-jisx0208         . #x4D79)     ; �����
-      (korean-ksc5601            . #x5759)     ; �����
-      (ideograph-daikanwa        . 03299)      ; �����
+     ((=jis-x0208-1978   . #x4D79)     ; �����
+      (japanese-jisx0208  . #x4D79)    ; �����
+      (korean-ksc5601    . #x5759)     ; �����
+      (ideograph-daikanwa . 03299)     ; �����
       ))
     (shinjigen-1       . 220)
     (shinjigen-2       . 220)
-    (japanese-jisx0208-1978    . #x3B48)       ; �����
-    (japanese-jisx0208         . #x3B48)       ; �����
-    (chinese-big5              . #xA8CF)       ; ������
-    (ideograph-daikanwa                . 00573)        ; �����
-    (=jef-china3               . #x42B1)       ; �����
+    (=jis-x0208-1978   . #x3B48)       ; �����
+    (japanese-jisx0208 . #x3B48)       ; �����
+    (chinese-big5      . #xA8CF)       ; ������
+    (ideograph-daikanwa . 00573)       ; �����
+    (=jef-china3       . #x42B1)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        573 0 0)
@@ -8635,11 +8634,11 @@
       )
      ((=ucs              . #x5C3D)     ; 尽
       ))
-    (japanese-jisx0208-1978    . #x5056)       ; �����
-    (japanese-jisx0208         . #x4B79)       ; �����
-    (=jis-x0208-1990           . #x4B79)       ; �����
-    (=gt-pj-1                  . #x4B79)       ; 侭
-    (=ucs                      . #x4FAD)       ; 侭
+    (=jis-x0208-1978   . #x5056)       ; �����
+    (japanese-jisx0208 . #x4B79)       ; �����
+    (=jis-x0208-1990   . #x4B79)       ; �����
+    (=gt-pj-1          . #x4B79)       ; 侭
+    (=ucs              . #x4FAD)       ; 侭
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
@@ -9164,10 +9163,10 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x446E)     ; �����
-      (japanese-jisx0208         . #x446E)     ; �����
-      (korean-ksc5601            . #x6F55)     ; �����
-      (ideograph-daikanwa        . 09571)      ; �����
+     ((=jis-x0208-1978   . #x446E)     ; �����
+      (japanese-jisx0208  . #x446E)    ; �����
+      (korean-ksc5601    . #x6F55)     ; �����
+      (ideograph-daikanwa . 09571)     ; �����
       ))
     (japanese-jisx0212 . #x3131)       ; �����
     (ideograph-daikanwa . 00650)       ; �����
@@ -9400,19 +9399,19 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x3939)     ; �����
-      (japanese-jisx0208         . #x3939)     ; �����
-      (korean-ksc5601            . #x4C5A)     ; �����
-      (ideograph-daikanwa        . 14283)      ; �����
+     ((=jis-x0208-1978   . #x3939)     ; �����
+      (japanese-jisx0208  . #x3939)    ; �����
+      (korean-ksc5601    . #x4C5A)     ; �����
+      (ideograph-daikanwa . 14283)     ; �����
       ))
     (shinjigen-1       . 269)
     (shinjigen-2       . 269)
-    (japanese-jisx0208-1978    . #x4A58)       ; �����
-    (japanese-jisx0208         . #x4A58)       ; �����
-    (korean-ksc5601            . #x7835)       ; �����
-    (chinese-big5              . #xAB4B)       ; ������
-    (ideograph-daikanwa                . 00659)        ; �����
-    (=jef-china3               . #x42C4)       ; �����
+    (=jis-x0208-1978   . #x4A58)       ; �����
+    (japanese-jisx0208 . #x4A58)       ; �����
+    (korean-ksc5601    . #x7835)       ; �����
+    (chinese-big5      . #xAB4B)       ; ������
+    (ideograph-daikanwa . 00659)       ; �����
+    (=jef-china3       . #x42C4)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        659 0 0)
@@ -10713,15 +10712,15 @@
       ))
     (shinjigen-1       . 248)
     (shinjigen-2       . 248)
-    (japanese-jisx0208-1978    . #x3622)       ; �����
-    (korean-ksc5601            . #x7A6F)       ; �����
-    (japanese-jisx0212         . #x3142)       ; �����
-    (chinese-cns11643-1                . #x4F6E)       ; �����
-    (=jis-x0213-1-2000         . #x2E3A)       ; �����
-    (chinese-gb12345           . #x4F40)       ; 俠
-    (chinese-big5              . #xAB4C)       ; ������
-    (ideograph-daikanwa                . 00706)        ; �����
-    (=ucs                      . #x4FE0)       ; 俠
+    (=jis-x0208-1978   . #x3622)       ; �����
+    (korean-ksc5601    . #x7A6F)       ; �����
+    (japanese-jisx0212 . #x3142)       ; �����
+    (chinese-cns11643-1 . #x4F6E)      ; �����
+    (=jis-x0213-1-2000 . #x2E3A)       ; �����
+    (chinese-gb12345   . #x4F40)       ; 俠
+    (chinese-big5      . #xAB4C)       ; ������
+    (ideograph-daikanwa . 00706)       ; �����
+    (=ucs              . #x4FE0)       ; 俠
     ))
 (define-char
   '((=>ucs             . #x4FE1)       ; 信
@@ -13427,9 +13426,9 @@
       ))
     (shinjigen-1       . 292)
     (shinjigen-2       . 292)
-    (japanese-jisx0208-1978    . #x3771)       ; �����
-    (korean-ksc5601            . #x4F66)       ; �����
-    (ideograph-daikanwa                . 00788)        ; �����
+    (=jis-x0208-1978   . #x3771)       ; �����
+    (korean-ksc5601    . #x4F66)       ; �����
+    (ideograph-daikanwa . 00788)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        788 0 2)
@@ -14369,9 +14368,9 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x3A53)     ; �����
-      (korean-ksc5601            . #x737A)     ; �����
-      (ideograph-daikanwa        . 40116)      ; �����
+     ((=jis-x0208-1978   . #x3A53)     ; �����
+      (korean-ksc5601    . #x737A)     ; �����
+      (ideograph-daikanwa . 40116)     ; �����
       ))
     (ideograph-daikanwa . 00822)       ; �����
     (=hanziku-1                . #xCBB1)       ; ������
@@ -14990,8 +14989,8 @@
      ((=jis-x0208        . #x706A)     ; �����
       (korean-ksc5601    . #x6A5F)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x304E)       ; �����
-    (japanese-jisx0208         . #x304E)       ; �����
+    (=jis-x0208-1978   . #x304E)       ; �����
+    (japanese-jisx0208 . #x304E)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5049)       ; 偉
@@ -16071,9 +16070,9 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x3D36)     ; �����
-      (korean-ksc5601            . #x755C)     ; �����
-      (ideograph-daikanwa        . 39765)      ; �����
+     ((=jis-x0208-1978   . #x3D36)     ; �����
+      (korean-ksc5601    . #x755C)     ; �����
+      (ideograph-daikanwa . 39765)     ; �����
       ))
     (ideograph-daikanwa . 00874)       ; �����
     ))
@@ -16106,17 +16105,17 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x377A)     ; �����
-      (japanese-jisx0208         . #x377A)     ; �����
-      (korean-ksc5601            . #x4B6F)     ; �����
-      (ideograph-daikanwa        . 09574)      ; �����
+     ((=jis-x0208-1978   . #x377A)     ; �����
+      (japanese-jisx0208  . #x377A)    ; �����
+      (korean-ksc5601    . #x4B6F)     ; �����
+      (ideograph-daikanwa . 09574)     ; �����
       ))
     (shinjigen-1       . 337)
     (shinjigen-2       . 337)
-    (japanese-jisx0208-1978    . #x3772)       ; �����
-    (japanese-jisx0208         . #x3772)       ; �����
-    (ideograph-daikanwa                . 00875)        ; �����
-    (=jef-china3               . #x42F1)       ; �����
+    (=jis-x0208-1978   . #x3772)       ; �����
+    (japanese-jisx0208 . #x3772)       ; �����
+    (ideograph-daikanwa . 00875)       ; �����
+    (=jef-china3       . #x42F1)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        875 0 0)
@@ -17889,9 +17888,9 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x367D)     ; �����
-      (korean-ksc5601            . #x605A)     ; �����
-      (ideograph-daikanwa        . 07709)      ; �����
+     ((=jis-x0208-1978   . #x367D)     ; �����
+      (korean-ksc5601    . #x605A)     ; �����
+      (ideograph-daikanwa . 07709)     ; �����
       ))
     (ideograph-daikanwa . 00935)       ; �����
     (=hanziku-1                . #xD0C8)       ; ������
@@ -18021,9 +18020,9 @@
       )
      ((=ucs              . #x5C03)     ; 尃
       ))
-    (japanese-jisx0208-1978    . #x507C)       ; �����
-    (japanese-jisx0208         . #x507C)       ; �����
-    (chinese-cns11643-1                . #x5E2B)       ; �����
+    (=jis-x0208-1978   . #x507C)       ; �����
+    (japanese-jisx0208 . #x507C)       ; �����
+    (chinese-cns11643-1 . #x5E2B)      ; �����
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
@@ -18507,9 +18506,9 @@
       ))
     (shinjigen-1       . 371)
     (shinjigen-2       . 371)
-    (japanese-jisx0208-1978    . #x3766)       ; �����
-    (japanese-jisx0208         . #x3766)       ; �����
-    (korean-ksc5601            . #x4B78)       ; �����
+    (=jis-x0208-1978   . #x3766)       ; �����
+    (japanese-jisx0208 . #x3766)       ; �����
+    (korean-ksc5601    . #x4B78)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5091)       ; 傑
@@ -21498,13 +21497,13 @@
       ))
     (shinjigen-1       . 369)
     (shinjigen-2       . 369)
-    (japanese-jisx0208-1978    . #x364F)       ; �����
-    (korean-ksc5601            . #x5041)       ; �����
-    (chinese-cns11643-1                . #x632F)       ; �����
-    (chinese-gb12345           . #x3D76)       ; 僅
-    (chinese-big5              . #xB6C8)       ; ������
-    (ideograph-daikanwa                . 01048)        ; �����
-    (=ucs                      . #x50C5)       ; 僅
+    (=jis-x0208-1978   . #x364F)       ; �����
+    (korean-ksc5601    . #x5041)       ; �����
+    (chinese-cns11643-1 . #x632F)      ; �����
+    (chinese-gb12345   . #x3D76)       ; 僅
+    (chinese-big5      . #xB6C8)       ; ������
+    (ideograph-daikanwa . 01048)       ; �����
+    (=ucs              . #x50C5)       ; 僅
     ))
 (define-char
   '((=>ucs             . #x50C5)       ; 僅
@@ -22485,15 +22484,15 @@
       )
      ((=ucs              . #x8C61)     ; 象
       ))
-    (japanese-jisx0208-1978    . #x417C)       ; �����
-    (chinese-gb2312            . #x4F71)       ; �����
-    (japanese-jisx0208         . #x417C)       ; �����
-    (korean-ksc5601            . #x5F40)       ; �����
-    (=iso-ir165                        . #x4F71)       ; �����
-    (chinese-cns11643-1                . #x6779)       ; �����
-    (chinese-big5              . #xB9B3)       ; ������
-    (ideograph-daikanwa                . 01084)        ; �����
-    (=ucs                      . #x50CF)       ; 像
+    (=jis-x0208-1978   . #x417C)       ; �����
+    (chinese-gb2312    . #x4F71)       ; �����
+    (japanese-jisx0208 . #x417C)       ; �����
+    (korean-ksc5601    . #x5F40)       ; �����
+    (=iso-ir165                . #x4F71)       ; �����
+    (chinese-cns11643-1 . #x6779)      ; �����
+    (chinese-big5      . #xB9B3)       ; ������
+    (ideograph-daikanwa . 01084)       ; �����
+    (=ucs              . #x50CF)       ; 像
     ))
 (define-char
   '((=>ucs             . #x50CF)       ; 像
@@ -25475,9 +25474,9 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x465B)     ; �����
-      (korean-ksc5601            . #x546D)     ; �����
-      (ideograph-daikanwa        . 38982)      ; �����
+     ((=jis-x0208-1978   . #x465B)     ; �����
+      (korean-ksc5601    . #x546D)     ; �����
+      (ideograph-daikanwa . 38982)     ; �����
       ))
     (ideograph-daikanwa . 01182)       ; �����
     (=hanziku-1                . #xD4CC)       ; ������
@@ -27209,15 +27208,15 @@
       ))
     (shinjigen-1       . 422)
     (shinjigen-2       . 422)
-    (japanese-jisx0208-1978    . #x4B79)       ; �����
-    (japanese-jisx0208         . #x5056)       ; �����
-    (chinese-cns11643-1                . #x7031)       ; �����
-    (=jis-x0208-1990           . #x5056)       ; �����
-    (chinese-gb12345           . #x7845)       ; 儘
-    (=gt-pj-1                  . #x5056)       ; 儘
-    (chinese-big5              . #xBEA8)       ; ������
-    (ideograph-daikanwa                . 01234)        ; �����
-    (=ucs                      . #x5118)       ; 儘
+    (=jis-x0208-1978   . #x4B79)       ; �����
+    (japanese-jisx0208 . #x5056)       ; �����
+    (chinese-cns11643-1 . #x7031)      ; �����
+    (=jis-x0208-1990   . #x5056)       ; �����
+    (chinese-gb12345   . #x7845)       ; 儘
+    (=gt-pj-1          . #x5056)       ; 儘
+    (chinese-big5      . #xBEA8)       ; ������
+    (ideograph-daikanwa . 01234)       ; �����
+    (=ucs              . #x5118)       ; 儘
     ))
 (define-char
   '((=>ucs             . #x5119)       ; 儙
@@ -28898,9 +28897,9 @@
      ((name              . "CJK COMPATIBILITY IDEOGRAPH-FA22")
       (=ucs              . #xFA22)     ; 諸
       ))
-    (japanese-jisx0208-1978    . #x4C59)       ; �����
-    (korean-ksc5601            . #x6E39)       ; �����
-    (ideograph-daikanwa                . 01284)        ; �����
+    (=jis-x0208-1978   . #x4C59)       ; �����
+    (korean-ksc5601    . #x6E39)       ; �����
+    (ideograph-daikanwa . 01284)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5132)       ; 儲
@@ -29791,10 +29790,10 @@
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((japanese-jisx0208-1978    . #x4E6F)     ; �����
-      (japanese-jisx0208         . #x4E6F)     ; �����
-      (korean-ksc5601            . #x5572)     ; �����
-      (ideograph-daikanwa        . 47663)      ; �����
+     ((=jis-x0208-1978   . #x4E6F)     ; �����
+      (japanese-jisx0208  . #x4E6F)    ; �����
+      (korean-ksc5601    . #x5572)     ; �����
+      (ideograph-daikanwa . 47663)     ; �����
       ))
     (shinjigen-1       . 440)
     (shinjigen-2       . 440)

diff --git a/lisp/utf-2000/Ideograph-R010-Legs.el b/lisp/utf-2000/Ideograph-R010-Legs.el
index 0633c3d..3863a2a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R010-Legs.el
+++ b/lisp/utf-2000/Ideograph-R010-Legs.el
@@ -288,10 +288,10 @@
     (total-strokes      . 6)
     (shinjigen-1       . 456)
     (shinjigen-2       . 456)
-    (japanese-jisx0208-1978    . #x437B)       ; �����
-    (japanese-jisx0208         . #x437B)       ; �����
-    (korean-ksc5601            . #x703C)       ; �����
-    (ideograph-daikanwa                . 01347)        ; �����
+    (=jis-x0208-1978   . #x437B)       ; �����
+    (japanese-jisx0208 . #x437B)       ; �����
+    (korean-ksc5601    . #x703C)       ; �����
+    (ideograph-daikanwa . 01347)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        1347 0 0)
@@ -394,10 +394,10 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((japanese-jisx0208-1978    . #x3878)     ; �����
-      (japanese-jisx0208         . #x3878)     ; �����
-      (korean-ksc5601            . #x4D6B)     ; �����
-      (ideograph-daikanwa        . 01452)      ; �����
+     ((=jis-x0208-1978   . #x3878)     ; �����
+      (japanese-jisx0208  . #x3878)    ; �����
+      (korean-ksc5601    . #x4D6B)     ; �����
+      (ideograph-daikanwa . 01452)     ; �����
       )
      ((=ucs              . #x513F)     ; 儿
       ))
@@ -1006,10 +1006,10 @@
       ))
     (shinjigen-1       . 468)
     (shinjigen-2       . 468)
-    (japanese-jisx0208-1978    . #x513D)       ; �����
-    (chinese-cns11643-3                . #x2753)       ; �����
-    (ideograph-daikanwa                . 01368)        ; �����
-    (=ucs                      . #x2F80F)      ; 兔
+    (=jis-x0208-1978   . #x513D)       ; �����
+    (chinese-cns11643-3 . #x2753)      ; �����
+    (ideograph-daikanwa . 01368)       ; �����
+    (=ucs              . #x2F80F)      ; 兔
     ))
 (define-char
   '((morohashi-daikanwa        1368 1)
@@ -1509,10 +1509,10 @@
       )
      ((=ucs              . #x514B)     ; 克
       )
-     ((japanese-jisx0208-1978    . #x4A2C)     ; �����
-      (japanese-jisx0208         . #x4A2C)     ; �����
-      (korean-ksc5601            . #x5D42)     ; �����
-      (ideograph-daikanwa        . 01853)      ; �����
+     ((=jis-x0208-1978   . #x4A2C)     ; �����
+      (japanese-jisx0208  . #x4A2C)    ; �����
+      (korean-ksc5601    . #x5D42)     ; �����
+      (ideograph-daikanwa . 01853)     ; �����
       ))
     (chinese-big5      . #xA25C)       ; ������
     (ideograph-daikanwa . 01387)       ; �����

diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el
index a047bb9..3b79326 100644 (file)
--- a/lisp/utf-2000/Ideograph-R011-Enter.el
+++ b/lisp/utf-2000/Ideograph-R011-Enter.el
@@ -1205,9 +1205,9 @@
       (korean-ksc5601    . #x6C7D)     ; �����
       (ideograph-daikanwa . 01415)     ; �����
       )
-     ((japanese-jisx0208-1978    . #x475A)     ; �����
-      (japanese-jisx0208         . #x475A)     ; �����
-      (ideograph-daikanwa        . 38398)      ; �����
+     ((=jis-x0208-1978   . #x475A)     ; �����
+      (japanese-jisx0208  . #x475A)    ; �����
+      (ideograph-daikanwa . 38398)     ; �����
       ))
     (ideograph-daikanwa . 01448)       ; �����
     (=ucs              . #x204FD)      ; 𠓽

diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el
index 74af81e..dd76005 100644 (file)
--- a/lisp/utf-2000/Ideograph-R012-Eight.el
+++ b/lisp/utf-2000/Ideograph-R012-Eight.el
@@ -77,12 +77,12 @@
       ))
     (shinjigen-1       . 494)
     (shinjigen-2       . 494)
-    (japanese-jisx0208-1978    . #x3878)       ; �����
-    (japanese-jisx0208         . #x3878)       ; �����
-    (korean-ksc5601            . #x4D6B)       ; �����
-    (chinese-big5              . #xA4BD)       ; ������
-    (ideograph-daikanwa                . 01452)        ; �����
-    (=jef-china3               . #x43E5)       ; �����
+    (=jis-x0208-1978   . #x3878)       ; �����
+    (japanese-jisx0208 . #x3878)       ; �����
+    (korean-ksc5601    . #x4D6B)       ; �����
+    (chinese-big5      . #xA4BD)       ; ������
+    (ideograph-daikanwa . 01452)       ; �����
+    (=jef-china3       . #x43E5)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        1452 0 1)

diff --git a/lisp/utf-2000/Ideograph-R013-Down-Box.el b/lisp/utf-2000/Ideograph-R013-Down-Box.el
index c743fd3..27c89f5 100644 (file)
--- a/lisp/utf-2000/Ideograph-R013-Down-Box.el
+++ b/lisp/utf-2000/Ideograph-R013-Down-Box.el
@@ -216,8 +216,8 @@
     (total-strokes      . 5)
     (shinjigen-1       . 514)
     (shinjigen-2       . 514)
-    (japanese-jisx0208-1978    . #x5147)       ; �����
-    (ideograph-daikanwa                . 01514)        ; �����
+    (=jis-x0208-1978   . #x5147)       ; �����
+    (ideograph-daikanwa . 01514)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        1514 0 3)
@@ -428,8 +428,8 @@
       )
      ((=ucs              . #x4E00)     ; 一
       )
-     ((japanese-jisx0208-1978    . #x5147)     ; �����
-      (ideograph-daikanwa        . 01514)      ; �����
+     ((=jis-x0208-1978   . #x5147)     ; �����
+      (ideograph-daikanwa . 01514)     ; �����
       ))
     (chinese-cns11643-3 . #x227B)      ; �����
     (ideograph-daikanwa . 01524)       ; �����
@@ -783,8 +783,8 @@
       )
      ((=big5-cdp         . #x8BB7)     ; ������
       )
-     ((japanese-jisx0208-1978    . #x5147)     ; �����
-      (ideograph-daikanwa        . 01514)      ; �����
+     ((=jis-x0208-1978   . #x5147)     ; �����
+      (ideograph-daikanwa . 01514)     ; �����
       ))
     (ideograph-daikanwa . 01540)       ; �����
     ))
@@ -800,8 +800,8 @@
       )
      ((=big5-cdp         . #x8BB7)     ; ������
       )
-     ((japanese-jisx0208-1978    . #x5147)     ; �����
-      (ideograph-daikanwa        . 01514)      ; �����
+     ((=jis-x0208-1978   . #x5147)     ; �����
+      (ideograph-daikanwa . 01514)     ; �����
       ))
     (shinjigen-1       . 522)
     (shinjigen-2       . 522)
@@ -839,8 +839,8 @@
     (ideographic-radical . 13) ; ⼌
     (ideographic-strokes . 8)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x514A)       ; �����
-    (japanese-jisx0208         . #x514A)       ; �����
+    (=jis-x0208-1978   . #x514A)       ; �����
+    (japanese-jisx0208 . #x514A)       ; �����
     ))
 (define-char
   '((ideographic-radical . 13) ; ⼌
@@ -989,7 +989,7 @@
       )
      ((=ucs              . #x514D)     ; 免
       ))
-    (japanese-jisx0208-1978    . #x514B)       ; �����
+    (=jis-x0208-1978   . #x514B)       ; �����
     ))
 (define-char
   '((=>ucs             . #x20560)      ; 𠕠

diff --git a/lisp/utf-2000/Ideograph-R014-Cover.el b/lisp/utf-2000/Ideograph-R014-Cover.el
index 9ce7bd9..adfc1b5 100644 (file)
--- a/lisp/utf-2000/Ideograph-R014-Cover.el
+++ b/lisp/utf-2000/Ideograph-R014-Cover.el
@@ -486,10 +486,10 @@
       ))
     (shinjigen-1       . 529)
     (shinjigen-2       . 529)
-    (japanese-jisx0208-1978    . #x514D)       ; �����
-    (chinese-cns11643-6                . #x3544)       ; �����
-    (chinese-big5              . #xADDE)       ; ������
-    (ideograph-daikanwa                . 01587)        ; �����
+    (=jis-x0208-1978   . #x514D)       ; �����
+    (chinese-cns11643-6 . #x3544)      ; �����
+    (chinese-big5      . #xADDE)       ; ������
+    (ideograph-daikanwa . 01587)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        1587 0 3)

diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el
index 2688f05..be97d3e 100644 (file)
--- a/lisp/utf-2000/Ideograph-R015-Ice.el
+++ b/lisp/utf-2000/Ideograph-R015-Ice.el
@@ -261,7 +261,7 @@
     (ideographic-radical . 15) ; ⼎
     (ideographic-strokes . 5)
     (total-strokes      . 7)
-    (japanese-jisx0208-1978    . #x3A63)       ; �����
+    (=jis-x0208-1978   . #x3A63)       ; �����
     ))
 (define-char
   '((=>ucs             . #x51B4)       ; 冴
@@ -1174,9 +1174,9 @@
       )
      ((=ucs              . #x51AB)     ; 冫
       )
-     ((japanese-jisx0208-1978    . #x3E3E)     ; �����
-      (japanese-jisx0208         . #x3E3E)     ; �����
-      (ideograph-daikanwa        . 14516)      ; �����
+     ((=jis-x0208-1978   . #x3E3E)     ; �����
+      (japanese-jisx0208  . #x3E3E)    ; �����
+      (ideograph-daikanwa . 14516)     ; �����
       ))
     (ideograph-daikanwa . 01663)       ; �����
     (=jef-china3       . #x8CF0)       ; �����
@@ -1376,9 +1376,9 @@
       ))
     (shinjigen-1       . 553)
     (shinjigen-2       . 553)
-    (japanese-jisx0208-1978    . #x437C)       ; �����
-    (korean-ksc5601            . #x703D)       ; �����
-    (ideograph-daikanwa                . 01668)        ; �����
+    (=jis-x0208-1978   . #x437C)       ; �����
+    (korean-ksc5601    . #x703D)       ; �����
+    (ideograph-daikanwa . 01668)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        1668 0 1)
@@ -2385,9 +2385,9 @@
       ))
     (shinjigen-1       . 563)
     (shinjigen-2       . 563)
-    (japanese-jisx0208-1978    . #x515B)       ; �����
-    (japanese-jisx0208         . #x515B)       ; �����
-    (ideograph-daikanwa                . 01718)        ; �����
+    (=jis-x0208-1978   . #x515B)       ; �����
+    (japanese-jisx0208 . #x515B)       ; �����
+    (ideograph-daikanwa . 01718)       ; �����
     ))
 (define-char
   '((=>ucs             . #x51DB)       ; 凛

diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index f36e55a..904af2b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -209,12 +209,12 @@
       ))
     (shinjigen-1       . 599)
     (shinjigen-2       . 599)
-    (japanese-jisx0208-1978    . #x4A2C)       ; �����
-    (japanese-jisx0208         . #x4A2C)       ; �����
-    (korean-ksc5601            . #x5D42)       ; �����
-    (chinese-big5              . #xA4C0)       ; ������
-    (ideograph-daikanwa                . 01853)        ; �����
-    (=jef-china3               . #x44B5)       ; �����
+    (=jis-x0208-1978   . #x4A2C)       ; �����
+    (japanese-jisx0208 . #x4A2C)       ; �����
+    (korean-ksc5601    . #x5D42)       ; �����
+    (chinese-big5      . #xA4C0)       ; ������
+    (ideograph-daikanwa . 01853)       ; �����
+    (=jef-china3       . #x44B5)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        1853 0 0)
@@ -4156,12 +4156,12 @@
       ))
     (shinjigen-1       . 666)
     (shinjigen-2       . 666)
-    (japanese-jisx0208-1978    . #x476D)       ; �����
-    (korean-ksc5601            . #x5A4E)       ; �����
-    (chinese-cns11643-1                . #x544C)       ; �����
-    (chinese-big5              . #xADE9)       ; ������
-    (ideograph-daikanwa                . 02049)        ; �����
-    (=ucs                      . #x525D)       ; 剝
+    (=jis-x0208-1978   . #x476D)       ; �����
+    (korean-ksc5601    . #x5A4E)       ; �����
+    (chinese-cns11643-1 . #x544C)      ; �����
+    (chinese-big5      . #xADE9)       ; ������
+    (ideograph-daikanwa . 02049)       ; �����
+    (=ucs              . #x525D)       ; 剝
     ))
 (define-char
   '((ideographic-radical . 18) ; ⼑
@@ -5672,7 +5672,7 @@
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 10)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x414F)       ; �����
+    (=jis-x0208-1978   . #x414F)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        2127 0 2)

diff --git a/lisp/utf-2000/Ideograph-R021-Spoon.el b/lisp/utf-2000/Ideograph-R021-Spoon.el
index 3ec955e..2c8a4c2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R021-Spoon.el
+++ b/lisp/utf-2000/Ideograph-R021-Spoon.el
@@ -22,13 +22,13 @@
     (ideographic-strokes . 0)
     (total-strokes      . 2)
     (hanyu-dazidian    1 262 1)
-    (japanese-jisx0208-1978    . #x5238)       ; �����
-    (japanese-jisx0208         . #x5238)       ; �����
-    (chinese-cns11643-6                . #x212A)       ; �����
-    (ideograph-daikanwa                . 02571)        ; �����
-    (=big5-cdp                 . #x8BBA)       ; ������
-    (=jef-china3               . #x45AB)       ; �����
-    (=ucs                      . #x2090E)      ; 𠤎
+    (=jis-x0208-1978   . #x5238)       ; �����
+    (japanese-jisx0208 . #x5238)       ; �����
+    (chinese-cns11643-6 . #x212A)      ; �����
+    (ideograph-daikanwa . 02571)       ; �����
+    (=big5-cdp         . #x8BBA)       ; ������
+    (=jef-china3       . #x45AB)       ; �����
+    (=ucs              . #x2090E)      ; 𠤎
     ))
 (define-char
   '((ideographic-radical . 21) ; ⼔

diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index bb7b313..2f01cf7 100644 (file)
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -571,8 +571,8 @@
       )
      ((=ucs              . #x54C1)     ; 品
       ))
-    (japanese-jisx0208-1978    . #x523F)       ; �����
-    (japanese-jisx0208         . #x523F)       ; �����
+    (=jis-x0208-1978   . #x523F)       ; �����
+    (japanese-jisx0208 . #x523F)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        2691 0 2)

diff --git a/lisp/utf-2000/Ideograph-R026-Seal.el b/lisp/utf-2000/Ideograph-R026-Seal.el
index 44e3f97..bdd38d8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R026-Seal.el
+++ b/lisp/utf-2000/Ideograph-R026-Seal.el
@@ -917,10 +917,10 @@
     (hanyu-dazidian    1 318 3)
     (shinjigen-1       . 868)
     (shinjigen-2       . 868)
-    (japanese-jisx0208-1978    . #x362A)       ; �����
-    (korean-ksc5601            . #x4C4F)       ; �����
-    (chinese-big5              . #xADEB)       ; ������
-    (ideograph-daikanwa                . 02880)        ; �����
+    (=jis-x0208-1978   . #x362A)       ; �����
+    (korean-ksc5601    . #x4C4F)       ; �����
+    (chinese-big5      . #xADEB)       ; ������
+    (ideograph-daikanwa . 02880)       ; �����
     ))
 (define-char
   '((ideographic-radical . 26) ; ⼙

diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el
index 3a88903..1d5a50a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R027-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R027-Cliff.el
@@ -2131,8 +2131,8 @@
       )
      ((korean-ksc5601    . #x507E)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x3139)       ; �����
-    (=cbeta                    . 01085)        ; �����
+    (=jis-x0208-1978   . #x3139)       ; �����
+    (=cbeta            . 01085)        ; �����
     ))
 (define-char
   '((=>ucs             . #x53A9)       ; 厩
@@ -3032,8 +3032,8 @@
        ((=ucs              . #x5382)   ; 厂
        ))
       )
-     ((japanese-jisx0208-1978    . #x343A)     ; �����
-      (japanese-jisx0208         . #x343A)     ; �����
+     ((=jis-x0208-1978   . #x343A)     ; �����
+      (japanese-jisx0208  . #x343A)    ; �����
       ))
     (shinjigen-1       . 1285)
     (shinjigen-2       . 1285)

diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el
index 6cdb07d..c8e7af5 100644 (file)
--- a/lisp/utf-2000/Ideograph-R029-Again.el
+++ b/lisp/utf-2000/Ideograph-R029-Again.el
@@ -396,8 +396,8 @@
     (ideographic-radical . 29) ; ⼜
     (ideographic-strokes . 2)
     (total-strokes      . 4)
-    (japanese-jisx0208-1978    . #x3C7D)       ; �����
-    (japanese-jisx0208         . #x3C7D)       ; �����
+    (=jis-x0208-1978   . #x3C7D)       ; �����
+    (japanese-jisx0208 . #x3C7D)       ; �����
     ))
 (define-char
   '((=>ucs             . #x53CE)       ; 収

diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index 9f4621d..97d9786 100644 (file)
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -498,11 +498,11 @@
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 2)
     (total-strokes      . 5)
-    (japanese-jisx0208-1978    . #x3B4B)       ; �����
-    (japanese-jisx0208         . #x3B4B)       ; �����
-    (korean-ksc5601            . #x5E48)       ; �����
-    (ideograph-daikanwa                . 03249)        ; �����
-    (=jef-china3               . #x47B5)       ; �����
+    (=jis-x0208-1978   . #x3B4B)       ; �����
+    (japanese-jisx0208 . #x3B4B)       ; �����
+    (korean-ksc5601    . #x5E48)       ; �����
+    (ideograph-daikanwa . 03249)       ; �����
+    (=jef-china3       . #x47B5)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        3249 0 0 1)
@@ -1463,11 +1463,11 @@
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 3)
     (total-strokes      . 6)
-    (japanese-jisx0208-1978    . #x4D79)       ; �����
-    (japanese-jisx0208         . #x4D79)       ; �����
-    (korean-ksc5601            . #x5759)       ; �����
-    (ideograph-daikanwa                . 03299)        ; �����
-    (=jef-china3               . #x47B6)       ; �����
+    (=jis-x0208-1978   . #x4D79)       ; �����
+    (japanese-jisx0208 . #x4D79)       ; �����
+    (korean-ksc5601    . #x5759)       ; �����
+    (ideograph-daikanwa . 03299)       ; �����
+    (=jef-china3       . #x47B6)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        3299 0 1)
@@ -2411,10 +2411,10 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x4A2C)     ; �����
-      (japanese-jisx0208         . #x4A2C)     ; �����
-      (korean-ksc5601            . #x5D42)     ; �����
-      (ideograph-daikanwa        . 01853)      ; �����
+     ((=jis-x0208-1978   . #x4A2C)     ; �����
+      (japanese-jisx0208  . #x4A2C)    ; �����
+      (korean-ksc5601    . #x5D42)     ; �����
+      (ideograph-daikanwa . 01853)     ; �����
       ))
     (shinjigen-2       . 1008)
     (=jis-x0208                . #x5266)       ; �����
@@ -2793,10 +2793,10 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x4963)     ; �����
-      (japanese-jisx0208         . #x4963)     ; �����
-      (korean-ksc5601            . #x5D2B)     ; �����
-      (ideograph-daikanwa        . 19721)      ; �����
+     ((=jis-x0208-1978   . #x4963)     ; �����
+      (japanese-jisx0208  . #x4963)    ; �����
+      (korean-ksc5601    . #x5D2B)     ; �����
+      (ideograph-daikanwa . 19721)     ; �����
       ))
     (ideograph-daikanwa . 03361)       ; �����
     (=cbeta            . 00055)        ; �����
@@ -4500,8 +4500,8 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x5147)     ; �����
-      (ideograph-daikanwa        . 01514)      ; �����
+     ((=jis-x0208-1978   . #x5147)     ; �����
+      (ideograph-daikanwa . 01514)     ; �����
       ))
     (chinese-big5      . #xCBE4)       ; ������
     (ideograph-daikanwa . 03435)       ; �����
@@ -6839,10 +6839,10 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x3872)     ; �����
-      (japanese-jisx0208         . #x3872)     ; �����
-      (korean-ksc5601            . #x4E5F)     ; �����
-      (ideograph-daikanwa        . 00291)      ; �����
+     ((=jis-x0208-1978   . #x3872)     ; �����
+      (japanese-jisx0208  . #x3872)    ; �����
+      (korean-ksc5601    . #x4E5F)     ; �����
+      (ideograph-daikanwa . 00291)     ; �����
       ))
     (shinjigen-2       . 1062)
     (=jis-x0208                . #x527B)       ; �����
@@ -9045,9 +9045,9 @@
      ((korean-ksc5601    . #x752B)     ; �����
       (ideograph-daikanwa . 29263)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x3E25)       ; �����
-    (korean-ksc5601            . #x747A)       ; �����
-    (ideograph-daikanwa                . 03646)        ; �����
+    (=jis-x0208-1978   . #x3E25)       ; �����
+    (korean-ksc5601    . #x747A)       ; �����
+    (ideograph-daikanwa . 03646)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        3646 0 1)
@@ -11804,7 +11804,7 @@
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x533A)       ; �����
+    (=jis-x0208-1978   . #x533A)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5533)       ; 唳
@@ -11995,8 +11995,8 @@
       )
      ((ideograph-daikanwa . 13628)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x5330)       ; �����
-    (ideograph-daikanwa                . 03774)        ; �����
+    (=jis-x0208-1978   . #x5330)       ; �����
+    (ideograph-daikanwa . 03774)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        3774 0 2)
@@ -12585,14 +12585,14 @@
       )
      ((=ucs              . #x8C56)     ; 豖
       ))
-    (japanese-jisx0208-1978    . #x426F)       ; �����
-    (chinese-gb2312            . #x5744)       ; �����
-    (korean-ksc5601            . #x7672)       ; �����
-    (=iso-ir165                        . #x5744)       ; �����
-    (chinese-cns11643-1                . #x593B)       ; �����
-    (chinese-big5              . #xB0D6)       ; ������
-    (ideograph-daikanwa                . 03801)        ; �����
-    (=ucs                      . #x5544)       ; 啄
+    (=jis-x0208-1978   . #x426F)       ; �����
+    (chinese-gb2312    . #x5744)       ; �����
+    (korean-ksc5601    . #x7672)       ; �����
+    (=iso-ir165                . #x5744)       ; �����
+    (chinese-cns11643-1 . #x593B)      ; �����
+    (chinese-big5      . #xB0D6)       ; ������
+    (ideograph-daikanwa . 03801)       ; �����
+    (=ucs              . #x5544)       ; 啄
     ))
 (define-char
   '((=>ucs             . #x5544)       ; 啄
@@ -12856,9 +12856,9 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x3A53)     ; �����
-      (korean-ksc5601            . #x737A)     ; �����
-      (ideograph-daikanwa        . 40116)      ; �����
+     ((=jis-x0208-1978   . #x3A53)     ; �����
+      (korean-ksc5601    . #x737A)     ; �����
+      (ideograph-daikanwa . 40116)     ; �����
       ))
     (chinese-big5      . #xD4AA)       ; ������
     (ideograph-daikanwa . 03809)       ; �����
@@ -13582,15 +13582,15 @@
       ))
     (shinjigen-1       . 1101)
     (shinjigen-2       . 1103)
-    (japanese-jisx0208-1978    . #x3022)       ; �����
-    (korean-ksc5601            . #x642F)       ; �����
-    (japanese-jisx0212         . #x3560)       ; �����
-    (chinese-cns11643-1                . #x593C)       ; �����
-    (=jis-x0213-1-2000         . #x2F28)       ; �����
-    (chinese-gb12345           . #x5146)       ; 啞
-    (chinese-big5              . #xB0D7)       ; ������
-    (ideograph-daikanwa                . 03835)        ; �����
-    (=ucs                      . #x555E)       ; 啞
+    (=jis-x0208-1978   . #x3022)       ; �����
+    (korean-ksc5601    . #x642F)       ; �����
+    (japanese-jisx0212 . #x3560)       ; �����
+    (chinese-cns11643-1 . #x593C)      ; �����
+    (=jis-x0213-1-2000 . #x2F28)       ; �����
+    (chinese-gb12345   . #x5146)       ; 啞
+    (chinese-big5      . #xB0D7)       ; ������
+    (ideograph-daikanwa . 03835)       ; �����
+    (=ucs              . #x555E)       ; 啞
     ))
 (define-char
   '((morohashi-daikanwa        3835 0 8)
@@ -15177,9 +15177,9 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x3D40)     ; �����
-      (japanese-jisx0208         . #x3D40)     ; �����
-      (ideograph-daikanwa        . 14622)      ; �����
+     ((=jis-x0208-1978   . #x3D40)     ; �����
+      (japanese-jisx0208  . #x3D40)    ; �����
+      (ideograph-daikanwa . 14622)     ; �����
       ))
     (ideograph-daikanwa . 03905)       ; �����
     (=cbeta            . 02208)        ; �����
@@ -16326,16 +16326,16 @@
       )
      ((=ucs              . #x66F7)     ; 曷
       ))
-    (japanese-jisx0208-1978    . #x3365)       ; �����
-    (chinese-gb2312            . #x3A48)       ; �����
-    (korean-ksc5601            . #x4A62)       ; �����
-    (=iso-ir165                        . #x3A48)       ; �����
-    (chinese-cns11643-1                . #x5E42)       ; �����
-    (=jis-x0213-1-2000         . #x2F2C)       ; �����
-    (chinese-big5              . #xB3DC)       ; ������
-    (ideograph-daikanwa                . 03960)        ; �����
-    (=ucs@jis                  . #xFA36)       ; 喝
-    (=ucs                      . #x559D)       ; 喝
+    (=jis-x0208-1978   . #x3365)       ; �����
+    (chinese-gb2312    . #x3A48)       ; �����
+    (korean-ksc5601    . #x4A62)       ; �����
+    (=iso-ir165                . #x3A48)       ; �����
+    (chinese-cns11643-1 . #x5E42)      ; �����
+    (=jis-x0213-1-2000 . #x2F2C)       ; �����
+    (chinese-big5      . #xB3DC)       ; ������
+    (ideograph-daikanwa . 03960)       ; �����
+    (=ucs@jis          . #xFA36)       ; 喝
+    (=ucs              . #x559D)       ; 喝
     ))
 (define-char
   '((=>ucs*            . #x559D)       ; 喝
@@ -16730,8 +16730,8 @@
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x5348)       ; �����
-    (japanese-jisx0208         . #x5348)       ; �����
+    (=jis-x0208-1978   . #x5348)       ; �����
+    (japanese-jisx0208 . #x5348)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        3979 0 1)
@@ -17437,9 +17437,9 @@
       (chinese-cns11643-1 . #x537A)    ; �����
       (ideograph-daikanwa . 44014)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x3674)       ; �����
-    (ideograph-daikanwa                . 04015)        ; �����
-    (=cbeta                    . 00068)        ; �����
+    (=jis-x0208-1978   . #x3674)       ; �����
+    (ideograph-daikanwa . 04015)       ; �����
+    (=cbeta            . 00068)        ; �����
     ))
 (define-char
   '((=>ucs             . #x55B0)       ; 喰
@@ -17489,10 +17489,10 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x377A)     ; �����
-      (japanese-jisx0208         . #x377A)     ; �����
-      (korean-ksc5601            . #x4B6F)     ; �����
-      (ideograph-daikanwa        . 09574)      ; �����
+     ((=jis-x0208-1978   . #x377A)     ; �����
+      (japanese-jisx0208  . #x377A)    ; �����
+      (korean-ksc5601    . #x4B6F)     ; �����
+      (ideograph-daikanwa . 09574)     ; �����
       ))
     (ideograph-daikanwa . 04016)       ; �����
     (=cbeta            . 00067)        ; �����
@@ -23412,9 +23412,9 @@
       )
      ((ideograph-daikanwa . 14374)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x535E)       ; �����
-    (korean-ksc5601            . #x703F)       ; �����
-    (ideograph-daikanwa                . 04254)        ; �����
+    (=jis-x0208-1978   . #x535E)       ; �����
+    (korean-ksc5601    . #x703F)       ; �����
+    (ideograph-daikanwa . 04254)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        4254 0 1)
@@ -24019,8 +24019,8 @@
      ((korean-ksc5601    . #x706E)     ; �����
       (ideograph-daikanwa . 07445)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x313D)       ; �����
-    (ideograph-daikanwa                . 04286)        ; �����
+    (=jis-x0208-1978   . #x313D)       ; �����
+    (ideograph-daikanwa . 04286)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        4286 0 2)
@@ -24387,8 +24387,8 @@
       (korean-ksc5601    . #x7174)     ; �����
       (ideograph-daikanwa . 14299)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x4139)       ; �����
-    (ideograph-daikanwa                . 04303)        ; �����
+    (=jis-x0208-1978   . #x4139)       ; �����
+    (ideograph-daikanwa . 04303)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        4303 0 2)
@@ -25320,10 +25320,10 @@
       ))
     (shinjigen-1       . 1247)
     (shinjigen-2       . 1247)
-    (japanese-jisx0208-1978    . #x4A2E)       ; �����
-    (japanese-jisx0208         . #x4A2E)       ; �����
-    (korean-ksc5601            . #x5D44)       ; �����
-    (ideograph-daikanwa                . 04345)        ; �����
+    (=jis-x0208-1978   . #x4A2E)       ; �����
+    (japanese-jisx0208 . #x4A2E)       ; �����
+    (korean-ksc5601    . #x5D44)       ; �����
+    (ideograph-daikanwa . 04345)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        4345 0 0)
@@ -27006,11 +27006,11 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x465C)     ; �����
-      (ideograph-daikanwa        . 43381)      ; �����
+     ((=jis-x0208-1978   . #x465C)     ; �����
+      (ideograph-daikanwa . 43381)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x4655)       ; �����
-    (ideograph-daikanwa                . 04429)        ; �����
+    (=jis-x0208-1978   . #x4655)       ; �����
+    (ideograph-daikanwa . 04429)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        4429 0 1)
@@ -28845,14 +28845,14 @@
       )
      ((=ucs              . #x9F52)     ; 齒
       ))
-    (japanese-jisx0208-1978    . #x337A)       ; �����
-    (japanese-jisx0212         . #x365A)       ; �����
-    (chinese-cns11643-2                . #x614B)       ; �����
-    (=jis-x0213-1-2000         . #x2F3A)       ; �����
-    (chinese-gb12345           . #x4476)       ; 嚙
-    (chinese-big5              . #xEFBF)       ; ������
-    (ideograph-daikanwa                . 04516)        ; �����
-    (=ucs                      . #x5699)       ; 嚙
+    (=jis-x0208-1978   . #x337A)       ; �����
+    (japanese-jisx0212 . #x365A)       ; �����
+    (chinese-cns11643-2 . #x614B)      ; �����
+    (=jis-x0213-1-2000 . #x2F3A)       ; �����
+    (chinese-gb12345   . #x4476)       ; 嚙
+    (chinese-big5      . #xEFBF)       ; ������
+    (ideograph-daikanwa . 04516)       ; �����
+    (=ucs              . #x5699)       ; 嚙
     ))
 (define-char
   '((morohashi-daikanwa        4516 0 5)
@@ -29448,9 +29448,9 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x6549)     ; �����
-      (japanese-jisx0208         . #x6549)     ; �����
-      (ideograph-daikanwa        . 27645)      ; �����
+     ((=jis-x0208-1978   . #x6549)     ; �����
+      (japanese-jisx0208  . #x6549)    ; �����
+      (ideograph-daikanwa . 27645)     ; �����
       ))
     (ideograph-daikanwa . 04542)       ; �����
     (=cbeta            . 03529)        ; �����
@@ -29590,9 +29590,9 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x6E43)     ; �����
-      (japanese-jisx0208         . #x6E43)     ; �����
-      (ideograph-daikanwa        . 39656)      ; �����
+     ((=jis-x0208-1978   . #x6E43)     ; �����
+      (japanese-jisx0208  . #x6E43)    ; �����
+      (ideograph-daikanwa . 39656)     ; �����
       ))
     (=cbeta            . 03325)        ; �����
     ))
@@ -29624,7 +29624,7 @@
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 15)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x536B)       ; �����
+    (=jis-x0208-1978   . #x536B)       ; �����
     ))
 (define-char
   '((ideographic-radical . 30) ; ⼝
@@ -31247,9 +31247,9 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x6663)     ; �����
-      (japanese-jisx0208         . #x6663)     ; �����
-      (ideograph-daikanwa        . 29179)      ; �����
+     ((=jis-x0208-1978   . #x6663)     ; �����
+      (japanese-jisx0208  . #x6663)    ; �����
+      (ideograph-daikanwa . 29179)     ; �����
       ))
     (shinjigen-1       . 1292)
     (shinjigen-2       . 1292)
@@ -31273,8 +31273,8 @@
     (total-strokes      . 21)
     (shinjigen-1       . 1292)
     (shinjigen-2       . 1292)
-    (japanese-jisx0208-1978    . #x5371)       ; �����
-    (japanese-jisx0208         . #x5371)       ; �����
+    (=jis-x0208-1978   . #x5371)       ; �����
+    (japanese-jisx0208 . #x5371)       ; �����
     ))
 (define-char
   '((=>ucs             . #x56C1)       ; 囁
@@ -31629,10 +31629,10 @@
       )
      ((=ucs              . #x53E3)     ; 口
       )
-     ((japanese-jisx0208-1978    . #x4E6F)     ; �����
-      (japanese-jisx0208         . #x4E6F)     ; �����
-      (korean-ksc5601            . #x5572)     ; �����
-      (ideograph-daikanwa        . 47663)      ; �����
+     ((=jis-x0208-1978   . #x4E6F)     ; �����
+      (japanese-jisx0208  . #x4E6F)    ; �����
+      (korean-ksc5601    . #x5572)     ; �����
+      (ideograph-daikanwa . 47663)     ; �����
       ))
     (ideograph-daikanwa . 04628)       ; �����
     (=cbeta            . 00691)        ; �����
@@ -31807,16 +31807,16 @@
        ((=big5-cdp         . #x8B67)   ; ������
        ))
       ))
-    (japanese-jisx0208-1978    . #x4739)       ; �����
-    (chinese-gb2312            . #x4452)       ; �����
-    (korean-ksc5601            . #x5225)       ; �����
-    (japanese-jisx0212         . #x366C)       ; �����
-    (=iso-ir165                        . #x4452)       ; �����
-    (chinese-cns11643-1                . #x7B5A)       ; �����
-    (=jis-x0213-1-2000         . #x2F40)       ; �����
-    (chinese-big5              . #xC56E)       ; ������
-    (ideograph-daikanwa                . 04633)        ; �����
-    (=ucs                      . #x56CA)       ; 囊
+    (=jis-x0208-1978   . #x4739)       ; �����
+    (chinese-gb2312    . #x4452)       ; �����
+    (korean-ksc5601    . #x5225)       ; �����
+    (japanese-jisx0212 . #x366C)       ; �����
+    (=iso-ir165                . #x4452)       ; �����
+    (chinese-cns11643-1 . #x7B5A)      ; �����
+    (=jis-x0213-1-2000 . #x2F40)       ; �����
+    (chinese-big5      . #xC56E)       ; ������
+    (ideograph-daikanwa . 04633)       ; �����
+    (=ucs              . #x56CA)       ; 囊
     ))
 (define-char
   '((ideographic-radical . 30) ; ⼝

diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el
index 4d70c27..f3c65ec 100644 (file)
--- a/lisp/utf-2000/Ideograph-R031-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el
@@ -2535,12 +2535,12 @@
      ((=ucs              . #x97CB)     ; 韋
       ))
     (shinjigen-2       . 1309)
-    (japanese-jisx0208-1978    . #x5423)       ; �����
-    (japanese-jisx0208         . #x5423)       ; �����
-    (korean-ksc5601            . #x6A4C)       ; �����
-    (chinese-cns11643-1                . #x5E58)       ; �����
-    (chinese-big5              . #xB3F2)       ; ������
-    (ideograph-daikanwa                . 04806)        ; �����
+    (=jis-x0208-1978   . #x5423)       ; �����
+    (japanese-jisx0208 . #x5423)       ; �����
+    (korean-ksc5601    . #x6A4C)       ; �����
+    (chinese-cns11643-1 . #x5E58)      ; �����
+    (chinese-big5      . #xB3F2)       ; ������
+    (ideograph-daikanwa . 04806)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        4806 0 0)

diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el
index 4dd6cd7..8ac3f57 100644 (file)
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -711,11 +711,11 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 4)
     (total-strokes      . 7)
-    (japanese-jisx0208-1978    . #x3651)       ; �����
-    (chinese-gb2312            . #x3E79)       ; �����
-    (japanese-jisx0208         . #x3651)       ; �����
-    (=iso-ir165                        . #x3E79)       ; �����
-    (=ucs                      . #x5747)       ; 均
+    (=jis-x0208-1978   . #x3651)       ; �����
+    (chinese-gb2312    . #x3E79)       ; �����
+    (japanese-jisx0208 . #x3651)       ; �����
+    (=iso-ir165                . #x3E79)       ; �����
+    (=ucs              . #x5747)       ; 均
     ))
 (define-char
   '((=>ucs             . #x5747)       ; 均
@@ -4820,9 +4820,9 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x3E7D)       ; �����
-    (japanese-jisx0208         . #x3E7D)       ; �����
-    (korean-ksc5601            . #x6350)       ; �����
+    (=jis-x0208-1978   . #x3E7D)       ; �����
+    (japanese-jisx0208 . #x3E7D)       ; �����
+    (korean-ksc5601    . #x6350)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        5188 0 3)
@@ -5302,8 +5302,8 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x5444)       ; �����
-    (ideograph-daikanwa                . 05217)        ; �����
+    (=jis-x0208-1978   . #x5444)       ; �����
+    (ideograph-daikanwa . 05217)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        5217 0 1)
@@ -6242,17 +6242,17 @@
     (total-strokes      . 12)
     (hanyu-dazidian    1 459 14)
     (shinjigen-2       . 1429)
-    (japanese-jisx0208-1978    . #x3646)       ; �����
-    (japanese-jisx0208         . #x7421)       ; �����
-    (korean-ksc5601            . #x686B)       ; �����
-    (chinese-cns11643-1                . #x5E59)       ; �����
-    (=jis-x0208-1990           . #x7421)       ; �����
-    (chinese-gb12345           . #x5222)       ; 堯
-    (=gt-pj-1                  . #x7421)       ; 堯
-    (chinese-big5              . #xB3F3)       ; ������
-    (ideograph-daikanwa                . 05272)        ; �����
-    (=gt-k                     . 09244)        ; ������
-    (=ucs                      . #x582F)       ; 堯
+    (=jis-x0208-1978   . #x3646)       ; �����
+    (japanese-jisx0208 . #x7421)       ; �����
+    (korean-ksc5601    . #x686B)       ; �����
+    (chinese-cns11643-1 . #x5E59)      ; �����
+    (=jis-x0208-1990   . #x7421)       ; �����
+    (chinese-gb12345   . #x5222)       ; 堯
+    (=gt-pj-1          . #x7421)       ; 堯
+    (chinese-big5      . #xB3F3)       ; ������
+    (ideograph-daikanwa . 05272)       ; �����
+    (=gt-k             . 09244)        ; ������
+    (=ucs              . #x582F)       ; 堯
     ))
 (define-char
   '((morohashi-daikanwa        5272 0 8)
@@ -6378,9 +6378,9 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x4548)       ; �����
-    (korean-ksc5601            . #x5372)       ; �����
-    (ideograph-daikanwa                . 05279)        ; �����
+    (=jis-x0208-1978   . #x4548)       ; �����
+    (korean-ksc5601    . #x5372)       ; �����
+    (ideograph-daikanwa . 05279)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        5279 0 2)
@@ -7451,10 +7451,10 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x4564)       ; �����
-    (korean-ksc5601            . #x5352)       ; �����
-    (chinese-big5              . #xB6ED)       ; ������
-    (ideograph-daikanwa                . 05340)        ; �����
+    (=jis-x0208-1978   . #x4564)       ; �����
+    (korean-ksc5601    . #x5352)       ; �����
+    (chinese-big5      . #xB6ED)       ; ������
+    (ideograph-daikanwa . 05340)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        5340 0 0)
@@ -7559,12 +7559,12 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x444D)       ; �����
-    (korean-ksc5601            . #x7540)       ; �����
-    (=jis-x0213-1-2000         . #x2F57)       ; �����
-    (ideograph-daikanwa                . 05345)        ; �����
-    (=ucs@ks                   . #x585A)       ; 塚
-    (=ucs                      . #xFA10)       ; 塚
+    (=jis-x0208-1978   . #x444D)       ; �����
+    (korean-ksc5601    . #x7540)       ; �����
+    (=jis-x0213-1-2000 . #x2F57)       ; �����
+    (ideograph-daikanwa . 05345)       ; �����
+    (=ucs@ks           . #x585A)       ; 塚
+    (=ucs              . #xFA10)       ; 塚
     ))
 (define-char
   '((=>ucs@jis         . #xFA10)       ; 塚
@@ -7786,12 +7786,12 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x4536)       ; �����
-    (korean-ksc5601            . #x6E73)       ; �����
-    (japanese-jisx0212         . #x3834)       ; �����
-    (=jis-x0213-1-2000         . #x2F58)       ; �����
-    (ideograph-daikanwa                . 05355)        ; �����
-    (=ucs@jis                  . #x5861)       ; �����
+    (=jis-x0208-1978   . #x4536)       ; �����
+    (korean-ksc5601    . #x6E73)       ; �����
+    (japanese-jisx0212 . #x3834)       ; �����
+    (=jis-x0213-1-2000 . #x2F58)       ; �����
+    (ideograph-daikanwa . 05355)       ; �����
+    (=ucs@jis          . #x5861)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        5355 0 0)
@@ -9875,10 +9875,10 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x5453)       ; �����
-    (japanese-jisx0208         . #x5453)       ; �����
-    (chinese-big5              . #xE54A)       ; ������
-    (ideograph-daikanwa                . 05472)        ; �����
+    (=jis-x0208-1978   . #x5453)       ; �����
+    (japanese-jisx0208 . #x5453)       ; �����
+    (chinese-big5      . #xE54A)       ; ������
+    (ideograph-daikanwa . 05472)       ; �����
     ))
 (define-char
   '((=>ucs             . #x58AB)       ; 墫

diff --git a/lisp/utf-2000/Ideograph-R033-Scholar.el b/lisp/utf-2000/Ideograph-R033-Scholar.el
index cc48be8..64afe17 100644 (file)
--- a/lisp/utf-2000/Ideograph-R033-Scholar.el
+++ b/lisp/utf-2000/Ideograph-R033-Scholar.el
@@ -396,15 +396,15 @@
      ((=big5-cdp         . #x8A49)     ; ������
       ))
     (shinjigen-2       . 1531)
-    (japanese-jisx0208-1978    . #x5464)       ; �����
-    (japanese-jisx0208         . #x445B)       ; �����
-    (chinese-cns11643-3                . #x3477)       ; �����
-    (=jis-x0208-1990           . #x445B)       ; �����
-    (=gt-pj-1                  . #x445B)       ; 壷
-    (ideograph-daikanwa                . 05657)        ; �����
-    (=gt-k                     . 07837)        ; ������
-    (=cbeta                    . 06724)        ; �����
-    (=ucs                      . #x58F7)       ; 壷
+    (=jis-x0208-1978   . #x5464)       ; �����
+    (japanese-jisx0208 . #x445B)       ; �����
+    (chinese-cns11643-3 . #x3477)      ; �����
+    (=jis-x0208-1990   . #x445B)       ; �����
+    (=gt-pj-1          . #x445B)       ; 壷
+    (ideograph-daikanwa . 05657)       ; �����
+    (=gt-k             . 07837)        ; ������
+    (=cbeta            . 06724)        ; �����
+    (=ucs              . #x58F7)       ; 壷
     ))
 (define-char
   '((ideographic-radical . 33) ; ⼠
@@ -465,17 +465,17 @@
      ((=big5-cdp         . #x8DE8)     ; ������
       ))
     (shinjigen-2       . 1531)
-    (japanese-jisx0208-1978    . #x445B)       ; �����
-    (japanese-jisx0208         . #x5464)       ; �����
-    (korean-ksc5601            . #x7B3E)       ; �����
-    (chinese-cns11643-1                . #x5E63)       ; �����
-    (=jis-x0208-1990           . #x5464)       ; �����
-    (chinese-gb12345           . #x3A78)       ; 壺
-    (=gt-pj-1                  . #x5464)       ; 壺
-    (chinese-big5              . #xB3FD)       ; ������
-    (ideograph-daikanwa                . 05662)        ; �����
-    (=gt-k                     . 09175)        ; ������
-    (=ucs                      . #x58FA)       ; 壺
+    (=jis-x0208-1978   . #x445B)       ; �����
+    (japanese-jisx0208 . #x5464)       ; �����
+    (korean-ksc5601    . #x7B3E)       ; �����
+    (chinese-cns11643-1 . #x5E63)      ; �����
+    (=jis-x0208-1990   . #x5464)       ; �����
+    (chinese-gb12345   . #x3A78)       ; 壺
+    (=gt-pj-1          . #x5464)       ; 壺
+    (chinese-big5      . #xB3FD)       ; ������
+    (ideograph-daikanwa . 05662)       ; �����
+    (=gt-k             . 09175)        ; ������
+    (=ucs              . #x58FA)       ; 壺
     ))
 (define-char
   '((ideographic-radical . 33) ; ⼠

diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el
index e18359f..581c53f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R038-Woman.el
+++ b/lisp/utf-2000/Ideograph-R038-Woman.el
@@ -1899,11 +1899,11 @@
       (ideograph-daikanwa . 08775)     ; �����
       ))
     (shinjigen-2       . 1628)
-    (japanese-jisx0208-1978    . #x3B50)       ; �����
-    (japanese-jisx0208         . #x3B50)       ; �����
-    (ideograph-daikanwa                . 06165)        ; �����
-    (=cbeta                    . 00106)        ; �����
-    (=ucs                      . #x59C9)       ; 姉
+    (=jis-x0208-1978   . #x3B50)       ; �����
+    (japanese-jisx0208 . #x3B50)       ; �����
+    (ideograph-daikanwa . 06165)       ; �����
+    (=cbeta            . 00106)        ; �����
+    (=ucs              . #x59C9)       ; 姉
     ))
 (define-char
   '((=>ucs             . #x59C9)       ; 姉
@@ -2471,10 +2471,10 @@
     (ideographic-strokes . 6)
     (total-strokes      . 9)
     (shinjigen-2       . 1662)
-    (japanese-jisx0208-1978    . #x552D)       ; �����
-    (japanese-jisx0208         . #x552D)       ; �����
-    (korean-ksc5601            . #x686E)       ; �����
-    (ideograph-daikanwa                . 06202)        ; �����
+    (=jis-x0208-1978   . #x552D)       ; �����
+    (japanese-jisx0208 . #x552D)       ; �����
+    (korean-ksc5601    . #x686E)       ; �����
+    (ideograph-daikanwa . 06202)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        6202 0 0)
@@ -3893,10 +3893,10 @@
       )
      ((=ucs              . #x5973)     ; 女
       )
-     ((japanese-jisx0208-1978    . #x3939)     ; �����
-      (japanese-jisx0208         . #x3939)     ; �����
-      (korean-ksc5601            . #x4C5A)     ; �����
-      (ideograph-daikanwa        . 14283)      ; �����
+     ((=jis-x0208-1978   . #x3939)     ; �����
+      (japanese-jisx0208  . #x3939)    ; �����
+      (korean-ksc5601    . #x4C5A)     ; �����
+      (ideograph-daikanwa . 14283)     ; �����
       ))
     (ideograph-daikanwa . 06293)       ; �����
     (=cbeta            . 01755)        ; �����
@@ -4492,14 +4492,14 @@
   '((ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x4A5A)       ; �����
-    (chinese-gb2312            . #x4364)       ; �����
-    (korean-ksc5601            . #x5834)       ; �����
-    (=iso-ir165                        . #x4364)       ; �����
-    (chinese-big5              . #xAE59)       ; ������
-    (ideograph-daikanwa                . 06337)        ; �����
-    (=jef-china3               . #x49EE)       ; �����
-    (=ucs                      . #x5A29)       ; 娩
+    (=jis-x0208-1978   . #x4A5A)       ; �����
+    (chinese-gb2312    . #x4364)       ; �����
+    (korean-ksc5601    . #x5834)       ; �����
+    (=iso-ir165                . #x4364)       ; �����
+    (chinese-big5      . #xAE59)       ; ������
+    (ideograph-daikanwa . 06337)       ; �����
+    (=jef-china3       . #x49EE)       ; �����
+    (=ucs              . #x5A29)       ; 娩
     ))
 (define-char
   '((=>ucs             . #x5A29)       ; 娩
@@ -4944,12 +4944,12 @@
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x5538)       ; �����
-    (chinese-gb2312            . #x4822)       ; �����
-    (japanese-jisx0208         . #x5538)       ; �����
-    (=iso-ir165                        . #x4822)       ; �����
-    (chinese-big5              . #xB0F9)       ; ������
-    (=ucs                      . #x5A36)       ; 娶
+    (=jis-x0208-1978   . #x5538)       ; �����
+    (chinese-gb2312    . #x4822)       ; �����
+    (japanese-jisx0208 . #x5538)       ; �����
+    (=iso-ir165                . #x4822)       ; �����
+    (chinese-big5      . #xB0F9)       ; ������
+    (=ucs              . #x5A36)       ; 娶
     ))
 (define-char
   '((=>ucs             . #x5A36)       ; 娶
@@ -7034,9 +7034,9 @@
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x4932)       ; �����
-    (korean-ksc5601            . #x6A30)       ; �����
-    (ideograph-daikanwa                . 06516)        ; �����
+    (=jis-x0208-1978   . #x4932)       ; �����
+    (korean-ksc5601    . #x6A30)       ; �����
+    (ideograph-daikanwa . 06516)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        6516 0 2)
@@ -7064,10 +7064,10 @@
       )
      ((=ucs              . #x5973)     ; 女
       )
-     ((japanese-jisx0208-1978    . #x4A58)     ; �����
-      (japanese-jisx0208         . #x4A58)     ; �����
-      (korean-ksc5601            . #x7835)     ; �����
-      (ideograph-daikanwa        . 00659)      ; �����
+     ((=jis-x0208-1978   . #x4A58)     ; �����
+      (japanese-jisx0208  . #x4A58)    ; �����
+      (korean-ksc5601    . #x7835)     ; �����
+      (ideograph-daikanwa . 00659)     ; �����
       ))
     (ideograph-daikanwa . 06517)       ; �����
     ))
@@ -8233,8 +8233,8 @@
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x553D)       ; �����
-    (ideograph-daikanwa                . 06597)        ; �����
+    (=jis-x0208-1978   . #x553D)       ; �����
+    (ideograph-daikanwa . 06597)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5ABE)       ; 媾
@@ -8562,9 +8562,9 @@
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x3779)       ; �����
-    (korean-ksc5601            . #x7A6E)       ; �����
-    (ideograph-daikanwa                . 06618)        ; �����
+    (=jis-x0208-1978   . #x3779)       ; �����
+    (korean-ksc5601    . #x7A6E)       ; �����
+    (ideograph-daikanwa . 06618)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        6618 0 2)

diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el
index 8731e40..75a890b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R040-Roof.el
+++ b/lisp/utf-2000/Ideograph-R040-Roof.el
@@ -2431,7 +2431,7 @@
     (ideographic-radical . 40) ; ⼧
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x5563)       ; �����
+    (=jis-x0208-1978   . #x5563)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5BC3)       ; 寃
@@ -3279,8 +3279,8 @@
       (=jis-x0213-1-2000  . #x4F58)    ; �����
       (ideograph-daikanwa . 07098)     ; �����
       )
-     ((japanese-jisx0208-1978    . #x5147)     ; �����
-      (ideograph-daikanwa        . 01514)      ; �����
+     ((=jis-x0208-1978   . #x5147)     ; �����
+      (ideograph-daikanwa . 01514)     ; �����
       ))
     (japanese-jisx0212 . #x3A60)       ; �����
     (ideograph-daikanwa . 07255)       ; �����
@@ -3299,8 +3299,8 @@
       )
      ((=ucs              . #x5B93)     ; 宓
       )
-     ((japanese-jisx0208-1978    . #x5147)     ; �����
-      (ideograph-daikanwa        . 01514)      ; �����
+     ((=jis-x0208-1978   . #x5147)     ; �����
+      (ideograph-daikanwa . 01514)     ; �����
       ))
     (chinese-cns11643-3 . #x4074)      ; �����
     ))

diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el
index 0ec37c0..f69c34e 100644 (file)
--- a/lisp/utf-2000/Ideograph-R044-Corpse.el
+++ b/lisp/utf-2000/Ideograph-R044-Corpse.el
@@ -883,10 +883,10 @@
     (ideographic-radical . 44) ; ⼫
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x367D)       ; �����
-    (korean-ksc5601            . #x605A)       ; �����
-    (chinese-big5              . #xAE68)       ; ������
-    (ideograph-daikanwa                . 07709)        ; �����
+    (=jis-x0208-1978   . #x367D)       ; �����
+    (korean-ksc5601    . #x605A)       ; �����
+    (chinese-big5      . #xAE68)       ; ������
+    (ideograph-daikanwa . 07709)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        7709 0 2)
@@ -1201,11 +1201,11 @@
   '((ideographic-radical . 44) ; ⼫
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x5622)       ; �����
-    (korean-ksc5601            . #x5C33)       ; �����
-    (chinese-cns11643-3                . #x3543)       ; �����
-    (ideograph-daikanwa                . 07734)        ; �����
-    (=ucs                      . #x5C5B)       ; 屛
+    (=jis-x0208-1978   . #x5622)       ; �����
+    (korean-ksc5601    . #x5C33)       ; �����
+    (chinese-cns11643-3 . #x3543)      ; �����
+    (ideograph-daikanwa . 07734)       ; �����
+    (=ucs              . #x5C5B)       ; 屛
     ))
 (define-char
   '((ideographic-radical . 44) ; ⼫
@@ -1458,11 +1458,11 @@
     (ideographic-radical . 44) ; ⼫
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x454B)       ; �����
-    (korean-ksc5601            . #x5375)       ; �����
-    (chinese-cns11643-6                . #x477B)       ; �����
-    (chinese-big5              . #xB14F)       ; ������
-    (ideograph-daikanwa                . 07761)        ; �����
+    (=jis-x0208-1978   . #x454B)       ; �����
+    (korean-ksc5601    . #x5375)       ; �����
+    (chinese-cns11643-6 . #x477B)      ; �����
+    (chinese-big5      . #xB14F)       ; ������
+    (ideograph-daikanwa . 07761)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        7761 0 3)
@@ -1769,14 +1769,14 @@
   '((ideographic-radical . 44) ; ⼫
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x3C48)       ; �����
-    (korean-ksc5601            . #x5726)       ; �����
-    (japanese-jisx0212         . #x3A7A)       ; �����
-    (=jis-x0213-1-2000         . #x4F60)       ; �����
-    (chinese-gb12345           . #x4245)       ; 屢
-    (chinese-big5              . #xB9F0)       ; ������
-    (ideograph-daikanwa                . 07787)        ; �����
-    (=ucs                      . #x5C62)       ; 屢
+    (=jis-x0208-1978   . #x3C48)       ; �����
+    (korean-ksc5601    . #x5726)       ; �����
+    (japanese-jisx0212 . #x3A7A)       ; �����
+    (=jis-x0213-1-2000 . #x4F60)       ; �����
+    (chinese-gb12345   . #x4245)       ; 屢
+    (chinese-big5      . #xB9F0)       ; ������
+    (ideograph-daikanwa . 07787)       ; �����
+    (=ucs              . #x5C62)       ; 屢
     ))
 (define-char
   '((=>ucs             . #x5C62)       ; 屢

diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el
index 6a69054..03f99fb 100644 (file)
--- a/lisp/utf-2000/Ideograph-R046-Mountain.el
+++ b/lisp/utf-2000/Ideograph-R046-Mountain.el
@@ -995,10 +995,10 @@
       )
      ((=ucs              . #x5C71)     ; 山
       )
-     ((japanese-jisx0208-1978    . #x4A2C)     ; �����
-      (japanese-jisx0208         . #x4A2C)     ; �����
-      (korean-ksc5601            . #x5D42)     ; �����
-      (ideograph-daikanwa        . 01853)      ; �����
+     ((=jis-x0208-1978   . #x4A2C)     ; �����
+      (japanese-jisx0208  . #x4A2C)    ; �����
+      (korean-ksc5601    . #x5D42)     ; �����
+      (ideograph-daikanwa . 01853)     ; �����
       ))
     (=cbeta            . 03791)        ; �����
     ))
@@ -4940,10 +4940,10 @@
     (ideographic-radical . 46) ; ⼭
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x564A)       ; �����
-    (japanese-jisx0208         . #x564A)       ; �����
-    (chinese-cns11643-2                . #x3B45)       ; �����
-    (ideograph-daikanwa                . 08281)        ; �����
+    (=jis-x0208-1978   . #x564A)       ; �����
+    (japanese-jisx0208 . #x564A)       ; �����
+    (chinese-cns11643-2 . #x3B45)      ; �����
+    (ideograph-daikanwa . 08281)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        8281 0 0)
@@ -6898,13 +6898,13 @@
     (ideographic-strokes . 11)
     (total-strokes      . 14)
     (shinjigen-2       . 2026)
-    (japanese-jisx0208-1978    . #x564F)       ; �����
-    (japanese-jisx0208         . #x564F)       ; �����
-    (korean-ksc5601            . #x4F29)       ; �����
-    (chinese-gb12345           . #x612B)       ; 嶇
-    (chinese-big5              . #xB9F2)       ; ������
-    (ideograph-daikanwa                . 08426)        ; �����
-    (=ucs                      . #x5D87)       ; 嶇
+    (=jis-x0208-1978   . #x564F)       ; �����
+    (japanese-jisx0208 . #x564F)       ; �����
+    (korean-ksc5601    . #x4F29)       ; �����
+    (chinese-gb12345   . #x612B)       ; 嶇
+    (chinese-big5      . #xB9F2)       ; ������
+    (ideograph-daikanwa . 08426)       ; �����
+    (=ucs              . #x5D87)       ; 嶇
     ))
 (define-char
   '((=>ucs             . #x5D87)       ; 嶇
@@ -8092,9 +8092,9 @@
       )
      ((=ucs              . #x5C71)     ; 山
       )
-     ((japanese-jisx0208-1978    . #x3A61)     ; �����
-      (japanese-jisx0208         . #x3A61)     ; �����
-      (ideograph-daikanwa        . 28293)      ; �����
+     ((=jis-x0208-1978   . #x3A61)     ; �����
+      (japanese-jisx0208  . #x3A61)    ; �����
+      (ideograph-daikanwa . 28293)     ; �����
       ))
     (chinese-cns11643-4 . #x5026)      ; �����
     (ideograph-daikanwa . 08513)       ; �����
@@ -9465,12 +9465,12 @@
     (ideographic-strokes . 17)
     (total-strokes      . 20)
     (shinjigen-2       . 2050)
-    (japanese-jisx0208-1978    . #x565A)       ; �����
-    (japanese-jisx0208         . #x565A)       ; �����
-    (=iso-ir165                        . #x7B23)       ; �����
-    (chinese-big5              . #xC460)       ; ������
-    (ideograph-daikanwa                . 08618)        ; �����
-    (=ucs                      . #x5DC9)       ; 巉
+    (=jis-x0208-1978   . #x565A)       ; �����
+    (japanese-jisx0208 . #x565A)       ; �����
+    (=iso-ir165                . #x7B23)       ; �����
+    (chinese-big5      . #xC460)       ; ������
+    (ideograph-daikanwa . 08618)       ; �����
+    (=ucs              . #x5DC9)       ; 巉
     ))
 (define-char
   '((=>ucs             . #x5DC9)       ; 巉
@@ -9600,8 +9600,8 @@
     (ideographic-radical . 46) ; ⼭
     (ideographic-strokes . 17)
     (total-strokes      . 20)
-    (japanese-jisx0208-1978    . #x3460)       ; �����
-    (japanese-jisx0208         . #x3460)       ; �����
+    (=jis-x0208-1978   . #x3460)       ; �����
+    (japanese-jisx0208 . #x3460)       ; �����
     ))
 (define-char
   '((ideographic-radical . 46) ; ⼭
@@ -9848,9 +9848,9 @@
     (ideographic-radical . 46) ; ⼭
     (ideographic-strokes . 19)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x565C)       ; �����
-    (japanese-jisx0208         . #x565C)       ; �����
-    (chinese-cns11643-3                . #x5F43)       ; �����
+    (=jis-x0208-1978   . #x565C)       ; �����
+    (japanese-jisx0208 . #x565C)       ; �����
+    (chinese-cns11643-3 . #x5F43)      ; �����
     ))
 (define-char
   '((ideographic-radical . 46) ; ⼭

diff --git a/lisp/utf-2000/Ideograph-R049-Oneself.el b/lisp/utf-2000/Ideograph-R049-Oneself.el
index 19e400b..7b5a534 100644 (file)
--- a/lisp/utf-2000/Ideograph-R049-Oneself.el
+++ b/lisp/utf-2000/Ideograph-R049-Oneself.el
@@ -161,14 +161,14 @@
   '((ideographic-radical . 49) ; ⼰
     (ideographic-strokes . 6)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x392B)       ; �����
-    (chinese-gb2312            . #x4F6F)       ; �����
-    (korean-ksc5601            . #x7975)       ; �����
-    (=iso-ir165                        . #x4F6F)       ; �����
-    (chinese-cns11643-1                . #x5073)       ; �����
-    (chinese-big5              . #xABD1)       ; ������
-    (ideograph-daikanwa                . 08756)        ; �����
-    (=ucs                      . #x5DF7)       ; 巷
+    (=jis-x0208-1978   . #x392B)       ; �����
+    (chinese-gb2312    . #x4F6F)       ; �����
+    (korean-ksc5601    . #x7975)       ; �����
+    (=iso-ir165                . #x4F6F)       ; �����
+    (chinese-cns11643-1 . #x5073)      ; �����
+    (chinese-big5      . #xABD1)       ; ������
+    (ideograph-daikanwa . 08756)       ; �����
+    (=ucs              . #x5DF7)       ; 巷
     ))
 (define-char
   '((=>ucs             . #x5DF7)       ; 巷
@@ -321,14 +321,14 @@
   '((ideographic-radical . 49) ; ⼰
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x4327)       ; �����
-    (chinese-gb2312            . #x5963)       ; �����
-    (korean-ksc5601            . #x615E)       ; �����
-    (=iso-ir165                        . #x5963)       ; �����
-    (chinese-cns11643-6                . #x4837)       ; �����
-    (chinese-big5              . #xB453)       ; ������
-    (ideograph-daikanwa                . 08765)        ; �����
-    (=ucs                      . #x5DFD)       ; 巽
+    (=jis-x0208-1978   . #x4327)       ; �����
+    (chinese-gb2312    . #x5963)       ; �����
+    (korean-ksc5601    . #x615E)       ; �����
+    (=iso-ir165                . #x5963)       ; �����
+    (chinese-cns11643-6 . #x4837)      ; �����
+    (chinese-big5      . #xB453)       ; ������
+    (ideograph-daikanwa . 08765)       ; �����
+    (=ucs              . #x5DFD)       ; 巽
     ))
 (define-char
   '((=>ucs             . #x5DFD)       ; 巽

diff --git a/lisp/utf-2000/Ideograph-R050-Turban.el b/lisp/utf-2000/Ideograph-R050-Turban.el
index bdff698..338cf58 100644 (file)
--- a/lisp/utf-2000/Ideograph-R050-Turban.el
+++ b/lisp/utf-2000/Ideograph-R050-Turban.el
@@ -2152,11 +2152,11 @@
     (ideographic-strokes . 7)
     (total-strokes      . 10)
     (hanyu-dazidian    1 739 16)
-    (japanese-jisx0208-1978    . #x3522)       ; �����
-    (japanese-jisx0208         . #x3522)       ; �����
-    (ideograph-daikanwa                . 08930)        ; �����
-    (=hanziku-2                        . #xEA5C)       ; ������
-    (=ucs                      . #x5E30)       ; 帰
+    (=jis-x0208-1978   . #x3522)       ; �����
+    (japanese-jisx0208 . #x3522)       ; �����
+    (ideograph-daikanwa . 08930)       ; �����
+    (=hanziku-2                . #xEA5C)       ; ������
+    (=ucs              . #x5E30)       ; 帰
     ))
 (define-char
   '((=>ucs             . #x5E30)       ; 帰
@@ -4516,9 +4516,9 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((japanese-jisx0208-1978    . #x5A49)     ; �����
-      (japanese-jisx0208         . #x5A49)     ; �����
-      (ideograph-daikanwa        . 13245)      ; �����
+     ((=jis-x0208-1978   . #x5A49)     ; �����
+      (japanese-jisx0208  . #x5A49)    ; �����
+      (ideograph-daikanwa . 13245)     ; �����
       )
      ((=ucs              . #x5DFE)     ; 巾
       ))
@@ -5476,10 +5476,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (=ucs               . #x2FF1)   ; ⿱
        )
-       ((japanese-jisx0208-1978            . #x376A)   ; �����
-       (japanese-jisx0208          . #x376A)   ; �����
-       (korean-ksc5601             . #x7A6B)   ; �����
-       (ideograph-daikanwa         . 25406)    ; �����
+       ((japanese-jisx0208  . #x376A)  ; �����
+       (korean-ksc5601     . #x7A6B)   ; �����
+       (ideograph-daikanwa . 25406)    ; �����
        )
        ((=ucs              . #x767B)   ; 登
        ))

diff --git a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
index b5b7821..981b50d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
@@ -678,8 +678,8 @@
     (ideographic-radical . 53) ; ⼴
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x4A79)       ; �����
-    (ideograph-daikanwa                . 09266)        ; �����
+    (=jis-x0208-1978   . #x4A79)       ; �����
+    (ideograph-daikanwa . 09266)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        9266 0 0)
@@ -1595,10 +1595,10 @@
     (ideographic-strokes . 7)
     (total-strokes      . 10)
     (shinjigen-2       . 2186)
-    (japanese-jisx0208-1978    . #x446D)       ; �����
-    (japanese-jisx0208         . #x446D)       ; �����
-    (korean-ksc5601            . #x6F54)       ; �����
-    (ideograph-daikanwa                . 09337)        ; �����
+    (=jis-x0208-1978   . #x446D)       ; �����
+    (japanese-jisx0208 . #x446D)       ; �����
+    (korean-ksc5601    . #x6F54)       ; �����
+    (ideograph-daikanwa . 09337)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5EAD)       ; 庭
@@ -3844,9 +3844,9 @@
     (ideographic-radical . 53) ; ⼴
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4940)       ; �����
-    (korean-ksc5601            . #x5959)       ; �����
-    (ideograph-daikanwa                . 09489)        ; �����
+    (=jis-x0208-1978   . #x4940)       ; �����
+    (korean-ksc5601    . #x5959)       ; �����
+    (ideograph-daikanwa . 09489)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5EDF)       ; 廟
@@ -3876,9 +3876,9 @@
     (ideographic-strokes . 12)
     (total-strokes      . 15)
     (shinjigen-1       . 2214)
-    (japanese-jisx0208-1978    . #x3E33)       ; �����
-    (korean-ksc5601            . #x735F)       ; �����
-    (ideograph-daikanwa                . 09490)        ; �����
+    (=jis-x0208-1978   . #x3E33)       ; �����
+    (korean-ksc5601    . #x735F)       ; �����
+    (ideograph-daikanwa . 09490)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5EE0)       ; 廠

diff --git a/lisp/utf-2000/Ideograph-R054-Long-Stride.el b/lisp/utf-2000/Ideograph-R054-Long-Stride.el
index 8424d51..d92d75c 100644 (file)
--- a/lisp/utf-2000/Ideograph-R054-Long-Stride.el
+++ b/lisp/utf-2000/Ideograph-R054-Long-Stride.el
@@ -59,8 +59,8 @@
     (ideographic-radical . 54) ; ⼵
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x3164)       ; �����
-    (japanese-jisx0208         . #x3164)       ; �����
+    (=jis-x0208-1978   . #x3164)       ; �����
+    (japanese-jisx0208 . #x3164)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5EF6)       ; 延
@@ -94,12 +94,12 @@
     (ideographic-radical . 54) ; ⼵
     (ideographic-strokes . 4)
     (total-strokes      . 7)
-    (japanese-jisx0208-1978    . #x446E)       ; �����
-    (japanese-jisx0208         . #x446E)       ; �����
-    (korean-ksc5601            . #x6F55)       ; �����
-    (chinese-big5              . #xA7CA)       ; ������
-    (ideograph-daikanwa                . 09571)        ; �����
-    (=jef-china3               . #x4CD6)       ; �����
+    (=jis-x0208-1978   . #x446E)       ; �����
+    (japanese-jisx0208 . #x446E)       ; �����
+    (korean-ksc5601    . #x6F55)       ; �����
+    (chinese-big5      . #xA7CA)       ; ������
+    (ideograph-daikanwa . 09571)       ; �����
+    (=jef-china3       . #x4CD6)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        9571 0 0)
@@ -175,12 +175,12 @@
     (ideographic-strokes . 6)
     (total-strokes      . 9)
     (shinjigen-2       . 2242)
-    (japanese-jisx0208-1978    . #x377A)       ; �����
-    (japanese-jisx0208         . #x377A)       ; �����
-    (korean-ksc5601            . #x4B6F)       ; �����
-    (chinese-big5              . #xABD8)       ; ������
-    (ideograph-daikanwa                . 09574)        ; �����
-    (=jef-china3               . #x4CD8)       ; �����
+    (=jis-x0208-1978   . #x377A)       ; �����
+    (japanese-jisx0208 . #x377A)       ; �����
+    (korean-ksc5601    . #x4B6F)       ; �����
+    (chinese-big5      . #xABD8)       ; ������
+    (ideograph-daikanwa . 09574)       ; �����
+    (=jef-china3       . #x4CD8)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        9574 0 0)

diff --git a/lisp/utf-2000/Ideograph-R057-Bow.el b/lisp/utf-2000/Ideograph-R057-Bow.el
index 2654016..4236558 100644 (file)
--- a/lisp/utf-2000/Ideograph-R057-Bow.el
+++ b/lisp/utf-2000/Ideograph-R057-Bow.el
@@ -929,9 +929,9 @@
     (total-strokes      . 9)
     (shinjigen-1       . 2281)
     (shinjigen-2       . 2281)
-    (japanese-jisx0208-1978    . #x5739)       ; �����
-    (japanese-jisx0208         . #x5739)       ; �����
-    (ideograph-daikanwa                . 09768)        ; �����
+    (=jis-x0208-1978   . #x5739)       ; �����
+    (japanese-jisx0208 . #x5739)       ; �����
+    (ideograph-daikanwa . 09768)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        9768 0 1)

diff --git a/lisp/utf-2000/Ideograph-R060-Step.el b/lisp/utf-2000/Ideograph-R060-Step.el
index e09950b..293f912 100644 (file)
--- a/lisp/utf-2000/Ideograph-R060-Step.el
+++ b/lisp/utf-2000/Ideograph-R060-Step.el
@@ -1305,9 +1305,9 @@
     (ideographic-strokes . 8)
     (total-strokes      . 11)
     (shinjigen-2       . 2365)
-    (japanese-jisx0208-1978    . #x5751)       ; �����
-    (japanese-jisx0208         . #x5751)       ; �����
-    (ideograph-daikanwa                . 10141)        ; �����
+    (=jis-x0208-1978   . #x5751)       ; �����
+    (japanese-jisx0208 . #x5751)       ; �����
+    (ideograph-daikanwa . 10141)       ; �����
     ))
 (define-char
   '((=>ucs             . #x5F98)       ; 徘
@@ -2136,10 +2136,10 @@
       )
      ((=ucs              . #x5F73)     ; 彳
       )
-     ((japanese-jisx0208-1978    . #x377A)     ; �����
-      (japanese-jisx0208         . #x377A)     ; �����
-      (korean-ksc5601            . #x4B6F)     ; �����
-      (ideograph-daikanwa        . 09574)      ; �����
+     ((=jis-x0208-1978   . #x377A)     ; �����
+      (japanese-jisx0208  . #x377A)    ; �����
+      (korean-ksc5601    . #x4B6F)     ; �����
+      (ideograph-daikanwa . 09574)     ; �����
       ))
     (japanese-jisx0212 . #x3D32)       ; �����
     (=ucs@jis          . #x5FA4)       ; �����
@@ -3049,15 +3049,15 @@
   '((ideographic-radical . 60) ; ⼻
     (ideographic-strokes . 14)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x352B)       ; �����
-    (chinese-gb2312            . #x3B55)       ; �����
-    (korean-ksc5601            . #x7D45)       ; �����
-    (=iso-ir165                        . #x3B55)       ; �����
-    (chinese-cns11643-1                . #x735B)       ; �����
-    (chinese-big5              . #xC0B2)       ; ������
-    (ideograph-daikanwa                . 10267)        ; �����
-    (=jef-china3               . #x4DC1)       ; �����
-    (=ucs                      . #x5FBD)       ; 徽
+    (=jis-x0208-1978   . #x352B)       ; �����
+    (chinese-gb2312    . #x3B55)       ; �����
+    (korean-ksc5601    . #x7D45)       ; �����
+    (=iso-ir165                . #x3B55)       ; �����
+    (chinese-cns11643-1 . #x735B)      ; �����
+    (chinese-big5      . #xC0B2)       ; ������
+    (ideograph-daikanwa . 10267)       ; �����
+    (=jef-china3       . #x4DC1)       ; �����
+    (=ucs              . #x5FBD)       ; 徽
     ))
 (define-char
   '((=>ucs             . #x5FBD)       ; 徽

diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el
index 50057ed..4d53463 100644 (file)
--- a/lisp/utf-2000/Ideograph-R061-Heart.el
+++ b/lisp/utf-2000/Ideograph-R061-Heart.el
@@ -894,10 +894,10 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((japanese-jisx0208-1978    . #x3878)     ; �����
-      (japanese-jisx0208         . #x3878)     ; �����
-      (korean-ksc5601            . #x4D6B)     ; �����
-      (ideograph-daikanwa        . 01452)      ; �����
+     ((=jis-x0208-1978   . #x3878)     ; �����
+      (japanese-jisx0208  . #x3878)    ; �����
+      (korean-ksc5601    . #x4D6B)     ; �����
+      (ideograph-daikanwa . 01452)     ; �����
       )
      ((=ucs              . #x5FC3)     ; 心
       ))
@@ -917,10 +917,10 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((japanese-jisx0208-1978    . #x3878)     ; �����
-      (japanese-jisx0208         . #x3878)     ; �����
-      (korean-ksc5601            . #x4D6B)     ; �����
-      (ideograph-daikanwa        . 01452)      ; �����
+     ((=jis-x0208-1978   . #x3878)     ; �����
+      (japanese-jisx0208  . #x3878)    ; �����
+      (korean-ksc5601    . #x4D6B)     ; �����
+      (ideograph-daikanwa . 01452)     ; �����
       )
      ((=ucs              . #x5FC3)     ; 心
       ))
@@ -3678,10 +3678,10 @@
     (ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x4351)       ; �����
-    (japanese-jisx0208         . #x4351)       ; �����
-    (chinese-big5              . #xAEA2)       ; ������
-    (=ucs                      . #x6065)       ; 恥
+    (=jis-x0208-1978   . #x4351)       ; �����
+    (japanese-jisx0208 . #x4351)       ; �����
+    (chinese-big5      . #xAEA2)       ; ������
+    (=ucs              . #x6065)       ; 恥
     ))
 (define-char
   '((ideographic-radical . 61) ; ⼼
@@ -4724,7 +4724,7 @@
     (ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x5824)       ; �����
+    (=jis-x0208-1978   . #x5824)       ; �����
     ))
 (define-char
   '((=>ucs             . #x2267E)      ; 𢙾
@@ -5480,9 +5480,9 @@
     (ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x4861)       ; �����
-    (japanese-jisx0208         . #x4861)       ; �����
-    (ideograph-daikanwa                . 10720)        ; �����
+    (=jis-x0208-1978   . #x4861)       ; �����
+    (japanese-jisx0208 . #x4861)       ; �����
+    (ideograph-daikanwa . 10720)       ; �����
     ))
 (define-char
   '((=>ucs             . #x60B2)       ; 悲
@@ -6585,12 +6585,12 @@
     (ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x5831)       ; �����
-    (chinese-gb2312            . #x632F)       ; �����
-    (japanese-jisx0208         . #x5831)       ; �����
-    (=iso-ir165                        . #x632F)       ; �����
-    (chinese-big5              . #xB1A6)       ; ������
-    (=ucs                      . #x60D8)       ; 惘
+    (=jis-x0208-1978   . #x5831)       ; �����
+    (chinese-gb2312    . #x632F)       ; �����
+    (japanese-jisx0208 . #x5831)       ; �����
+    (=iso-ir165                . #x632F)       ; �����
+    (chinese-big5      . #xB1A6)       ; ������
+    (=ucs              . #x60D8)       ; 惘
     ))
 (define-char
   '((ideographic-radical . 61) ; ⼼
@@ -7964,9 +7964,9 @@
     (ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x4C7C)       ; �����
-    (korean-ksc5601            . #x6A6F)       ; �����
-    (ideograph-daikanwa                . 10904)        ; �����
+    (=jis-x0208-1978   . #x4C7C)       ; �����
+    (korean-ksc5601    . #x6A6F)       ; �����
+    (ideograph-daikanwa . 10904)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6108)       ; 愈
@@ -9785,11 +9785,11 @@
   '((ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x5849)       ; �����
-    (japanese-jisx0208         . #x5849)       ; �����
-    (ideograph-daikanwa                . 11028)        ; �����
-    (=cbeta                    . 00397)        ; �����
-    (=ucs                      . #x613D)       ; 愽
+    (=jis-x0208-1978   . #x5849)       ; �����
+    (japanese-jisx0208 . #x5849)       ; �����
+    (ideograph-daikanwa . 11028)       ; �����
+    (=cbeta            . 00397)        ; �����
+    (=ucs              . #x613D)       ; 愽
     ))
 (define-char
   '((=>ucs             . #x613D)       ; 愽
@@ -11168,8 +11168,8 @@
     (ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x3334)       ; �����
-    (japanese-jisx0208         . #x3334)       ; �����
+    (=jis-x0208-1978   . #x3334)       ; �����
+    (japanese-jisx0208 . #x3334)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6168)       ; 慨
@@ -12813,8 +12813,8 @@
     (ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4A30)       ; �����
-    (japanese-jisx0208         . #x4A30)       ; �����
+    (=jis-x0208-1978   . #x4A30)       ; �����
+    (japanese-jisx0208 . #x4A30)       ; �����
     ))
 (define-char
   '((ideographic-radical . 61) ; ⼼
@@ -16451,10 +16451,10 @@
     (ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 18)
     (total-strokes      . 21)
-    (japanese-jisx0208-1978    . #x5877)       ; �����
-    (japanese-jisx0208         . #x5877)       ; �����
-    (chinese-cns11643-1                . #x7A6B)       ; �����
-    (chinese-big5              . #xC4E0)       ; ������
+    (=jis-x0208-1978   . #x5877)       ; �����
+    (japanese-jisx0208 . #x5877)       ; �����
+    (chinese-cns11643-1 . #x7A6B)      ; �����
+    (chinese-big5      . #xC4E0)       ; ������
     ))
 (define-char
   '((morohashi-daikanwa        11498 0 3)

diff --git a/lisp/utf-2000/Ideograph-R063-Door.el b/lisp/utf-2000/Ideograph-R063-Door.el
index ca680c0..b44e54d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R063-Door.el
+++ b/lisp/utf-2000/Ideograph-R063-Door.el
@@ -640,11 +640,11 @@
     (ideographic-radical . 63) ; ⼾
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x6E3D)       ; �����
-    (korean-ksc5601            . #x7B43)       ; �����
-    (chinese-cns11643-1                . #x5A53)       ; �����
-    (chinese-big5              . #xB1AF)       ; ������
-    (ideograph-daikanwa                . 11746)        ; �����
+    (=jis-x0208-1978   . #x6E3D)       ; �����
+    (korean-ksc5601    . #x7B43)       ; �����
+    (chinese-cns11643-1 . #x5A53)      ; �����
+    (chinese-big5      . #xB1AF)       ; ������
+    (ideograph-daikanwa . 11746)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6248)       ; 扈
@@ -680,9 +680,9 @@
     (ideographic-radical . 63) ; ⼾
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x4862)       ; �����
-    (chinese-big5              . #xB476)       ; ������
-    (ideograph-daikanwa                . 11750)        ; �����
+    (=jis-x0208-1978   . #x4862)       ; �����
+    (chinese-big5      . #xB476)       ; ������
+    (ideograph-daikanwa . 11750)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6249)       ; 扉

diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el
index 195b89f..14c02ff 100644 (file)
--- a/lisp/utf-2000/Ideograph-R064-Hand.el
+++ b/lisp/utf-2000/Ideograph-R064-Hand.el
@@ -624,9 +624,9 @@
     (ideographic-strokes . 3)
     (total-strokes      . 6)
     (shinjigen-2       . 2823)
-    (japanese-jisx0208-1978    . #x592E)       ; �����
-    (japanese-jisx0208         . #x592E)       ; �����
-    (ideograph-daikanwa                . 11824)        ; �����
+    (=jis-x0208-1978   . #x592E)       ; �����
+    (japanese-jisx0208 . #x592E)       ; �����
+    (ideograph-daikanwa . 11824)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6268)       ; 扨
@@ -2515,9 +2515,9 @@
     (total-strokes      . 9)
     (shinjigen-1       . 2870)
     (shinjigen-2       . 2870)
-    (japanese-jisx0208-1978    . #x593C)       ; �����
-    (japanese-jisx0208         . #x593C)       ; �����
-    (ideograph-daikanwa                . 11954)        ; �����
+    (=jis-x0208-1978   . #x593C)       ; �����
+    (japanese-jisx0208 . #x593C)       ; �����
+    (ideograph-daikanwa . 11954)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        11954 0 0)
@@ -2560,11 +2560,11 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x327D)       ; �����
-    (chinese-gb2312            . #x3955)       ; �����
-    (korean-ksc5601            . #x4E58)       ; �����
-    (=iso-ir165                        . #x3955)       ; �����
-    (=ucs                      . #x62D0)       ; 拐
+    (=jis-x0208-1978   . #x327D)       ; �����
+    (chinese-gb2312    . #x3955)       ; �����
+    (korean-ksc5601    . #x4E58)       ; �����
+    (=iso-ir165                . #x3955)       ; �����
+    (=ucs              . #x62D0)       ; 拐
     ))
 (define-char
   '((ideographic-radical . 64) ; ⼿
@@ -3357,14 +3357,14 @@
   '((ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 6)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x3969)       ; �����
-    (chinese-gb2312            . #x3F3D)       ; �����
-    (japanese-jisx0208         . #x3969)       ; �����
-    (=iso-ir165                        . #x3F3D)       ; �����
-    (chinese-cns11643-1                . #x5142)       ; �����
-    (chinese-big5              . #xABFE)       ; ������
-    (ideograph-daikanwa                . 12006)        ; �����
-    (=ucs                      . #x62F7)       ; 拷
+    (=jis-x0208-1978   . #x3969)       ; �����
+    (chinese-gb2312    . #x3F3D)       ; �����
+    (japanese-jisx0208 . #x3969)       ; �����
+    (=iso-ir165                . #x3F3D)       ; �����
+    (chinese-cns11643-1 . #x5142)      ; �����
+    (chinese-big5      . #xABFE)       ; ������
+    (ideograph-daikanwa . 12006)       ; �����
+    (=ucs              . #x62F7)       ; 拷
     ))
 (define-char
   '((=>ucs             . #x62F7)       ; 拷
@@ -4890,15 +4890,15 @@
   '((ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x4854)       ; �����
-    (chinese-gb2312            . #x4D6C)       ; �����
-    (korean-ksc5601            . #x5838)       ; �����
-    (=iso-ir165                        . #x4D6C)       ; �����
-    (chinese-cns11643-1                . #x5560)       ; �����
-    (chinese-big5              . #xAEBE)       ; ������
-    (ideograph-daikanwa                . 12111)        ; �����
-    (=jef-china3               . #x70BF)       ; �����
-    (=ucs                      . #x633D)       ; 挽
+    (=jis-x0208-1978   . #x4854)       ; �����
+    (chinese-gb2312    . #x4D6C)       ; �����
+    (korean-ksc5601    . #x5838)       ; �����
+    (=iso-ir165                . #x4D6C)       ; �����
+    (chinese-cns11643-1 . #x5560)      ; �����
+    (chinese-big5      . #xAEBE)       ; ������
+    (ideograph-daikanwa . 12111)       ; �����
+    (=jef-china3       . #x70BF)       ; �����
+    (=ucs              . #x633D)       ; 挽
     ))
 (define-char
   '((=>ucs             . #x633D)       ; 挽
@@ -5319,8 +5319,8 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x3B2B)       ; �����
-    (ideograph-daikanwa                . 12141)        ; �����
+    (=jis-x0208-1978   . #x3B2B)       ; �����
+    (ideograph-daikanwa . 12141)       ; �����
     ))
 (define-char
   '((=>ucs             . #x634C)       ; 捌
@@ -5619,9 +5619,9 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x443D)       ; �����
-    (chinese-big5              . #xD1CA)       ; ������
-    (ideograph-daikanwa                . 12160)        ; �����
+    (=jis-x0208-1978   . #x443D)       ; �����
+    (chinese-big5      . #xD1CA)       ; ������
+    (ideograph-daikanwa . 12160)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        12160 0 0)
@@ -6030,9 +6030,9 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x4A7B)       ; �����
-    (japanese-jisx0208         . #x4A7B)       ; �����
-    (ideograph-daikanwa                . 12189)        ; �����
+    (=jis-x0208-1978   . #x4A7B)       ; �����
+    (japanese-jisx0208 . #x4A7B)       ; �����
+    (ideograph-daikanwa . 12189)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6367)       ; 捧
@@ -6096,10 +6096,10 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x5960)       ; �����
-    (chinese-cns11643-1                . #x5A6E)       ; �����
-    (chinese-big5              . #xB1CA)       ; ������
-    (ideograph-daikanwa                . 12192)        ; �����
+    (=jis-x0208-1978   . #x5960)       ; �����
+    (chinese-cns11643-1 . #x5A6E)      ; �����
+    (chinese-big5      . #xB1CA)       ; ������
+    (ideograph-daikanwa . 12192)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        12192 0 1)
@@ -6267,10 +6267,10 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x3F78)       ; �����
-    (japanese-jisx0208         . #x3F78)       ; �����
-    (korean-ksc5601            . #x4B5F)       ; �����
-    (ideograph-daikanwa                . 12204)        ; �����
+    (=jis-x0208-1978   . #x3F78)       ; �����
+    (japanese-jisx0208 . #x3F78)       ; �����
+    (korean-ksc5601    . #x4B5F)       ; �����
+    (ideograph-daikanwa . 12204)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        12204 0 1)
@@ -6322,10 +6322,10 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x377E)       ; �����
-    (korean-ksc5601            . #x4F6C)       ; �����
-    (chinese-big5              . #xB1B2)       ; ������
-    (ideograph-daikanwa                . 12208)        ; �����
+    (=jis-x0208-1978   . #x377E)       ; �����
+    (korean-ksc5601    . #x4F6C)       ; �����
+    (chinese-big5      . #xB1B2)       ; ������
+    (ideograph-daikanwa . 12208)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        12208 0 2)
@@ -7020,9 +7020,9 @@
     (total-strokes      . 11)
     (shinjigen-1       . 2988)
     (shinjigen-2       . 2990)
-    (japanese-jisx0208-1978    . #x4753)       ; �����
-    (japanese-jisx0208         . #x4753)       ; �����
-    (ideograph-daikanwa                . 12256)        ; �����
+    (=jis-x0208-1978   . #x4753)       ; �����
+    (japanese-jisx0208 . #x4753)       ; �����
+    (ideograph-daikanwa . 12256)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6392)       ; 排
@@ -10183,9 +10183,9 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x596C)       ; �����
-    (chinese-big5              . #xB770)       ; ������
-    (ideograph-daikanwa                . 12447)        ; �����
+    (=jis-x0208-1978   . #x596C)       ; �����
+    (chinese-big5      . #xB770)       ; ������
+    (ideograph-daikanwa . 12447)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        12447 0 1)
@@ -10439,10 +10439,10 @@
     (total-strokes      . 13)
     (shinjigen-1       . 3050)
     (shinjigen-2       . 3051)
-    (japanese-jisx0208-1978    . #x5973)       ; �����
-    (japanese-jisx0208         . #x5973)       ; �����
-    (korean-ksc5601            . #x5A51)       ; �����
-    (ideograph-daikanwa                . 12466)        ; �����
+    (=jis-x0208-1978   . #x5973)       ; �����
+    (japanese-jisx0208 . #x5973)       ; �����
+    (korean-ksc5601    . #x5A51)       ; �����
+    (ideograph-daikanwa . 12466)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        12466 0 2)
@@ -10632,12 +10632,12 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x415F)       ; �����
-    (korean-ksc5601            . #x6138)       ; �����
-    (japanese-jisx0212         . #x404B)       ; �����
-    (=jis-x0213-1-2000         . #x7476)       ; �����
-    (ideograph-daikanwa                . 12477)        ; �����
-    (=ucs@jis                  . #x6414)       ; �����
+    (=jis-x0208-1978   . #x415F)       ; �����
+    (korean-ksc5601    . #x6138)       ; �����
+    (japanese-jisx0212 . #x404B)       ; �����
+    (=jis-x0213-1-2000 . #x7476)       ; �����
+    (ideograph-daikanwa . 12477)       ; �����
+    (=ucs@jis          . #x6414)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        12477 0 0)
@@ -11872,9 +11872,9 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x405D)       ; �����
-    (japanese-jisx0208         . #x405D)       ; �����
-    (=ucs                      . #x6442)       ; 摂
+    (=jis-x0208-1978   . #x405D)       ; �����
+    (japanese-jisx0208 . #x405D)       ; �����
+    (=ucs              . #x6442)       ; 摂
     ))
 (define-char
   '((=>ucs             . #x6442)       ; 摂
@@ -12168,14 +12168,14 @@
   '((ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x444F)       ; �����
-    (japanese-jisx0212         . #x405B)       ; �����
-    (chinese-cns11643-1                . #x6878)       ; �����
-    (=jis-x0213-1-2000         . #x7479)       ; �����
-    (chinese-gb12345           . #x5E62)       ; 摑
-    (chinese-big5              . #xBA51)       ; ������
-    (ideograph-daikanwa                . 12572)        ; �����
-    (=ucs                      . #x6451)       ; 摑
+    (=jis-x0208-1978   . #x444F)       ; �����
+    (japanese-jisx0212 . #x405B)       ; �����
+    (chinese-cns11643-1 . #x6878)      ; �����
+    (=jis-x0213-1-2000 . #x7479)       ; �����
+    (chinese-gb12345   . #x5E62)       ; 摑
+    (chinese-big5      . #xBA51)       ; ������
+    (ideograph-daikanwa . 12572)       ; �����
+    (=ucs              . #x6451)       ; 摑
     ))
 (define-char
   '((=>ucs             . #x3A2F)       ; 㨯
@@ -13283,10 +13283,10 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x4022)       ; �����
-    (korean-ksc5601            . #x6F49)       ; �����
-    (chinese-big5              . #xBA50)       ; ������
-    (ideograph-daikanwa                . 12647)        ; �����
+    (=jis-x0208-1978   . #x4022)       ; �����
+    (korean-ksc5601    . #x6F49)       ; �����
+    (chinese-big5      . #xBA50)       ; ������
+    (ideograph-daikanwa . 12647)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        12647 0 2)
@@ -13765,9 +13765,9 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((japanese-jisx0208-1978    . #x5A49)     ; �����
-      (japanese-jisx0208         . #x5A49)     ; �����
-      (ideograph-daikanwa        . 13245)      ; �����
+     ((=jis-x0208-1978   . #x5A49)     ; �����
+      (japanese-jisx0208  . #x5A49)    ; �����
+      (ideograph-daikanwa . 13245)     ; �����
       )
      ((=ucs              . #x624B)     ; 手
       ))
@@ -14874,14 +14874,14 @@
   '((ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4071)       ; �����
-    (chinese-gb2312            . #x572B)       ; �����
-    (korean-ksc5601            . #x733C)       ; �����
-    (=iso-ir165                        . #x572B)       ; �����
-    (chinese-cns11643-1                . #x6C7E)       ; �����
-    (chinese-big5              . #xBCB6)       ; ������
-    (ideograph-daikanwa                . 12753)        ; �����
-    (=ucs                      . #x64B0)       ; 撰
+    (=jis-x0208-1978   . #x4071)       ; �����
+    (chinese-gb2312    . #x572B)       ; �����
+    (korean-ksc5601    . #x733C)       ; �����
+    (=iso-ir165                . #x572B)       ; �����
+    (chinese-cns11643-1 . #x6C7E)      ; �����
+    (chinese-big5      . #xBCB6)       ; ������
+    (ideograph-daikanwa . 12753)       ; �����
+    (=ucs              . #x64B0)       ; 撰
     ))
 (define-char
   '((=>ucs             . #x64B0)       ; 撰
@@ -16613,10 +16613,10 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 14)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x4527)       ; �����
-    (korean-ksc5601            . #x7677)       ; �����
-    (chinese-big5              . #xC0C2)       ; ������
-    (ideograph-daikanwa                . 12852)        ; �����
+    (=jis-x0208-1978   . #x4527)       ; �����
+    (korean-ksc5601    . #x7677)       ; �����
+    (chinese-big5      . #xC0C2)       ; ������
+    (ideograph-daikanwa . 12852)       ; �����
     ))
 (define-char
   '((=>ucs             . #x64E2)       ; 擢
@@ -17263,8 +17263,8 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 15)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x5A33)       ; �����
-    (japanese-jisx0208         . #x5A33)       ; �����
+    (=jis-x0208-1978   . #x5A33)       ; �����
+    (japanese-jisx0208 . #x5A33)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        12893 0 2)
@@ -19174,8 +19174,8 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 18)
     (total-strokes      . 21)
-    (japanese-jisx0208-1978    . #x5970)       ; �����
-    (japanese-jisx0208         . #x5970)       ; �����
+    (=jis-x0208-1978   . #x5970)       ; �����
+    (japanese-jisx0208 . #x5970)       ; �����
     ))
 (define-char
   '((=>ucs             . #x651D)       ; 攝
@@ -19536,14 +19536,14 @@
   '((ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 19)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x5A39)       ; �����
-    (japanese-jisx0212         . #x4142)       ; �����
-    (chinese-cns11643-2                . #x6D51)       ; �����
-    (=jis-x0213-1-2000         . #x7526)       ; �����
-    (chinese-gb12345           . #x545C)       ; 攢
-    (chinese-big5              . #xF6E3)       ; ������
-    (ideograph-daikanwa                . 13030)        ; �����
-    (=ucs                      . #x6522)       ; 攢
+    (=jis-x0208-1978   . #x5A39)       ; �����
+    (japanese-jisx0212 . #x4142)       ; �����
+    (chinese-cns11643-2 . #x6D51)      ; �����
+    (=jis-x0213-1-2000 . #x7526)       ; �����
+    (chinese-gb12345   . #x545C)       ; 攢
+    (chinese-big5      . #xF6E3)       ; ������
+    (ideograph-daikanwa . 13030)       ; �����
+    (=ucs              . #x6522)       ; 攢
     ))
 (define-char
   '((=>ucs             . #x22E88)      ; 𢺈
@@ -19728,28 +19728,28 @@
     (ideographic-strokes . 20)
     (total-strokes      . 23)
     (shinjigen-2       . 3150)
-    (japanese-jisx0208-1978    . #x3349)       ; �����
-    (japanese-jisx0208         . #x5978)       ; �����
-    (korean-ksc5601            . #x4E66)       ; �����
-    (chinese-cns11643-1                . #x7C39)       ; �����
-    (=jis-x0208-1990           . #x5978)       ; �����
-    (chinese-gb12345           . #x3D41)       ; 攪
-    (=gt-pj-1                  . #x5978)       ; 攪
-    (chinese-big5              . #xC5CD)       ; ������
-    (ideograph-daikanwa                . 13041)        ; �����
-    (=ucs                      . #x652A)       ; 攪
+    (=jis-x0208-1978   . #x3349)       ; �����
+    (japanese-jisx0208 . #x5978)       ; �����
+    (korean-ksc5601    . #x4E66)       ; �����
+    (chinese-cns11643-1 . #x7C39)      ; �����
+    (=jis-x0208-1990   . #x5978)       ; �����
+    (chinese-gb12345   . #x3D41)       ; 攪
+    (=gt-pj-1          . #x5978)       ; 攪
+    (chinese-big5      . #xC5CD)       ; ������
+    (ideograph-daikanwa . 13041)       ; �����
+    (=ucs              . #x652A)       ; 攪
     ))
 (define-char
   '((morohashi-daikanwa        13041 0 5)
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x5978)       ; �����
-    (japanese-jisx0208         . #x3349)       ; �����
-    (chinese-cns11643-3                . #x4C37)       ; �����
-    (=jis-x0208-1990           . #x3349)       ; �����
-    (=gt-pj-1                  . #x3349)       ; 撹
-    (=ucs                      . #x64B9)       ; 撹
+    (=jis-x0208-1978   . #x5978)       ; �����
+    (japanese-jisx0208 . #x3349)       ; �����
+    (chinese-cns11643-3 . #x4C37)      ; �����
+    (=jis-x0208-1990   . #x3349)       ; �����
+    (=gt-pj-1          . #x3349)       ; 撹
+    (=ucs              . #x64B9)       ; 撹
     ))
 (define-char
   '((ideographic-radical . 64) ; ⼿

diff --git a/lisp/utf-2000/Ideograph-R066-Rap.el b/lisp/utf-2000/Ideograph-R066-Rap.el
index 3d39d45..07fd585 100644 (file)
--- a/lisp/utf-2000/Ideograph-R066-Rap.el
+++ b/lisp/utf-2000/Ideograph-R066-Rap.el
@@ -1733,9 +1733,9 @@
     (ideographic-radical . 66) ; ⽁
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x5A49)       ; �����
-    (japanese-jisx0208         . #x5A49)       ; �����
-    (ideograph-daikanwa                . 13245)        ; �����
+    (=jis-x0208-1978   . #x5A49)       ; �����
+    (japanese-jisx0208 . #x5A49)       ; �����
+    (ideograph-daikanwa . 13245)       ; �����
     ))
 (define-char
   '((=>ucs             . #x655D)       ; 敝
@@ -1935,8 +1935,8 @@
     (ideographic-radical . 66) ; ⽁
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x343A)       ; �����
-    (japanese-jisx0208         . #x343A)       ; �����
+    (=jis-x0208-1978   . #x343A)       ; �����
+    (japanese-jisx0208 . #x343A)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        13260 0 5)
@@ -4084,9 +4084,9 @@
     (ideographic-radical . 66) ; ⽁
     (ideographic-strokes . 14)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x5A4D)       ; �����
-    (chinese-gb12345           . #x3150)       ; 斃
-    (=ucs                      . #x6583)       ; 斃
+    (=jis-x0208-1978   . #x5A4D)       ; �����
+    (chinese-gb12345   . #x3150)       ; 斃
+    (=ucs              . #x6583)       ; 斃
     ))
 (define-char
   '((=>ucs             . #x6583)       ; 斃

diff --git a/lisp/utf-2000/Ideograph-R067-Script.el b/lisp/utf-2000/Ideograph-R067-Script.el
index a16fdbc..e671bd6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R067-Script.el
+++ b/lisp/utf-2000/Ideograph-R067-Script.el
@@ -369,9 +369,9 @@
     (ideographic-strokes . 8)
     (total-strokes      . 12)
     (shinjigen-2       3207 1)
-    (japanese-jisx0208-1978    . #x4865)       ; �����
-    (japanese-jisx0208         . #x4865)       ; �����
-    (ideograph-daikanwa                . 13469)        ; �����
+    (=jis-x0208-1978   . #x4865)       ; �����
+    (japanese-jisx0208 . #x4865)       ; �����
+    (ideograph-daikanwa . 13469)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6590)       ; 斐

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index de2062a..d1a444d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -1702,11 +1702,11 @@
   '((ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 5)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x3937)       ; �����
-    (korean-ksc5601            . #x6469)       ; �����
-    (chinese-cns11643-3                . #x2D22)       ; �����
-    (ideograph-daikanwa                . 13885)        ; �����
-    (=ucs                      . #x663B)       ; 昻
+    (=jis-x0208-1978   . #x3937)       ; �����
+    (korean-ksc5601    . #x6469)       ; �����
+    (chinese-cns11643-3 . #x2D22)      ; �����
+    (ideograph-daikanwa . 13885)       ; �����
+    (=ucs              . #x663B)       ; 昻
     ))
 (define-char
   '((ideographic-radical . 72) ; ⽇
@@ -1997,10 +1997,10 @@
       )
      ((=ucs              . #x65E5)     ; 日
       )
-     ((japanese-jisx0208-1978    . #x3872)     ; �����
-      (japanese-jisx0208         . #x3872)     ; �����
-      (korean-ksc5601            . #x4E5F)     ; �����
-      (ideograph-daikanwa        . 00291)      ; �����
+     ((=jis-x0208-1978   . #x3872)     ; �����
+      (japanese-jisx0208  . #x3872)    ; �����
+      (korean-ksc5601    . #x4E5F)     ; �����
+      (ideograph-daikanwa . 00291)     ; �����
       ))
     (=jis-x0213-1-2000 . #x7538)       ; �����
     (ideograph-daikanwa . 13897)       ; �����
@@ -2620,10 +2620,10 @@
      ((char . ((ideograph-daikanwa . 01546)    ; �����
               ))
       ))
-    (japanese-jisx0208-1978    . #x5A70)       ; �����
-    (japanese-jisx0208         . #x5A70)       ; �����
-    (korean-ksc5601            . #x6079)       ; �����
-    (ideograph-daikanwa                . 13950)        ; �����
+    (=jis-x0208-1978   . #x5A70)       ; �����
+    (japanese-jisx0208 . #x5A70)       ; �����
+    (korean-ksc5601    . #x6079)       ; �����
+    (ideograph-daikanwa . 13950)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        13950 0 1)
@@ -6239,10 +6239,10 @@
     (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 14)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x3D6C)       ; �����
-    (korean-ksc5601            . #x5F75)       ; �����
-    (chinese-big5              . #xC0C6)       ; ������
-    (ideograph-daikanwa                . 14220)        ; �����
+    (=jis-x0208-1978   . #x3D6C)       ; �����
+    (korean-ksc5601    . #x5F75)       ; �����
+    (chinese-big5      . #xC0C6)       ; ������
+    (ideograph-daikanwa . 14220)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        14220 0 2)

diff --git a/lisp/utf-2000/Ideograph-R073-Say.el b/lisp/utf-2000/Ideograph-R073-Say.el
index 94b0009..f44d9ae 100644 (file)
--- a/lisp/utf-2000/Ideograph-R073-Say.el
+++ b/lisp/utf-2000/Ideograph-R073-Say.el
@@ -94,12 +94,12 @@
     (ideographic-radical . 73) ; ⽈
     (ideographic-strokes . 3)
     (total-strokes      . 7)
-    (japanese-jisx0208-1978    . #x3939)       ; �����
-    (japanese-jisx0208         . #x3939)       ; �����
-    (korean-ksc5601            . #x4C5A)       ; �����
-    (chinese-big5              . #xA7F3)       ; ������
-    (ideograph-daikanwa                . 14283)        ; �����
-    (=jef-china3               . #x51FB)       ; �����
+    (=jis-x0208-1978   . #x3939)       ; �����
+    (japanese-jisx0208 . #x3939)       ; �����
+    (korean-ksc5601    . #x4C5A)       ; �����
+    (chinese-big5      . #xA7F3)       ; ������
+    (ideograph-daikanwa . 14283)       ; �����
+    (=jef-china3       . #x51FB)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        14283 0 0)

diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el
index 0b6a198..5957de1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R075-Tree.el
+++ b/lisp/utf-2000/Ideograph-R075-Tree.el
@@ -1686,11 +1686,11 @@
     (ideographic-strokes . 4)
     (total-strokes      . 8)
     (shinjigen-2       . 3502)
-    (japanese-jisx0208-1978    . #x3E3E)       ; �����
-    (japanese-jisx0208         . #x3E3E)       ; �����
-    (chinese-big5              . #xAA51)       ; ������
-    (ideograph-daikanwa                . 14516)        ; �����
-    (=jef-china3               . #x53A8)       ; �����
+    (=jis-x0208-1978   . #x3E3E)       ; �����
+    (japanese-jisx0208 . #x3E3E)       ; �����
+    (chinese-big5      . #xAA51)       ; ������
+    (ideograph-daikanwa . 14516)       ; �����
+    (=jef-china3       . #x53A8)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        14516 0 0)
@@ -2686,7 +2686,7 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 4)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x5B45)       ; �����
+    (=jis-x0208-1978   . #x5B45)       ; �����
     ))
 (define-char
   '((ideographic-radical . 75) ; ⽊
@@ -2712,9 +2712,9 @@
   '((ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 4)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x5B40)       ; �����
-    (japanese-jisx0208         . #x5B40)       ; �����
-    (=ucs                      . #x67A9)       ; 枩
+    (=jis-x0208-1978   . #x5B40)       ; �����
+    (japanese-jisx0208 . #x5B40)       ; �����
+    (=ucs              . #x67A9)       ; 枩
     ))
 (define-char
   '((=>ucs             . #x67A9)       ; 枩
@@ -3283,9 +3283,9 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 5)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x4922)       ; �����
-    (chinese-big5              . #xCF60)       ; ������
-    (ideograph-daikanwa                . 14610)        ; �����
+    (=jis-x0208-1978   . #x4922)       ; �����
+    (chinese-big5      . #xCF60)       ; ������
+    (ideograph-daikanwa . 14610)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        14610 0 1)
@@ -3465,9 +3465,9 @@
     (ideographic-strokes . 5)
     (total-strokes      . 9)
     (shinjigen-2       . 3569)
-    (japanese-jisx0208-1978    . #x3D40)       ; �����
-    (japanese-jisx0208         . #x3D40)       ; �����
-    (ideograph-daikanwa                . 14622)        ; �����
+    (=jis-x0208-1978   . #x3D40)       ; �����
+    (japanese-jisx0208 . #x3D40)       ; �����
+    (ideograph-daikanwa . 14622)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        14622 0 0)
@@ -3853,10 +3853,10 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 5)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x5B57)       ; �����
-    (japanese-jisx0208         . #x5B57)       ; �����
-    (chinese-big5              . #xCF54)       ; ������
-    (ideograph-daikanwa                . 14645)        ; �����
+    (=jis-x0208-1978   . #x5B57)       ; �����
+    (japanese-jisx0208 . #x5B57)       ; �����
+    (chinese-big5      . #xCF54)       ; ������
+    (ideograph-daikanwa . 14645)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        14645 0 0)
@@ -4503,10 +4503,10 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 5)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x5B4A)       ; �����
-    (chinese-cns11643-3                . #x2D35)       ; �����
-    (ideograph-daikanwa                . 49162)        ; �����
-    (=ucs                      . #x2F8DF)      ; 柺
+    (=jis-x0208-1978   . #x5B4A)       ; �����
+    (chinese-cns11643-3 . #x2D35)      ; �����
+    (ideograph-daikanwa . 49162)       ; �����
+    (=ucs              . #x2F8DF)      ; 柺
     ))
 (define-char
   '((ideographic-radical . 75) ; ⽊
@@ -5065,12 +5065,12 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x393B)       ; �����
-    (japanese-jisx0208         . #x393B)       ; �����
-    (korean-ksc5601            . #x4E68)       ; �����
-    (chinese-big5              . #xAED5)       ; ������
-    (ideograph-daikanwa                . 14713)        ; �����
-    (=jef-china3               . #x53C2)       ; �����
+    (=jis-x0208-1978   . #x393B)       ; �����
+    (japanese-jisx0208 . #x393B)       ; �����
+    (korean-ksc5601    . #x4E68)       ; �����
+    (chinese-big5      . #xAED5)       ; ������
+    (ideograph-daikanwa . 14713)       ; �����
+    (=jef-china3       . #x53C2)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6821)       ; 校
@@ -5654,9 +5654,9 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x456D)       ; �����
-    (japanese-jisx0208         . #x456D)       ; �����
-    (ideograph-daikanwa                . 14757)        ; �����
+    (=jis-x0208-1978   . #x456D)       ; �����
+    (japanese-jisx0208 . #x456D)       ; �����
+    (ideograph-daikanwa . 14757)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        14757 0 0)
@@ -6124,9 +6124,9 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x4B71)       ; �����
-    (japanese-jisx0208         . #x4B71)       ; �����
-    (=cbeta                    . 02036)        ; �����
+    (=jis-x0208-1978   . #x4B71)       ; �����
+    (japanese-jisx0208 . #x4B71)       ; �����
+    (=cbeta            . 02036)        ; �����
     ))
 (define-char
   '((ideographic-radical . 75) ; ⽊
@@ -6267,14 +6267,14 @@
     (ideographic-strokes . 6)
     (total-strokes      . 10)
     (hanyu-dazidian    2 1202 5)
-    (japanese-jisx0208-1978    . #x5B58)       ; �����
-    (chinese-gb2312            . #x686D)       ; �����
-    (japanese-jisx0208         . #x4930)       ; �����
-    (=iso-ir165                        . #x686D)       ; �����
-    (=jis-x0208-1990           . #x4930)       ; �����
-    (=gt-pj-1                  . #x4930)       ; 桧
-    (=hanziku-3                        . #xF575)       ; ������
-    (=ucs                      . #x6867)       ; 桧
+    (=jis-x0208-1978   . #x5B58)       ; �����
+    (chinese-gb2312    . #x686D)       ; �����
+    (japanese-jisx0208 . #x4930)       ; �����
+    (=iso-ir165                . #x686D)       ; �����
+    (=jis-x0208-1990   . #x4930)       ; �����
+    (=gt-pj-1          . #x4930)       ; 桧
+    (=hanziku-3                . #xF575)       ; ������
+    (=ucs              . #x6867)       ; 桧
     ))
 (define-char
   '((ideographic-radical . 75) ; ⽊
@@ -6805,9 +6805,9 @@
       )
      ((=ucs              . #x6728)     ; 木
       )
-     ((japanese-jisx0208-1978    . #x6C35)     ; �����
-      (japanese-jisx0208         . #x6C35)     ; �����
-      (chinese-cns11643-1        . #x4B49)     ; �����
+     ((=jis-x0208-1978   . #x6C35)     ; �����
+      (japanese-jisx0208  . #x6C35)    ; �����
+      (chinese-cns11643-1 . #x4B49)    ; �����
       ))
     (chinese-cns11643-5 . #x3279)      ; �����
     ))
@@ -7054,11 +7054,11 @@
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (hanyu-dazidian    2 1216 5)
-    (japanese-jisx0208-1978    . #x5B74)       ; �����
-    (chinese-cns11643-3                . #x3651)       ; �����
-    (ideograph-daikanwa                . 14840)        ; �����
-    (=hanziku-3                        . #xF85E)       ; ������
-    (=ucs                      . #x688E)       ; 梎
+    (=jis-x0208-1978   . #x5B74)       ; �����
+    (chinese-cns11643-3 . #x3651)      ; �����
+    (ideograph-daikanwa . 14840)       ; �����
+    (=hanziku-3                . #xF85E)       ; ������
+    (=ucs              . #x688E)       ; 梎
     ))
 (define-char
   '((=>ucs             . #x688E)       ; 梎
@@ -7280,9 +7280,9 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x5B6B)       ; �����
-    (ideograph-daikanwa                . 14856)        ; �����
-    (=jef-china3               . #x70CB)       ; �����
+    (=jis-x0208-1978   . #x5B6B)       ; �����
+    (ideograph-daikanwa . 14856)       ; �����
+    (=jef-china3       . #x70CB)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        14856 0 1)
@@ -8011,11 +8011,11 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x5B6D)       ; �����
-    (japanese-jisx0208         . #x456E)       ; �����
-    (=jis-x0208-1990           . #x456E)       ; �����
-    (=gt-pj-1                  . #x456E)       ; �����
-    (=ucs@jis                  . #x68BC)       ; �����
+    (=jis-x0208-1978   . #x5B6D)       ; �����
+    (japanese-jisx0208 . #x456E)       ; �����
+    (=jis-x0208-1990   . #x456E)       ; �����
+    (=gt-pj-1          . #x456E)       ; �����
+    (=ucs@jis          . #x68BC)       ; �����
     ))
 (define-char
   '((ideographic-radical . 75) ; ⽊
@@ -9908,11 +9908,11 @@
     (ideographic-strokes . 8)
     (total-strokes      . 12)
     (shinjigen-2       . 3677)
-    (japanese-jisx0208-1978    . #x3F22)       ; �����
-    (japanese-jisx0208         . #x3F22)       ; �����
-    (korean-ksc5601            . #x6355)       ; �����
-    (chinese-big5              . #xB4D3)       ; ������
-    (ideograph-daikanwa                . 15023)        ; �����
+    (=jis-x0208-1978   . #x3F22)       ; �����
+    (japanese-jisx0208 . #x3F22)       ; �����
+    (korean-ksc5601    . #x6355)       ; �����
+    (chinese-big5      . #xB4D3)       ; ������
+    (ideograph-daikanwa . 15023)       ; �����
     ))
 (define-char
   '((=>ucs             . #x690D)       ; 植
@@ -10917,12 +10917,12 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x5C3F)       ; �����
-    (chinese-gb2312            . #x522C)       ; �����
-    (japanese-jisx0208         . #x5C3F)       ; �����
-    (korean-ksc5601            . #x652B)       ; �����
-    (=iso-ir165                        . #x522C)       ; �����
-    (=ucs                      . #x6930)       ; 椰
+    (=jis-x0208-1978   . #x5C3F)       ; �����
+    (chinese-gb2312    . #x522C)       ; �����
+    (japanese-jisx0208 . #x5C3F)       ; �����
+    (korean-ksc5601    . #x652B)       ; �����
+    (=iso-ir165                . #x522C)       ; �����
+    (=ucs              . #x6930)       ; 椰
     ))
 (define-char
   '((=>ucs             . #x6931)       ; 椱
@@ -12095,8 +12095,8 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x5C37)       ; �����
-    (japanese-jisx0208         . #x5C37)       ; �����
+    (=jis-x0208-1978   . #x5C37)       ; �����
+    (japanese-jisx0208 . #x5C37)       ; �����
     ))
 (define-char
   '((=>ucs             . #x696B)       ; 楫
@@ -12206,12 +12206,12 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x3D5D)       ; �����
-    (japanese-jisx0208         . #x3D5D)       ; �����
-    (korean-ksc5601            . #x6264)       ; �����
-    (=iso-ir165                        . #x7B7D)       ; �����
-    (chinese-big5              . #xDDE3)       ; ������
-    (=ucs                      . #x696F)       ; 楯
+    (=jis-x0208-1978   . #x3D5D)       ; �����
+    (japanese-jisx0208 . #x3D5D)       ; �����
+    (korean-ksc5601    . #x6264)       ; �����
+    (=iso-ir165                . #x7B7D)       ; �����
+    (chinese-big5      . #xDDE3)       ; ������
+    (=ucs              . #x696F)       ; 楯
     ))
 (define-char
   '((ideographic-radical . 75) ; ⽊
@@ -12526,7 +12526,7 @@
      (:char    ((ideograph-daikanwa . 15364)   ; �����
                 )
       :sources (morohashi-daikanwa)))
-    (japanese-jisx0208-1978    . #x3335)       ; �����
+    (=jis-x0208-1978   . #x3335)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        15217 1 1)
@@ -13233,8 +13233,8 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x4F31)       ; �����
-    (ideograph-daikanwa                . 15226)        ; �����
+    (=jis-x0208-1978   . #x4F31)       ; �����
+    (ideograph-daikanwa . 15226)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6994)       ; 榔
@@ -13688,11 +13688,11 @@
     (total-strokes      . 14)
     (shinjigen-1       . 3772)
     (shinjigen-2       . 3773)
-    (japanese-jisx0208-1978    . #x5C52)       ; �����
-    (japanese-jisx0208         . #x5C52)       ; �����
-    (korean-ksc5601            . #x5D6E)       ; �����
-    (chinese-big5              . #xE249)       ; ������
-    (ideograph-daikanwa                . 15258)        ; �����
+    (=jis-x0208-1978   . #x5C52)       ; �����
+    (japanese-jisx0208 . #x5C52)       ; �����
+    (korean-ksc5601    . #x5D6E)       ; �����
+    (chinese-big5      . #xE249)       ; ������
+    (ideograph-daikanwa . 15258)       ; �����
     ))
 (define-char
   '((=>ucs             . #x69A7)       ; 榧
@@ -14409,12 +14409,12 @@
     (ideographic-strokes . 10)
     (total-strokes      . 14)
     (shinjigen-2       . 3770)
-    (japanese-jisx0208-1978    . #x4B6A)       ; �����
-    (japanese-jisx0208         . #x7422)       ; �����
-    (chinese-cns11643-4                . #x4427)       ; �����
-    (=jis-x0208-1990           . #x7422)       ; �����
-    (ideograph-daikanwa                . 15310)        ; �����
-    (=ucs                      . #x69C7)       ; 槇
+    (=jis-x0208-1978   . #x4B6A)       ; �����
+    (japanese-jisx0208 . #x7422)       ; �����
+    (chinese-cns11643-4 . #x4427)      ; �����
+    (=jis-x0208-1990   . #x7422)       ; �����
+    (ideograph-daikanwa . 15310)       ; �����
+    (=ucs              . #x69C7)       ; 槇
     ))
 (define-char
   '((ideographic-radical . 75) ; ⽊
@@ -14507,10 +14507,10 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x4448)       ; �����
-    (korean-ksc5601            . #x7759)       ; �����
-    (chinese-big5              . #xBA6C)       ; ������
-    (ideograph-daikanwa                . 15318)        ; �����
+    (=jis-x0208-1978   . #x4448)       ; �����
+    (korean-ksc5601    . #x7759)       ; �����
+    (chinese-big5      . #xBA6C)       ; ������
+    (ideograph-daikanwa . 15318)       ; �����
     ))
 (define-char
   '((=>ucs             . #x69CC)       ; 槌
@@ -14773,8 +14773,8 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x3A67)       ; �����
-    (ideograph-daikanwa                . 15352)        ; �����
+    (=jis-x0208-1978   . #x3A67)       ; �����
+    (ideograph-daikanwa . 15352)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        15352 0 4)
@@ -16169,8 +16169,8 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 11)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4875)       ; �����
-    (ideograph-daikanwa                . 15415)        ; �����
+    (=jis-x0208-1978   . #x4875)       ; �����
+    (ideograph-daikanwa . 15415)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6A0B)       ; 樋
@@ -17799,8 +17799,8 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 12)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x5C6D)       ; �����
-    (japanese-jisx0208         . #x5C6D)       ; �����
+    (=jis-x0208-1978   . #x5C6D)       ; �����
+    (japanese-jisx0208 . #x5C6D)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        15512 0 3)
@@ -19548,11 +19548,11 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 13)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x3869)       ; �����
-    (japanese-jisx0208         . #x3869)       ; �����
-    (korean-ksc5601            . #x5055)       ; �����
-    (chinese-big5              . #xECFE)       ; ������
-    (ideograph-daikanwa                . 15657)        ; �����
+    (=jis-x0208-1978   . #x3869)       ; �����
+    (japanese-jisx0208 . #x3869)       ; �����
+    (korean-ksc5601    . #x5055)       ; �����
+    (chinese-big5      . #xECFE)       ; ������
+    (ideograph-daikanwa . 15657)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6A8E)       ; 檎
@@ -19632,8 +19632,8 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 13)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x5C79)       ; �����
-    (japanese-jisx0208         . #x5C79)       ; �����
+    (=jis-x0208-1978   . #x5C79)       ; �����
+    (japanese-jisx0208 . #x5C79)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        15659 0 1)
@@ -19896,15 +19896,15 @@
     (ideographic-strokes . 13)
     (total-strokes      . 17)
     (shinjigen-2       . 3847)
-    (japanese-jisx0208-1978    . #x4930)       ; �����
-    (japanese-jisx0208         . #x5B58)       ; �����
-    (korean-ksc5601            . #x7C66)       ; �����
-    (chinese-cns11643-1                . #x7375)       ; �����
-    (=jis-x0208-1990           . #x5B58)       ; �����
-    (chinese-gb12345           . #x686D)       ; 檜
-    (chinese-big5              . #xC0CC)       ; ������
-    (ideograph-daikanwa                . 15676)        ; �����
-    (=ucs                      . #x6A9C)       ; 檜
+    (=jis-x0208-1978   . #x4930)       ; �����
+    (japanese-jisx0208 . #x5B58)       ; �����
+    (korean-ksc5601    . #x7C66)       ; �����
+    (chinese-cns11643-1 . #x7375)      ; �����
+    (=jis-x0208-1990   . #x5B58)       ; �����
+    (chinese-gb12345   . #x686D)       ; 檜
+    (chinese-big5      . #xC0CC)       ; ������
+    (ideograph-daikanwa . 15676)       ; �����
+    (=ucs              . #x6A9C)       ; 檜
     ))
 (define-char
   '((=>ucs             . #x6A9D)       ; 檝
@@ -20577,13 +20577,13 @@
     (ideographic-strokes . 14)
     (total-strokes      . 18)
     (shinjigen-2       . 3866)
-    (japanese-jisx0208-1978    . #x456E)       ; �����
-    (japanese-jisx0208         . #x5B6D)       ; �����
-    (chinese-cns11643-1                . #x7654)       ; �����
-    (=jis-x0208-1990           . #x5B6D)       ; �����
-    (chinese-big5              . #xC268)       ; ������
-    (ideograph-daikanwa                . 15713)        ; �����
-    (=ucs                      . #x6AAE)       ; 檮
+    (=jis-x0208-1978   . #x456E)       ; �����
+    (japanese-jisx0208 . #x5B6D)       ; �����
+    (chinese-cns11643-1 . #x7654)      ; �����
+    (=jis-x0208-1990   . #x5B6D)       ; �����
+    (chinese-big5      . #xC268)       ; ������
+    (ideograph-daikanwa . 15713)       ; �����
+    (=ucs              . #x6AAE)       ; 檮
     ))
 (define-char
   '((ideographic-radical . 75) ; ⽊
@@ -21975,9 +21975,9 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 15)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x367B)       ; �����
-    (korean-ksc5601            . #x716E)       ; �����
-    (chinese-big5              . #xC0CD)       ; ������
+    (=jis-x0208-1978   . #x367B)       ; �����
+    (korean-ksc5601    . #x716E)       ; �����
+    (chinese-big5      . #xC0CD)       ; ������
     ))
 (define-char
   '((=>ucs             . #x6ADB)       ; 櫛
@@ -23486,9 +23486,9 @@
       )
      ((=ucs              . #x6728)     ; 木
       )
-     ((japanese-jisx0208-1978    . #x6663)     ; �����
-      (japanese-jisx0208         . #x6663)     ; �����
-      (ideograph-daikanwa        . 29179)      ; �����
+     ((=jis-x0208-1978   . #x6663)     ; �����
+      (japanese-jisx0208  . #x6663)    ; �����
+      (ideograph-daikanwa . 29179)     ; �����
       ))
     (ideograph-daikanwa . 15921)       ; �����
     ))

diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index b06c02e..128c27d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -585,8 +585,8 @@
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (shinjigen-1       . 3999)
-    (japanese-jisx0208-1978    . #x334C)       ; �����
-    (japanese-jisx0208         . #x334C)       ; �����
+    (=jis-x0208-1978   . #x334C)       ; �����
+    (japanese-jisx0208 . #x334C)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        16646 0 5)

diff --git a/lisp/utf-2000/Ideograph-R082-Fur.el b/lisp/utf-2000/Ideograph-R082-Fur.el
index 6afb08e..d87e5d6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R082-Fur.el
+++ b/lisp/utf-2000/Ideograph-R082-Fur.el
@@ -2630,8 +2630,8 @@
     (ideographic-radical . 82) ; ⽑
     (ideographic-strokes . 13)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x5D61)       ; �����
-    (japanese-jisx0208         . #x5D61)       ; �����
+    (=jis-x0208-1978   . #x5D61)       ; �����
+    (japanese-jisx0208 . #x5D61)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6C0A)       ; 氊

diff --git a/lisp/utf-2000/Ideograph-R083-Clan.el b/lisp/utf-2000/Ideograph-R083-Clan.el
index 83c9fe6..23698cf 100644 (file)
--- a/lisp/utf-2000/Ideograph-R083-Clan.el
+++ b/lisp/utf-2000/Ideograph-R083-Clan.el
@@ -86,9 +86,9 @@
     (ideographic-radical . 83) ; ⽒
     (ideographic-strokes . 4)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x5D62)       ; �����
-    (japanese-jisx0208         . #x5D62)       ; �����
-    (korean-ksc5601            . #x586C)       ; �����
+    (=jis-x0208-1978   . #x5D62)       ; �����
+    (japanese-jisx0208 . #x5D62)       ; �����
+    (korean-ksc5601    . #x586C)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        17030 0 2)

diff --git a/lisp/utf-2000/Ideograph-R084-Steam.el b/lisp/utf-2000/Ideograph-R084-Steam.el
index c38290e..6b26be9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R084-Steam.el
+++ b/lisp/utf-2000/Ideograph-R084-Steam.el
@@ -510,10 +510,10 @@
       )
      ((=ucs              . #x6C14)     ; 气
       )
-     ((japanese-jisx0208-1978    . #x4B5F)     ; �����
-      (japanese-jisx0208         . #x4B5F)     ; �����
-      (korean-ksc5601            . #x5D4E)     ; �����
-      (ideograph-daikanwa        . 22959)      ; �����
+     ((=jis-x0208-1978   . #x4B5F)     ; �����
+      (japanese-jisx0208  . #x4B5F)    ; �����
+      (korean-ksc5601    . #x5D4E)     ; �����
+      (ideograph-daikanwa . 22959)     ; �����
       ))
     (ideograph-daikanwa . 17073)       ; �����
     (=cbeta            . 00645)        ; �����

diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 617d4c3..3bb3620 100644 (file)
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -2339,10 +2339,10 @@
     (ideographic-strokes . 5)
     (total-strokes      . 8)
     (shinjigen-2       . 4115)
-    (japanese-jisx0208-1978    . #x3168)       ; �����
-    (japanese-jisx0208         . #x3168)       ; �����
-    (chinese-big5              . #xAA75)       ; ������
-    (ideograph-daikanwa                . 17260)        ; �����
+    (=jis-x0208-1978   . #x3168)       ; �����
+    (japanese-jisx0208 . #x3168)       ; �����
+    (chinese-big5      . #xAA75)       ; ������
+    (ideograph-daikanwa . 17260)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6CBF)       ; 沿
@@ -2886,14 +2886,14 @@
   '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x4B22)       ; �����
-    (chinese-gb2312            . #x455D)       ; �����
-    (korean-ksc5601            . #x785C)       ; �����
-    (=iso-ir165                        . #x455D)       ; �����
-    (chinese-cns11643-1                . #x4E5A)       ; �����
-    (chinese-big5              . #xAA77)       ; ������
-    (ideograph-daikanwa                . 17307)        ; �����
-    (=ucs                      . #x6CE1)       ; 泡
+    (=jis-x0208-1978   . #x4B22)       ; �����
+    (chinese-gb2312    . #x455D)       ; �����
+    (korean-ksc5601    . #x785C)       ; �����
+    (=iso-ir165                . #x455D)       ; �����
+    (chinese-cns11643-1 . #x4E5A)      ; �����
+    (chinese-big5      . #xAA77)       ; ������
+    (ideograph-daikanwa . 17307)       ; �����
+    (=ucs              . #x6CE1)       ; 泡
     ))
 (define-char
   '((=>ucs             . #x6CE1)       ; 泡
@@ -4574,9 +4574,9 @@
       ))
     (shinjigen-1       . 4197)
     (shinjigen-2       . 4197)
-    (japanese-jisx0208-1978    . #x4749)       ; �����
-    (japanese-jisx0208         . #x4749)       ; �����
-    (ideograph-daikanwa                . 17428)        ; �����
+    (=jis-x0208-1978   . #x4749)       ; �����
+    (japanese-jisx0208 . #x4749)       ; �����
+    (ideograph-daikanwa . 17428)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6D3E)       ; 派
@@ -6529,17 +6529,21 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x5E39)       ; �����
-    (japanese-jisx0208         . #x4573)       ; �����
-    (=jis-x0208-1990           . #x4573)       ; �����
-    (=ucs@jis                  . #x6D9B)       ; �����
+    (=jis-x0208-1978   . #x5E39)       ; �����
+    (japanese-jisx0208 . #x4573)       ; �����
+    (=jis-x0208-1990   . #x4573)       ; �����
+    (=ucs@jis          . #x6D9B)       ; �����
     ))
 (define-char
   '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 7)
     (total-strokes      . 10)
     (<-simplified-ideograph
-     ((japanese-jisx0208-1978    . #x4642)     ; �����
+     ((=jis-x0208-1978   . #x4642)     ; �����
+      (korean-ksc5601    . #x5439)     ; �����
+      (japanese-jisx0212  . #x492C)    ; �����
+      (=jis-x0213-1-2000  . #x773D)    ; �����
+      (ideograph-daikanwa . 18591)     ; �����
       ))
     (japanese-jisx0208 . #x4642)       ; �����
     (=jis-x0208-1990   . #x4642)       ; �����
@@ -8007,10 +8011,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x307C)       ; �����
-    (korean-ksc5601            . #x6B62)       ; �����
-    (chinese-big5              . #xB25D)       ; ������
-    (ideograph-daikanwa                . 17678)        ; �����
+    (=jis-x0208-1978   . #x307C)       ; �����
+    (korean-ksc5601    . #x6B62)       ; �����
+    (chinese-big5      . #xB25D)       ; ������
+    (ideograph-daikanwa . 17678)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        17678 0 3)
@@ -9279,13 +9283,13 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x3D6D)       ; �����
-    (korean-ksc5601            . #x6E42)       ; �����
-    (=jis-x0213-1-2000         . #x7677)       ; �����
-    (ideograph-daikanwa                . 17758)        ; �����
-    (=big5-cdp                 . #xB25A)       ; ������
-    (=ucs@ks                   . #x6E1A)       ; 渚
-    (=ucs                      . #xFA46)       ; 渚
+    (=jis-x0208-1978   . #x3D6D)       ; �����
+    (korean-ksc5601    . #x6E42)       ; �����
+    (=jis-x0213-1-2000 . #x7677)       ; �����
+    (ideograph-daikanwa . 17758)       ; �����
+    (=big5-cdp         . #xB25A)       ; ������
+    (=ucs@ks           . #x6E1A)       ; 渚
+    (=ucs              . #xFA46)       ; 渚
     ))
 (define-char
   '((morohashi-daikanwa        17758 0 2)
@@ -9478,13 +9482,13 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x5E56)       ; �����
-    (chinese-gb2312            . #x547C)       ; �����
-    (japanese-jisx0208         . #x5E56)       ; �����
-    (=iso-ir165                        . #x547C)       ; �����
-    (chinese-cns11643-1                . #x6034)       ; �����
-    (chinese-big5              . #xB4ED)       ; ������
-    (=ucs                      . #x6E23)       ; 渣
+    (=jis-x0208-1978   . #x5E56)       ; �����
+    (chinese-gb2312    . #x547C)       ; �����
+    (japanese-jisx0208 . #x5E56)       ; �����
+    (=iso-ir165                . #x547C)       ; �����
+    (chinese-cns11643-1 . #x6034)      ; �����
+    (chinese-big5      . #xB4ED)       ; ������
+    (=ucs              . #x6E23)       ; 渣
     ))
 (define-char
   '((=>ucs             . #x3D0F)       ; 㴏
@@ -11032,10 +11036,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x5E50)       ; �����
-    (korean-ksc5601            . #x6C5C)       ; �����
-    (chinese-cns11643-1                . #x603A)       ; �����
-    (ideograph-daikanwa                . 17873)        ; �����
+    (=jis-x0208-1978   . #x5E50)       ; �����
+    (korean-ksc5601    . #x6C5C)       ; �����
+    (chinese-cns11643-1 . #x603A)      ; �����
+    (ideograph-daikanwa . 17873)       ; �����
     ))
 (define-char
   '((ideographic-radical . 85) ; ⽔
@@ -11590,12 +11594,12 @@
     (ideographic-strokes . 9)
     (total-strokes      . 12)
     (shinjigen-2       . 4364)
-    (japanese-jisx0208-1978    . #x4F51)       ; �����
-    (chinese-gb2312            . #x4D65)       ; �����
-    (japanese-jisx0208         . #x4F51)       ; �����
-    (=iso-ir165                        . #x4D65)       ; �����
-    (ideograph-daikanwa                . 17920)        ; �����
-    (=ucs                      . #x6E7E)       ; 湾
+    (=jis-x0208-1978   . #x4F51)       ; �����
+    (chinese-gb2312    . #x4D65)       ; �����
+    (japanese-jisx0208 . #x4F51)       ; �����
+    (=iso-ir165                . #x4D65)       ; �����
+    (ideograph-daikanwa . 17920)       ; �����
+    (=ucs              . #x6E7E)       ; 湾
     ))
 (define-char
   '((=>ucs             . #x6E7E)       ; 湾
@@ -12054,10 +12058,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x3942)       ; �����
-    (korean-ksc5601            . #x4F35)       ; �����
-    (chinese-big5              . #xB7BE)       ; ������
-    (ideograph-daikanwa                . 17944)        ; �����
+    (=jis-x0208-1978   . #x3942)       ; �����
+    (korean-ksc5601    . #x4F35)       ; �����
+    (chinese-big5      . #xB7BE)       ; ������
+    (ideograph-daikanwa . 17944)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        17944 0 1)
@@ -12165,10 +12169,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x306E)       ; �����
-    (korean-ksc5601            . #x6C6E)       ; �����
-    (chinese-big5              . #xB7B8)       ; ������
-    (ideograph-daikanwa                . 17951)        ; �����
+    (=jis-x0208-1978   . #x306E)       ; �����
+    (korean-ksc5601    . #x6C6E)       ; �����
+    (chinese-big5      . #xB7B8)       ; ������
+    (ideograph-daikanwa . 17951)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        17951 0 3)
@@ -12695,10 +12699,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x452E)       ; �����
-    (korean-ksc5601            . #x527C)       ; �����
-    (chinese-big5              . #xB7C4)       ; ������
-    (ideograph-daikanwa                . 17990)        ; �����
+    (=jis-x0208-1978   . #x452E)       ; �����
+    (korean-ksc5601    . #x527C)       ; �����
+    (chinese-big5      . #xB7C4)       ; ������
+    (ideograph-daikanwa . 17990)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        17990 0 2)
@@ -14445,10 +14449,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x5E78)       ; �����
-    (japanese-jisx0208         . #x5E78)       ; �����
-    (korean-ksc5601            . #x4D63)       ; �����
-    (chinese-big5              . #xBA75)       ; ������
+    (=jis-x0208-1978   . #x5E78)       ; �����
+    (japanese-jisx0208 . #x5E78)       ; �����
+    (korean-ksc5601    . #x4D63)       ; �����
+    (chinese-big5      . #xBA75)       ; ������
     ))
 (define-char
   '((morohashi-daikanwa        18098 0 1)
@@ -14810,9 +14814,9 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x5E74)       ; �����
-    (japanese-jisx0208         . #x5E74)       ; �����
-    (korean-ksc5601            . #x4B49)       ; �����
+    (=jis-x0208-1978   . #x5E74)       ; �����
+    (japanese-jisx0208 . #x5E74)       ; �����
+    (korean-ksc5601    . #x4B49)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6F12)       ; 漒
@@ -15179,10 +15183,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x4E7A)       ; �����
-    (korean-ksc5601            . #x557E)       ; �����
-    (chinese-big5              . #xBAA7)       ; ������
-    (ideograph-daikanwa                . 18155)        ; �����
+    (=jis-x0208-1978   . #x4E7A)       ; �����
+    (korean-ksc5601    . #x557E)       ; �����
+    (chinese-big5      . #xBAA7)       ; ������
+    (ideograph-daikanwa . 18155)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6F23)       ; 漣
@@ -15640,8 +15644,8 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x5F21)       ; �����
-    (japanese-jisx0208         . #x5F21)       ; �����
+    (=jis-x0208-1978   . #x5F21)       ; �����
+    (japanese-jisx0208 . #x5F21)       ; �����
     ))
 (define-char
   '((ideographic-radical . 85) ; ⽔
@@ -16011,11 +16015,11 @@
   '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x5E75)       ; �����
-    (japanese-jisx0208         . #x3443)       ; �����
-    (=jis-x0208-1990           . #x3443)       ; �����
-    (ideograph-daikanwa                . 18216)        ; �����
-    (=ucs                      . #x6F45)       ; 潅
+    (=jis-x0208-1978   . #x5E75)       ; �����
+    (japanese-jisx0208 . #x3443)       ; �����
+    (=jis-x0208-1990   . #x3443)       ; �����
+    (ideograph-daikanwa . 18216)       ; �����
+    (=ucs              . #x6F45)       ; 潅
     ))
 (define-char
   '((=>ucs             . #x6F45)       ; 潅
@@ -16335,12 +16339,12 @@
   '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x482E)       ; �����
-    (japanese-jisx0212         . #x4855)       ; �����
-    (=jis-x0213-1-2000         . #x7729)       ; �����
-    (chinese-gb12345           . #x4643)       ; 潑
-    (ideograph-daikanwa                . 18225)        ; �����
-    (=ucs                      . #x6F51)       ; 潑
+    (=jis-x0208-1978   . #x482E)       ; �����
+    (japanese-jisx0212 . #x4855)       ; �����
+    (=jis-x0213-1-2000 . #x7729)       ; �����
+    (chinese-gb12345   . #x4643)       ; 潑
+    (ideograph-daikanwa . 18225)       ; �����
+    (=ucs              . #x6F51)       ; 潑
     ))
 (define-char
   '((=>ucs             . #x6F51)       ; 潑
@@ -16680,10 +16684,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x3442)       ; �����
-    (chinese-cns11643-3                . #x4C7C)       ; �����
-    (=cbeta                    . 00589)        ; �����
-    (=ucs                      . #x3D4E)       ; 㵎
+    (=jis-x0208-1978   . #x3442)       ; �����
+    (chinese-cns11643-3 . #x4C7C)      ; �����
+    (=cbeta            . 00589)        ; �����
+    (=ucs              . #x3D4E)       ; 㵎
     ))
 (define-char
   '((morohashi-daikanwa        18253 0 5)
@@ -20050,15 +20054,15 @@
     (ideographic-strokes . 14)
     (total-strokes      . 17)
     (shinjigen-2       . 4509)
-    (japanese-jisx0208-1978    . #x4573)       ; �����
-    (japanese-jisx0208         . #x5E39)       ; �����
-    (korean-ksc5601            . #x5426)       ; �����
-    (chinese-cns11643-1                . #x7427)       ; �����
-    (=jis-x0208-1990           . #x5E39)       ; �����
-    (chinese-gb12345           . #x4C4E)       ; 濤
-    (chinese-big5              . #xC0DC)       ; ������
-    (ideograph-daikanwa                . 18508)        ; �����
-    (=ucs                      . #x6FE4)       ; 濤
+    (=jis-x0208-1978   . #x4573)       ; �����
+    (japanese-jisx0208 . #x5E39)       ; �����
+    (korean-ksc5601    . #x5426)       ; �����
+    (chinese-cns11643-1 . #x7427)      ; �����
+    (=jis-x0208-1990   . #x5E39)       ; �����
+    (chinese-gb12345   . #x4C4E)       ; 濤
+    (chinese-big5      . #xC0DC)       ; ������
+    (ideograph-daikanwa . 18508)       ; �����
+    (=ucs              . #x6FE4)       ; 濤
     ))
 (define-char
   '((ideographic-radical . 85) ; ⽔
@@ -20348,9 +20352,9 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 14)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x4275)       ; �����
-    (korean-ksc5601            . #x767B)       ; �����
-    (ideograph-daikanwa                . 18532)        ; �����
+    (=jis-x0208-1978   . #x4275)       ; �����
+    (korean-ksc5601    . #x767B)       ; �����
+    (ideograph-daikanwa . 18532)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6FEF)       ; 濯
@@ -20961,13 +20965,13 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 15)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x4642)       ; �����
-    (korean-ksc5601            . #x5439)       ; �����
-    (japanese-jisx0212         . #x492C)       ; �����
-    (=jis-x0213-1-2000         . #x773D)       ; �����
-    (chinese-big5              . #xC270)       ; ������
-    (ideograph-daikanwa                . 18591)        ; �����
-    (=ucs@jis                  . #x7006)       ; �����
+    (=jis-x0208-1978   . #x4642)       ; �����
+    (korean-ksc5601    . #x5439)       ; �����
+    (japanese-jisx0212 . #x492C)       ; �����
+    (=jis-x0213-1-2000 . #x773D)       ; �����
+    (chinese-big5      . #xC270)       ; ������
+    (ideograph-daikanwa . 18591)       ; �����
+    (=ucs@jis          . #x7006)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        18591 0 2)
@@ -21602,10 +21606,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 16)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x494E)       ; �����
-    (korean-ksc5601            . #x5E35)       ; �����
-    (chinese-big5              . #xC378)       ; ������
-    (ideograph-daikanwa                . 18636)        ; �����
+    (=jis-x0208-1978   . #x494E)       ; �����
+    (korean-ksc5601    . #x5E35)       ; �����
+    (chinese-big5      . #xC378)       ; ������
+    (ideograph-daikanwa . 18636)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        18636 0 0)
@@ -21817,10 +21821,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 16)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x4654)       ; �����
-    (korean-ksc5601            . #x6F67)       ; �����
-    (ideograph-daikanwa                . 18659)        ; �����
-    (=cbeta                    . 01336)        ; �����
+    (=jis-x0208-1978   . #x4654)       ; �����
+    (korean-ksc5601    . #x6F67)       ; �����
+    (ideograph-daikanwa . 18659)       ; �����
+    (=cbeta            . 01336)        ; �����
     ))
 (define-char
   '((=>ucs             . #x701E)       ; 瀞
@@ -21972,9 +21976,9 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 16)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x4375)       ; �����
-    (chinese-big5              . #xEFF5)       ; ������
-    (ideograph-daikanwa                . 18670)        ; �����
+    (=jis-x0208-1978   . #x4375)       ; �����
+    (chinese-big5      . #xEFF5)       ; ������
+    (ideograph-daikanwa . 18670)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        18670 0 2)
@@ -23105,12 +23109,12 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 17)
     (total-strokes      . 20)
-    (japanese-jisx0208-1978    . #x3443)       ; �����
-    (japanese-jisx0208         . #x5E75)       ; �����
-    (korean-ksc5601            . #x4E34)       ; �����
-    (=jis-x0208-1990           . #x5E75)       ; �����
-    (chinese-big5              . #xC4E9)       ; ������
-    (=ucs@jis                  . #x704C)       ; �����
+    (=jis-x0208-1978   . #x3443)       ; �����
+    (japanese-jisx0208 . #x5E75)       ; �����
+    (korean-ksc5601    . #x4E34)       ; �����
+    (=jis-x0208-1990   . #x5E75)       ; �����
+    (chinese-big5      . #xC4E9)       ; ������
+    (=ucs@jis          . #x704C)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        18759 0 2)
@@ -23473,10 +23477,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 19)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x4667)       ; �����
-    (korean-ksc5601            . #x7728)       ; �����
-    (chinese-big5              . #xC579)       ; ������
-    (ideograph-daikanwa                . 18784)        ; �����
+    (=jis-x0208-1978   . #x4667)       ; �����
+    (korean-ksc5601    . #x7728)       ; �����
+    (chinese-big5      . #xC579)       ; ������
+    (ideograph-daikanwa . 18784)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        18784 0 1)

diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el
index 4e44b69..3e6fba3 100644 (file)
--- a/lisp/utf-2000/Ideograph-R086-Fire.el
+++ b/lisp/utf-2000/Ideograph-R086-Fire.el
@@ -522,10 +522,10 @@
     (ideographic-radical . 86) ; ⽕
     (ideographic-strokes . 3)
     (total-strokes      . 7)
-    (japanese-jisx0208-1978    . #x3C5E)       ; �����
-    (korean-ksc5601            . #x6D47)       ; �����
-    (chinese-big5              . #xA860)       ; ������
-    (ideograph-daikanwa                . 18878)        ; �����
+    (=jis-x0208-1978   . #x3C5E)       ; �����
+    (korean-ksc5601    . #x6D47)       ; �����
+    (chinese-big5      . #xA860)       ; ������
+    (ideograph-daikanwa . 18878)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        18878 0 2)
@@ -4980,13 +4980,13 @@
     (ideographic-radical . 86) ; ⽕
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x316B)       ; �����
-    (korean-ksc5601            . #x667B)       ; �����
-    (japanese-jisx0212         . #x496F)       ; �����
-    (=jis-x0213-1-2000         . #x7751)       ; �����
-    (chinese-big5              . #xB54B)       ; ������
-    (ideograph-daikanwa                . 19141)        ; �����
-    (=ucs@jis                  . #x7130)       ; �����
+    (=jis-x0208-1978   . #x316B)       ; �����
+    (korean-ksc5601    . #x667B)       ; �����
+    (japanese-jisx0212 . #x496F)       ; �����
+    (=jis-x0213-1-2000 . #x7751)       ; �����
+    (chinese-big5      . #xB54B)       ; ������
+    (ideograph-daikanwa . 19141)       ; �����
+    (=ucs@jis          . #x7130)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        19141 0 0)
@@ -5758,12 +5758,12 @@
   '((ideographic-radical . 86) ; ⽕
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x4E7B)       ; �����
-    (korean-ksc5601            . #x5621)       ; �����
-    (chinese-gb12345           . #x4136)       ; 煉
-    (chinese-big5              . #xB7D2)       ; ������
-    (ideograph-daikanwa                . 19178)        ; �����
-    (=ucs                      . #x7149)       ; 煉
+    (=jis-x0208-1978   . #x4E7B)       ; �����
+    (korean-ksc5601    . #x5621)       ; �����
+    (chinese-gb12345   . #x4136)       ; 煉
+    (chinese-big5      . #xB7D2)       ; ������
+    (ideograph-daikanwa . 19178)       ; �����
+    (=ucs              . #x7149)       ; 煉
     ))
 (define-char
   '((=>ucs             . #x7149)       ; 煉
@@ -5883,9 +5883,9 @@
     (ideographic-radical . 86) ; ⽕
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x4079)       ; �����
-    (korean-ksc5601            . #x6F21)       ; �����
-    (ideograph-daikanwa                . 19184)        ; �����
+    (=jis-x0208-1978   . #x4079)       ; �����
+    (korean-ksc5601    . #x6F21)       ; �����
+    (ideograph-daikanwa . 19184)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        19184 0 1)
@@ -7382,7 +7382,7 @@
     (ideographic-radical . 86) ; ⽕
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x407A)       ; �����
+    (=jis-x0208-1978   . #x407A)       ; �����
     ))
 (define-char
   '((=>ucs             . #x717D)       ; 煽
@@ -8040,7 +8040,7 @@
     (ideographic-radical . 86) ; ⽕
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x4D50)       ; �����
+    (=jis-x0208-1978   . #x4D50)       ; �����
     ))
 (define-char
   '((=>ucs             . #x2431C)      ; 𤌜
@@ -8488,9 +8488,9 @@
       )
      ((=ucs              . #x706B)     ; 火
       )
-     ((japanese-jisx0208-1978    . #x3029)     ; �����
-      (korean-ksc5601            . #x5C71)     ; �����
-      (ideograph-daikanwa        . 38901)      ; �����
+     ((=jis-x0208-1978   . #x3029)     ; �����
+      (korean-ksc5601    . #x5C71)     ; �����
+      (ideograph-daikanwa . 38901)     ; �����
       ))
     (korean-ksc5601    . #x5C6C)       ; �����
     (=cbeta            . 00201)        ; �����
@@ -11947,11 +11947,11 @@
     (ideographic-radical . 86) ; ⽕
     (ideographic-strokes . 14)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x6022)       ; �����
-    (japanese-jisx0208         . #x6022)       ; �����
-    (korean-ksc5601            . #x687C)       ; �����
-    (chinese-big5              . #xEFFA)       ; ������
-    (ideograph-daikanwa                . 19520)        ; �����
+    (=jis-x0208-1978   . #x6022)       ; �����
+    (japanese-jisx0208 . #x6022)       ; �����
+    (korean-ksc5601    . #x687C)       ; �����
+    (chinese-big5      . #xEFFA)       ; ������
+    (ideograph-daikanwa . 19520)       ; �����
     ))
 (define-char
   '((=>ucs             . #x71FF)       ; 燿
@@ -12231,8 +12231,8 @@
       )
      ((=ucs              . #x706B)     ; 火
       )
-     ((japanese-jisx0208-1978    . #x4B29)     ; �����
-      (korean-ksc5601            . #x5C6F)     ; �����
+     ((=jis-x0208-1978   . #x4B29)     ; �����
+      (korean-ksc5601    . #x5C6F)     ; �����
       ))
     (=cbeta            . 02412)        ; �����
     ))

diff --git a/lisp/utf-2000/Ideograph-R088-Father.el b/lisp/utf-2000/Ideograph-R088-Father.el
index 3620209..3e5a0dc 100644 (file)
--- a/lisp/utf-2000/Ideograph-R088-Father.el
+++ b/lisp/utf-2000/Ideograph-R088-Father.el
@@ -3,12 +3,12 @@
     (ideographic-radical . 88) ; ⽗
     (ideographic-strokes . 0)
     (total-strokes      . 4)
-    (japanese-jisx0208-1978    . #x4963)       ; �����
-    (japanese-jisx0208         . #x4963)       ; �����
-    (korean-ksc5601            . #x5D2B)       ; �����
-    (chinese-big5              . #xA4F7)       ; ������
-    (ideograph-daikanwa                . 19721)        ; �����
-    (=jef-china3               . #x58B2)       ; �����
+    (=jis-x0208-1978   . #x4963)       ; �����
+    (japanese-jisx0208 . #x4963)       ; �����
+    (korean-ksc5601    . #x5D2B)       ; �����
+    (chinese-big5      . #xA4F7)       ; ������
+    (ideograph-daikanwa . 19721)       ; �����
+    (=jef-china3       . #x58B2)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        19721 0 0)

diff --git a/lisp/utf-2000/Ideograph-R091-Slice.el b/lisp/utf-2000/Ideograph-R091-Slice.el
index e29125f..55719b2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R091-Slice.el
+++ b/lisp/utf-2000/Ideograph-R091-Slice.el
@@ -700,13 +700,13 @@
     (ideographic-strokes . 8)
     (total-strokes      . 12)
     (shinjigen-2       . 4725)
-    (japanese-jisx0208-1978    . #x4757)       ; �����
-    (chinese-gb2312            . #x4546)       ; �����
-    (korean-ksc5601            . #x782B)       ; �����
-    (=iso-ir165                        . #x4546)       ; �����
-    (chinese-big5              . #xB550)       ; ������
-    (ideograph-daikanwa                . 19854)        ; �����
-    (=ucs                      . #x724C)       ; 牌
+    (=jis-x0208-1978   . #x4757)       ; �����
+    (chinese-gb2312    . #x4546)       ; �����
+    (korean-ksc5601    . #x782B)       ; �����
+    (=iso-ir165                . #x4546)       ; �����
+    (chinese-big5      . #xB550)       ; ������
+    (ideograph-daikanwa . 19854)       ; �����
+    (=ucs              . #x724C)       ; 牌
     ))
 (define-char
   '((=>ucs             . #x724C)       ; 牌

diff --git a/lisp/utf-2000/Ideograph-R094-Dog.el b/lisp/utf-2000/Ideograph-R094-Dog.el
index 03f194f..ae982dd 100644 (file)
--- a/lisp/utf-2000/Ideograph-R094-Dog.el
+++ b/lisp/utf-2000/Ideograph-R094-Dog.el
@@ -3867,10 +3867,10 @@
     (ideographic-radical . 94) ; ⽝
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x4D32)       ; �����
-    (korean-ksc5601            . #x6B23)       ; �����
-    (chinese-big5              . #xB7DF)       ; ������
-    (ideograph-daikanwa                . 20558)        ; �����
+    (=jis-x0208-1978   . #x4D32)       ; �����
+    (korean-ksc5601    . #x6B23)       ; �����
+    (chinese-big5      . #xB7DF)       ; ������
+    (ideograph-daikanwa . 20558)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        20558 0 2)

diff --git a/lisp/utf-2000/Ideograph-R096-Jade.el b/lisp/utf-2000/Ideograph-R096-Jade.el
index 446177e..1fe5de1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R096-Jade.el
+++ b/lisp/utf-2000/Ideograph-R096-Jade.el
@@ -1208,10 +1208,10 @@
     (ideographic-strokes . 5)
     (total-strokes      . 9)
     (shinjigen-1       . 4886)
-    (japanese-jisx0208-1978    . #x3B39)       ; �����
-    (chinese-gb2312            . #x493A)       ; �����
-    (=iso-ir165                        . #x493A)       ; �����
-    (=ucs                      . #x73CA)       ; 珊
+    (=jis-x0208-1978   . #x3B39)       ; �����
+    (chinese-gb2312    . #x493A)       ; �����
+    (=iso-ir165                . #x493A)       ; �����
+    (=ucs              . #x73CA)       ; 珊
     ))
 (define-char
   '((ideographic-radical . 96) ; ⽟
@@ -1260,9 +1260,9 @@
       :char    ((ideograph-daikanwa . 20920)   ; �����
                 )
       ))
-    (japanese-jisx0208-1978    . #x605F)       ; �����
-    (ideograph-daikanwa                . 20921)        ; �����
-    (=ucs                      . #x73CE)       ; 珎
+    (=jis-x0208-1978   . #x605F)       ; �����
+    (ideograph-daikanwa . 20921)       ; �����
+    (=ucs              . #x73CE)       ; 珎
     ))
 (define-char
   '((=>ucs             . #x73CE)       ; 珎
@@ -1669,10 +1669,10 @@
     (total-strokes      . 10)
     (shinjigen-1       . 4900)
     (shinjigen-2       . 4900)
-    (japanese-jisx0208-1978    . #x6062)       ; �����
-    (japanese-jisx0208         . #x6062)       ; �����
-    (ideograph-daikanwa                . 20964)        ; �����
-    (=jef-china3               . #x84A9)       ; �����
+    (=jis-x0208-1978   . #x6062)       ; �����
+    (japanese-jisx0208 . #x6062)       ; �����
+    (ideograph-daikanwa . 20964)       ; �����
+    (=jef-china3       . #x84A9)       ; �����
     ))
 (define-char
   '((=>ucs             . #x73E5)       ; 珥
@@ -1818,14 +1818,14 @@
     (total-strokes      . 10)
     (shinjigen-1       . 4903)
     (shinjigen-2       . 4903)
-    (japanese-jisx0208-1978    . #x4849)       ; �����
-    (chinese-gb2312            . #x3060)       ; �����
-    (japanese-jisx0208         . #x4849)       ; �����
-    (korean-ksc5601            . #x5A6C)       ; �����
-    (=iso-ir165                        . #x3060)       ; �����
-    (chinese-big5              . #xAF5A)       ; ������
-    (ideograph-daikanwa                . 20976)        ; �����
-    (=ucs                      . #x73ED)       ; 班
+    (=jis-x0208-1978   . #x4849)       ; �����
+    (chinese-gb2312    . #x3060)       ; �����
+    (japanese-jisx0208 . #x4849)       ; �����
+    (korean-ksc5601    . #x5A6C)       ; �����
+    (=iso-ir165                . #x3060)       ; �����
+    (chinese-big5      . #xAF5A)       ; ������
+    (ideograph-daikanwa . 20976)       ; �����
+    (=ucs              . #x73ED)       ; 班
     ))
 (define-char
   '((=>ucs             . #x73ED)       ; 班
@@ -2747,16 +2747,16 @@
   '((ideographic-radical . 96) ; ⽟
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x4276)       ; �����
-    (chinese-gb2312            . #x5741)       ; �����
-    (korean-ksc5601            . #x767C)       ; �����
-    (=iso-ir165                        . #x5741)       ; �����
-    (chinese-cns11643-1                . #x6060)       ; �����
-    (=jis-x0213-1-2000         . #x7825)       ; �����
-    (chinese-big5              . #xB55A)       ; ������
-    (ideograph-daikanwa                . 21058)        ; �����
-    (=ucs@jis                  . #xFA4A)       ; 琢
-    (=ucs                      . #x7422)       ; 琢
+    (=jis-x0208-1978   . #x4276)       ; �����
+    (chinese-gb2312    . #x5741)       ; �����
+    (korean-ksc5601    . #x767C)       ; �����
+    (=iso-ir165                . #x5741)       ; �����
+    (chinese-cns11643-1 . #x6060)      ; �����
+    (=jis-x0213-1-2000 . #x7825)       ; �����
+    (chinese-big5      . #xB55A)       ; ������
+    (ideograph-daikanwa . 21058)       ; �����
+    (=ucs@jis          . #xFA4A)       ; 琢
+    (=ucs              . #x7422)       ; 琢
     ))
 (define-char
   '((=>ucs*            . #x7422)       ; 琢
@@ -3084,10 +3084,10 @@
     (ideographic-radical . 96) ; ⽟
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x606A)       ; �����
-    (japanese-jisx0208         . #x606A)       ; �����
-    (chinese-big5              . #xDAAA)       ; ������
-    (ideograph-daikanwa                . 21075)        ; �����
+    (=jis-x0208-1978   . #x606A)       ; �����
+    (japanese-jisx0208 . #x606A)       ; �����
+    (chinese-big5      . #xDAAA)       ; ������
+    (ideograph-daikanwa . 21075)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7432)       ; 琲
@@ -3957,13 +3957,13 @@
   '((ideographic-radical . 96) ; ⽟
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x606E)       ; �����
-    (chinese-gb2312            . #x492A)       ; �����
-    (japanese-jisx0208         . #x606E)       ; �����
-    (korean-ksc5601            . #x6322)       ; �����
-    (=iso-ir165                        . #x492A)       ; �����
-    (ideograph-daikanwa                . 21133)        ; �����
-    (=ucs                      . #x745F)       ; 瑟
+    (=jis-x0208-1978   . #x606E)       ; �����
+    (chinese-gb2312    . #x492A)       ; �����
+    (japanese-jisx0208 . #x606E)       ; �����
+    (korean-ksc5601    . #x6322)       ; �����
+    (=iso-ir165                . #x492A)       ; �����
+    (ideograph-daikanwa . 21133)       ; �����
+    (=ucs              . #x745F)       ; 瑟
     ))
 (define-char
   '((=>ucs             . #x745F)       ; 瑟
@@ -4181,13 +4181,13 @@
     (ideographic-strokes . 10)
     (total-strokes      . 14)
     (shinjigen-2       . 4940)
-    (japanese-jisx0208-1978    . #x6076)       ; �����
-    (japanese-jisx0208         . #x7424)       ; �����
-    (korean-ksc5601            . #x687D)       ; �����
-    (=jis-x0208-1990           . #x7424)       ; �����
-    (chinese-big5              . #xBABD)       ; ������
-    (ideograph-daikanwa                . 21149)        ; �����
-    (=ucs                      . #x7464)       ; 瑤
+    (=jis-x0208-1978   . #x6076)       ; �����
+    (japanese-jisx0208 . #x7424)       ; �����
+    (korean-ksc5601    . #x687D)       ; �����
+    (=jis-x0208-1990   . #x7424)       ; �����
+    (chinese-big5      . #xBABD)       ; ������
+    (ideograph-daikanwa . 21149)       ; �����
+    (=ucs              . #x7464)       ; 瑤
     ))
 (define-char
   '((=>ucs             . #x7464)       ; 瑤

diff --git a/lisp/utf-2000/Ideograph-R097-Melon.el b/lisp/utf-2000/Ideograph-R097-Melon.el
index 1384b6a..6f14380 100644 (file)
--- a/lisp/utf-2000/Ideograph-R097-Melon.el
+++ b/lisp/utf-2000/Ideograph-R097-Melon.el
@@ -381,9 +381,9 @@
     (ideographic-radical . 97) ; ⽠
     (ideographic-strokes . 6)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x6121)       ; �����
-    (japanese-jisx0208         . #x6121)       ; �����
-    (korean-ksc5601            . #x7B52)       ; �����
+    (=jis-x0208-1978   . #x6121)       ; �����
+    (japanese-jisx0208 . #x6121)       ; �����
+    (korean-ksc5601    . #x7B52)       ; �����
     ))
 (define-char
   '((=>ucs             . #x74E0)       ; 瓠

diff --git a/lisp/utf-2000/Ideograph-R098-Tile.el b/lisp/utf-2000/Ideograph-R098-Tile.el
index 0ca9cde..463f0ae 100644 (file)
--- a/lisp/utf-2000/Ideograph-R098-Tile.el
+++ b/lisp/utf-2000/Ideograph-R098-Tile.el
@@ -1162,10 +1162,10 @@
     (ideographic-radical . 98) ; ⽡
     (ideographic-strokes . 9)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x612B)       ; �����
-    (korean-ksc5601            . #x4C34)       ; �����
-    (chinese-big5              . #xBAC2)       ; ������
-    (ideograph-daikanwa                . 21557)        ; �����
+    (=jis-x0208-1978   . #x612B)       ; �����
+    (korean-ksc5601    . #x4C34)       ; �����
+    (chinese-big5      . #xBAC2)       ; ������
+    (ideograph-daikanwa . 21557)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7504)       ; 甄
@@ -1519,9 +1519,9 @@
     (ideographic-radical . 98) ; ⽡
     (ideographic-strokes . 11)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x612E)       ; �����
-    (japanese-jisx0208         . #x612E)       ; �����
-    (ideograph-daikanwa                . 21586)        ; �����
+    (=jis-x0208-1978   . #x612E)       ; �����
+    (japanese-jisx0208 . #x612E)       ; �����
+    (ideograph-daikanwa . 21586)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        21586 0 0)
@@ -1571,7 +1571,7 @@
     (ideographic-radical . 98) ; ⽡
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x6130)       ; �����
+    (=jis-x0208-1978   . #x6130)       ; �����
     ))
 (define-char
   '((ideographic-radical . 98) ; ⽡
@@ -1712,9 +1712,9 @@
     (ideographic-radical . 98) ; ⽡
     (ideographic-strokes . 12)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x3979)       ; �����
-    (korean-ksc5601            . #x7177)       ; �����
-    (ideograph-daikanwa                . 21602)        ; �����
+    (=jis-x0208-1978   . #x3979)       ; �����
+    (korean-ksc5601    . #x7177)       ; �����
+    (ideograph-daikanwa . 21602)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7511)       ; 甑
@@ -1984,7 +1984,7 @@
     (ideographic-radical . 98) ; ⽡
     (ideographic-strokes . 13)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x6131)       ; �����
+    (=jis-x0208-1978   . #x6131)       ; �����
     ))
 (define-char
   '((=>ucs             . #x24B9D)      ; 𤮝

diff --git a/lisp/utf-2000/Ideograph-R104-Sickness.el b/lisp/utf-2000/Ideograph-R104-Sickness.el
index 922c940..cda899b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R104-Sickness.el
+++ b/lisp/utf-2000/Ideograph-R104-Sickness.el
@@ -4118,11 +4118,11 @@
     (ideographic-radical . 104)        ; ⽧
     (ideographic-strokes . 10)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4169)       ; �����
-    (korean-ksc5601            . #x6231)       ; �����
-    (japanese-jisx0212         . #x4D77)       ; �����
-    (ideograph-daikanwa                . 22415)        ; �����
-    (=ucs@jis                  . #x7626)       ; �����
+    (=jis-x0208-1978   . #x4169)       ; �����
+    (korean-ksc5601    . #x6231)       ; �����
+    (japanese-jisx0212 . #x4D77)       ; �����
+    (ideograph-daikanwa . 22415)       ; �����
+    (=ucs@jis          . #x7626)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        22415 0 0)
@@ -5540,9 +5540,9 @@
     (ideographic-radical . 104)        ; ⽧
     (ideographic-strokes . 13)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x4C7E)       ; �����
-    (korean-ksc5601            . #x6B28)       ; �����
-    (ideograph-daikanwa                . 22545)        ; �����
+    (=jis-x0208-1978   . #x4C7E)       ; �����
+    (korean-ksc5601    . #x6B28)       ; �����
+    (ideograph-daikanwa . 22545)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7652)       ; 癒
@@ -6716,9 +6716,9 @@
     (ideographic-strokes . 19)
     (total-strokes      . 24)
     (shinjigen-2       . 5189)
-    (japanese-jisx0208-1978    . #x6221)       ; �����
-    (japanese-jisx0208         . #x6221)       ; �����
-    (korean-ksc5601            . #x6F26)       ; �����
+    (=jis-x0208-1978   . #x6221)       ; �����
+    (japanese-jisx0208 . #x6221)       ; �����
+    (korean-ksc5601    . #x6F26)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        22643 0 5)

diff --git a/lisp/utf-2000/Ideograph-R106-White.el b/lisp/utf-2000/Ideograph-R106-White.el
index 067ea39..dc69658 100644 (file)
--- a/lisp/utf-2000/Ideograph-R106-White.el
+++ b/lisp/utf-2000/Ideograph-R106-White.el
@@ -587,9 +587,9 @@
     (ideographic-radical . 106)        ; ⽩
     (ideographic-strokes . 7)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x622B)       ; �����
-    (korean-ksc5601            . #x7B53)       ; �����
-    (ideograph-daikanwa                . 22732)        ; �����
+    (=jis-x0208-1978   . #x622B)       ; �����
+    (korean-ksc5601    . #x7B53)       ; �����
+    (ideograph-daikanwa . 22732)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        22732 0 2)

diff --git a/lisp/utf-2000/Ideograph-R108-Dish.el b/lisp/utf-2000/Ideograph-R108-Dish.el
index 378e948..d0873dd 100644 (file)
--- a/lisp/utf-2000/Ideograph-R108-Dish.el
+++ b/lisp/utf-2000/Ideograph-R108-Dish.el
@@ -187,11 +187,11 @@
     (ideographic-strokes . 4)
     (total-strokes      . 9)
     (shinjigen-2       . 5239)
-    (japanese-jisx0208-1978    . #x4B5F)       ; �����
-    (japanese-jisx0208         . #x4B5F)       ; �����
-    (korean-ksc5601            . #x5D4E)       ; �����
-    (ideograph-daikanwa                . 22959)        ; �����
-    (=jef-china3               . #x5BB5)       ; �����
+    (=jis-x0208-1978   . #x4B5F)       ; �����
+    (japanese-jisx0208 . #x4B5F)       ; �����
+    (korean-ksc5601    . #x5D4E)       ; �����
+    (ideograph-daikanwa . 22959)       ; �����
+    (=jef-china3       . #x5BB5)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        22959 0 0)

diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el
index 77fe4ad..f1f7eb9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R109-Eye.el
+++ b/lisp/utf-2000/Ideograph-R109-Eye.el
@@ -2457,9 +2457,9 @@
     (ideographic-strokes . 6)
     (total-strokes      . 11)
     (shinjigen-2       . 5307)
-    (japanese-jisx0208-1978    . #x442F)       ; �����
-    (japanese-jisx0208         . #x442F)       ; �����
-    (ideograph-daikanwa                . 23314)        ; �����
+    (=jis-x0208-1978   . #x442F)       ; �����
+    (japanese-jisx0208 . #x442F)       ; �����
+    (ideograph-daikanwa . 23314)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        23314 0 0)
@@ -6793,9 +6793,9 @@
     (ideographic-radical . 109)        ; ⽬
     (ideographic-strokes . 12)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x4A4D)       ; �����
-    (korean-ksc5601            . #x5C2D)       ; �����
-    (ideograph-daikanwa                . 23672)        ; �����
+    (=jis-x0208-1978   . #x4A4D)       ; �����
+    (korean-ksc5601    . #x5C2D)       ; �����
+    (ideograph-daikanwa . 23672)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        23672 0 2)
@@ -7093,9 +7093,9 @@
     (ideographic-radical . 109)        ; ⽬
     (ideographic-strokes . 13)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x3D56)       ; �����
-    (japanese-jisx0208         . #x3D56)       ; �����
-    (korean-ksc5601            . #x626B)       ; �����
+    (=jis-x0208-1978   . #x3D56)       ; �����
+    (japanese-jisx0208 . #x3D56)       ; �����
+    (korean-ksc5601    . #x626B)       ; �����
     ))
 (define-char
   '((=>ucs             . #x77AC)       ; 瞬

diff --git a/lisp/utf-2000/Ideograph-R112-Stone.el b/lisp/utf-2000/Ideograph-R112-Stone.el
index cc95986..533ca50 100644 (file)
--- a/lisp/utf-2000/Ideograph-R112-Stone.el
+++ b/lisp/utf-2000/Ideograph-R112-Stone.el
@@ -1301,10 +1301,10 @@
     (ideographic-radical . 112)        ; ⽯
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x6268)       ; �����
-    (japanese-jisx0208         . #x395C)       ; �����
-    (=jis-x0208-1990           . #x395C)       ; �����
-    (=ucs                      . #x783F)       ; 砿
+    (=jis-x0208-1978   . #x6268)       ; �����
+    (japanese-jisx0208 . #x395C)       ; �����
+    (=jis-x0208-1990   . #x395C)       ; �����
+    (=ucs              . #x783F)       ; 砿
     ))
 (define-char
   '((ideographic-radical . 112)        ; ⽯
@@ -1338,12 +1338,12 @@
   '((ideographic-radical . 112)        ; ⽯
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x626A)       ; �����
-    (chinese-gb2312            . #x6D42)       ; �����
-    (japanese-jisx0208         . #x4557)       ; �����
-    (=iso-ir165                        . #x6D42)       ; �����
-    (=jis-x0208-1990           . #x4557)       ; �����
-    (=ucs                      . #x783A)       ; 砺
+    (=jis-x0208-1978   . #x626A)       ; �����
+    (chinese-gb2312    . #x6D42)       ; �����
+    (japanese-jisx0208 . #x4557)       ; �����
+    (=iso-ir165                . #x6D42)       ; �����
+    (=jis-x0208-1990   . #x4557)       ; �����
+    (=ucs              . #x783A)       ; 砺
     ))
 (define-char
   '((ideographic-radical . 112)        ; ⽯
@@ -2363,11 +2363,11 @@
     (ideographic-radical . 112)        ; ⽯
     (ideographic-strokes . 7)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x3945)       ; �����
-    (japanese-jisx0208         . #x3945)       ; �����
-    (korean-ksc5601            . #x4C63)       ; �����
-    (ideograph-daikanwa                . 24230)        ; �����
-    (=jef-china3               . #x5CB0)       ; �����
+    (=jis-x0208-1978   . #x3945)       ; �����
+    (japanese-jisx0208 . #x3945)       ; �����
+    (korean-ksc5601    . #x4C63)       ; �����
+    (ideograph-daikanwa . 24230)       ; �����
+    (=jef-china3       . #x5CB0)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        24230 0 0)
@@ -2713,8 +2713,8 @@
     (ideographic-radical . 112)        ; ⽯
     (ideographic-strokes . 8)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x626F)       ; �����
-    (ideograph-daikanwa                . 24254)        ; �����
+    (=jis-x0208-1978   . #x626F)       ; �����
+    (ideograph-daikanwa . 24254)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        24254 0 0)
@@ -4446,8 +4446,8 @@
     (ideographic-radical . 112)        ; ⽯
     (ideographic-strokes . 10)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x6279)       ; �����
-    (japanese-jisx0208         . #x6279)       ; �����
+    (=jis-x0208-1978   . #x6279)       ; �����
+    (japanese-jisx0208 . #x6279)       ; �����
     ))
 (define-char
   '((=>ucs             . #x78D4)       ; 磔
@@ -6566,11 +6566,11 @@
     (ideographic-strokes . 15)
     (total-strokes      . 20)
     (shinjigen-2       . 8607)
-    (japanese-jisx0208-1978    . #x395C)       ; �����
-    (japanese-jisx0208         . #x6268)       ; �����
-    (=jis-x0208-1990           . #x6268)       ; �����
-    (ideograph-daikanwa                . 24564)        ; �����
-    (=ucs@jis                  . #x7926)       ; �����
+    (=jis-x0208-1978   . #x395C)       ; �����
+    (japanese-jisx0208 . #x6268)       ; �����
+    (=jis-x0208-1990   . #x6268)       ; �����
+    (ideograph-daikanwa . 24564)       ; �����
+    (=ucs@jis          . #x7926)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7926)       ; 礦
@@ -6673,12 +6673,12 @@
     (ideographic-radical . 112)        ; ⽯
     (ideographic-strokes . 14)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x4557)       ; �����
-    (japanese-jisx0208         . #x626A)       ; �����
-    (korean-ksc5601            . #x556C)       ; �����
-    (=jis-x0208-1990           . #x626A)       ; �����
-    (chinese-gb12345           . #x6D42)       ; 礪
-    (=ucs                      . #x792A)       ; 礪
+    (=jis-x0208-1978   . #x4557)       ; �����
+    (japanese-jisx0208 . #x626A)       ; �����
+    (korean-ksc5601    . #x556C)       ; �����
+    (=jis-x0208-1990   . #x626A)       ; �����
+    (chinese-gb12345   . #x6D42)       ; 礪
+    (=ucs              . #x792A)       ; 礪
     ))
 (define-char
   '((ideographic-radical . 112)        ; ⽯

diff --git a/lisp/utf-2000/Ideograph-R113-Spirit.el b/lisp/utf-2000/Ideograph-R113-Spirit.el
index d8dbcc9..dec7832 100644 (file)
--- a/lisp/utf-2000/Ideograph-R113-Spirit.el
+++ b/lisp/utf-2000/Ideograph-R113-Spirit.el
@@ -230,9 +230,9 @@
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 3)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x3737)       ; �����
-    (korean-ksc5601            . #x5135)       ; �����
-    (ideograph-daikanwa                . 24634)        ; �����
+    (=jis-x0208-1978   . #x3737)       ; �����
+    (korean-ksc5601    . #x5135)       ; �����
+    (ideograph-daikanwa . 24634)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7941)       ; 祁
@@ -423,9 +423,9 @@
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 4)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x3540)       ; �����
-    (korean-ksc5601            . #x5136)       ; �����
-    (ideograph-daikanwa                . 24639)        ; �����
+    (=jis-x0208-1978   . #x3540)       ; �����
+    (korean-ksc5601    . #x5136)       ; �����
+    (ideograph-daikanwa . 24639)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7947)       ; 祇
@@ -4175,8 +4175,8 @@
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 14)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x4729)       ; �����
-    (ideograph-daikanwa                . 24851)        ; �����
+    (=jis-x0208-1978   . #x4729)       ; �����
+    (ideograph-daikanwa . 24851)       ; �����
     ))
 (define-char
   '((=>ucs             . #x79B0)       ; 禰
@@ -4203,12 +4203,12 @@
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 14)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x4578)       ; �����
-    (korean-ksc5601            . #x542A)       ; �����
-    (japanese-jisx0212         . #x5070)       ; �����
-    (=jis-x0213-1-2000         . #x7943)       ; �����
-    (ideograph-daikanwa                . 24852)        ; �����
-    (=ucs@jis                  . #x79B1)       ; �����
+    (=jis-x0208-1978   . #x4578)       ; �����
+    (korean-ksc5601    . #x542A)       ; �����
+    (japanese-jisx0212 . #x5070)       ; �����
+    (=jis-x0213-1-2000 . #x7943)       ; �����
+    (ideograph-daikanwa . 24852)       ; �����
+    (=ucs@jis          . #x79B1)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        24852 0 4)

diff --git a/lisp/utf-2000/Ideograph-R114-Track.el b/lisp/utf-2000/Ideograph-R114-Track.el
index cb749e2..051440e 100644 (file)
--- a/lisp/utf-2000/Ideograph-R114-Track.el
+++ b/lisp/utf-2000/Ideograph-R114-Track.el
@@ -36,10 +36,10 @@
     (ideographic-radical . 114)        ; ⽱
     (ideographic-strokes . 4)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x633C)       ; �����
-    (japanese-jisx0208         . #x633C)       ; �����
-    (chinese-cns11643-1                . #x526E)       ; �����
-    (ideograph-daikanwa                . 24886)        ; �����
+    (=jis-x0208-1978   . #x633C)       ; �����
+    (japanese-jisx0208 . #x633C)       ; �����
+    (chinese-cns11643-1 . #x526E)      ; �����
+    (ideograph-daikanwa . 24886)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        24886 0 0)

diff --git a/lisp/utf-2000/Ideograph-R115-Grain.el b/lisp/utf-2000/Ideograph-R115-Grain.el
index cc74e48..51a74c3 100644 (file)
--- a/lisp/utf-2000/Ideograph-R115-Grain.el
+++ b/lisp/utf-2000/Ideograph-R115-Grain.el
@@ -755,9 +755,9 @@
     (ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 5)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x4769)       ; �����
-    (korean-ksc5601            . #x765F)       ; �����
-    (ideograph-daikanwa                . 24993)        ; �����
+    (=jis-x0208-1978   . #x4769)       ; �����
+    (korean-ksc5601    . #x765F)       ; �����
+    (ideograph-daikanwa . 24993)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        24993 0 2)
@@ -1879,13 +1879,13 @@
   '((ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 8)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x4923)       ; �����
-    (chinese-gb2312            . #x305E)       ; �����
-    (korean-ksc5601            . #x782D)       ; �����
-    (=iso-ir165                        . #x305E)       ; �����
-    (chinese-cns11643-2                . #x4561)       ; �����
-    (ideograph-daikanwa                . 25113)        ; �����
-    (=ucs                      . #x7A17)       ; 稗
+    (=jis-x0208-1978   . #x4923)       ; �����
+    (chinese-gb2312    . #x305E)       ; �����
+    (korean-ksc5601    . #x782D)       ; �����
+    (=iso-ir165                . #x305E)       ; �����
+    (chinese-cns11643-2 . #x4561)      ; �����
+    (ideograph-daikanwa . 25113)       ; �����
+    (=ucs              . #x7A17)       ; 稗
     ))
 (define-char
   '((=>ucs             . #x7A17)       ; 稗
@@ -1914,10 +1914,10 @@
     (ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 8)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x6346)       ; �����
-    (japanese-jisx0208         . #x6346)       ; �����
-    (korean-ksc5601            . #x7242)       ; �����
-    (ideograph-daikanwa                . 25119)        ; �����
+    (=jis-x0208-1978   . #x6346)       ; �����
+    (japanese-jisx0208 . #x6346)       ; �����
+    (korean-ksc5601    . #x7242)       ; �����
+    (ideograph-daikanwa . 25119)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7A19)       ; 稙
@@ -2459,9 +2459,9 @@
     (ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 9)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x634A)       ; �����
-    (korean-ksc5601            . #x7660)       ; �����
-    (ideograph-daikanwa                . 25180)        ; �����
+    (=jis-x0208-1978   . #x634A)       ; �����
+    (korean-ksc5601    . #x7660)       ; �����
+    (ideograph-daikanwa . 25180)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7A31)       ; 稱
@@ -3150,8 +3150,8 @@
     (ideographic-radical . 115)        ; ⽲
     (ideographic-strokes . 11)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x374E)       ; �����
-    (korean-ksc5601            . #x4D26)       ; �����
+    (=jis-x0208-1978   . #x374E)       ; �����
+    (korean-ksc5601    . #x4D26)       ; �����
     ))
 (define-char
   '((ideographic-radical . 115)        ; ⽲

diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el
index 0677516..0f9b782 100644 (file)
--- a/lisp/utf-2000/Ideograph-R116-Cave.el
+++ b/lisp/utf-2000/Ideograph-R116-Cave.el
@@ -4,11 +4,11 @@
     (ideographic-strokes . 0)
     (total-strokes      . 5)
     (shinjigen-2       . 5678)
-    (japanese-jisx0208-1978    . #x376A)       ; �����
-    (japanese-jisx0208         . #x376A)       ; �����
-    (korean-ksc5601            . #x7A6B)       ; �����
-    (ideograph-daikanwa                . 25406)        ; �����
-    (=jef-china3               . #x5DCB)       ; �����
+    (=jis-x0208-1978   . #x376A)       ; �����
+    (japanese-jisx0208 . #x376A)       ; �����
+    (korean-ksc5601    . #x7A6B)       ; �����
+    (ideograph-daikanwa . 25406)       ; �����
+    (=jef-china3       . #x5DCB)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7A74)       ; 穴
@@ -997,10 +997,10 @@
     (ideographic-radical . 116)        ; ⽳
     (ideographic-strokes . 6)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x635A)       ; �����
-    (japanese-jisx0208         . #x635A)       ; �����
-    (korean-ksc5601            . #x7057)       ; �����
-    (ideograph-daikanwa                . 25496)        ; �����
+    (=jis-x0208-1978   . #x635A)       ; �����
+    (japanese-jisx0208 . #x635A)       ; �����
+    (korean-ksc5601    . #x7057)       ; �����
+    (ideograph-daikanwa . 25496)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        25496 0 0)
@@ -2434,10 +2434,10 @@
     (ideographic-radical . 116)        ; ⽳
     (ideographic-strokes . 10)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x3567)       ; �����
-    (japanese-jisx0208         . #x3567)       ; �����
-    (chinese-gb12345           . #x476E)       ; 窮
-    (=ucs                      . #x7AAE)       ; 窮
+    (=jis-x0208-1978   . #x3567)       ; �����
+    (japanese-jisx0208 . #x3567)       ; �����
+    (chinese-gb12345   . #x476E)       ; 窮
+    (=ucs              . #x7AAE)       ; 窮
     ))
 (define-char
   '((ideographic-radical . 116)        ; ⽳
@@ -3963,23 +3963,23 @@
     (ideographic-strokes . 16)
     (total-strokes      . 21)
     (shinjigen-2       . 5727)
-    (japanese-jisx0208-1978    . #x3376)       ; �����
-    (japanese-jisx0208         . #x635E)       ; �����
-    (chinese-cns11643-3                . #x5E49)       ; �����
-    (=jis-x0208-1990           . #x635E)       ; �����
-    (chinese-gb12345           . #x546E)       ; 竈
-    (ideograph-daikanwa                . 25703)        ; �����
-    (=ucs                      . #x7AC8)       ; 竈
+    (=jis-x0208-1978   . #x3376)       ; �����
+    (japanese-jisx0208 . #x635E)       ; �����
+    (chinese-cns11643-3 . #x5E49)      ; �����
+    (=jis-x0208-1990   . #x635E)       ; �����
+    (chinese-gb12345   . #x546E)       ; 竈
+    (ideograph-daikanwa . 25703)       ; �����
+    (=ucs              . #x7AC8)       ; 竈
     ))
 (define-char
   '((morohashi-daikanwa        25703 0 5)
     (ideographic-radical . 116)        ; ⽳
     (ideographic-strokes . 12)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x635E)       ; �����
-    (japanese-jisx0208         . #x3376)       ; �����
-    (=jis-x0208-1990           . #x3376)       ; �����
-    (=ucs                      . #x7AC3)       ; 竃
+    (=jis-x0208-1978   . #x635E)       ; �����
+    (japanese-jisx0208 . #x3376)       ; �����
+    (=jis-x0208-1990   . #x3376)       ; �����
+    (=ucs              . #x7AC3)       ; 竃
     ))
 (define-char
   '((ideographic-radical . 116)        ; ⽳

diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el
index 43b972a..2175e53 100644 (file)
--- a/lisp/utf-2000/Ideograph-R118-Bamboo.el
+++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el
@@ -3023,8 +3023,8 @@
     (ideographic-radical . 118)        ; ⽵
     (ideographic-strokes . 8)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x6439)       ; �����
-    (ideograph-daikanwa                . 26148)        ; �����
+    (=jis-x0208-1978   . #x6439)       ; �����
+    (ideograph-daikanwa . 26148)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        26148 0 1)
@@ -3887,9 +3887,9 @@
     (ideographic-radical . 118)        ; ⽵
     (ideographic-strokes . 9)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4824)       ; �����
-    (korean-ksc5601            . #x6E46)       ; �����
-    (ideograph-daikanwa                . 26224)        ; �����
+    (=jis-x0208-1978   . #x4824)       ; �����
+    (korean-ksc5601    . #x6E46)       ; �����
+    (ideograph-daikanwa . 26224)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        26224 0 2)
@@ -5368,12 +5368,12 @@
     (ideographic-strokes . 10)
     (total-strokes      . 16)
     (shinjigen-2       . 5891)
-    (japanese-jisx0208-1978    . #x6446)       ; �����
-    (japanese-jisx0208         . #x4F36)       ; �����
-    (chinese-cns11643-3                . #x5234)       ; �����
-    (=jis-x0208-1990           . #x4F36)       ; �����
-    (ideograph-daikanwa                . 26371)        ; �����
-    (=ucs                      . #x7BED)       ; 篭
+    (=jis-x0208-1978   . #x6446)       ; �����
+    (japanese-jisx0208 . #x4F36)       ; �����
+    (chinese-cns11643-3 . #x5234)      ; �����
+    (=jis-x0208-1990   . #x4F36)       ; �����
+    (ideograph-daikanwa . 26371)       ; �����
+    (=ucs              . #x7BED)       ; 篭
     ))
 (define-char
   '((ideographic-radical . 118)        ; ⽵
@@ -6821,13 +6821,13 @@
   '((ideographic-radical . 118)        ; ⽵
     (ideographic-strokes . 12)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x433D)       ; �����
-    (korean-ksc5601            . #x532F)       ; �����
-    (chinese-cns11643-1                . #x767A)       ; �����
-    (=jis-x0213-1-2000         . #x7969)       ; �����
-    (chinese-gb12345           . #x736C)       ; 簞
-    (ideograph-daikanwa                . 26509)        ; �����
-    (=ucs                      . #x7C1E)       ; 簞
+    (=jis-x0208-1978   . #x433D)       ; �����
+    (korean-ksc5601    . #x532F)       ; �����
+    (chinese-cns11643-1 . #x767A)      ; �����
+    (=jis-x0213-1-2000 . #x7969)       ; �����
+    (chinese-gb12345   . #x736C)       ; 簞
+    (ideograph-daikanwa . 26509)       ; �����
+    (=ucs              . #x7C1E)       ; 簞
     ))
 (define-char
   '((=>ucs             . #x7BAA)       ; 箪
@@ -9833,13 +9833,13 @@
     (ideographic-strokes . 16)
     (total-strokes      . 22)
     (shinjigen-2       . 5891)
-    (japanese-jisx0208-1978    . #x4F36)       ; �����
-    (japanese-jisx0208         . #x6446)       ; �����
-    (korean-ksc5601            . #x566B)       ; �����
-    (=jis-x0208-1990           . #x6446)       ; �����
-    (chinese-gb12345           . #x417D)       ; 籠
-    (ideograph-daikanwa                . 26752)        ; �����
-    (=ucs                      . #x7C60)       ; 籠
+    (=jis-x0208-1978   . #x4F36)       ; �����
+    (japanese-jisx0208 . #x6446)       ; �����
+    (korean-ksc5601    . #x566B)       ; �����
+    (=jis-x0208-1990   . #x6446)       ; �����
+    (chinese-gb12345   . #x417D)       ; 籠
+    (ideograph-daikanwa . 26752)       ; �����
+    (=ucs              . #x7C60)       ; 籠
     ))
 (define-char
   '((=>ucs             . #x7C60)       ; 籠

diff --git a/lisp/utf-2000/Ideograph-R119-Rice.el b/lisp/utf-2000/Ideograph-R119-Rice.el
index 33b4d79..4cc4412 100644 (file)
--- a/lisp/utf-2000/Ideograph-R119-Rice.el
+++ b/lisp/utf-2000/Ideograph-R119-Rice.el
@@ -229,8 +229,8 @@
     (ideographic-radical . 119)        ; ⽶
     (ideographic-strokes . 3)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x4C62)       ; �����
-    (ideograph-daikanwa                . 26857)        ; �����
+    (=jis-x0208-1978   . #x4C62)       ; �����
+    (ideograph-daikanwa . 26857)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7C7E)       ; 籾
@@ -391,10 +391,10 @@
     (ideographic-radical . 119)        ; ⽶
     (ideographic-strokes . 4)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x4A34)       ; �����
-    (japanese-jisx0208         . #x4A34)       ; �����
-    (korean-ksc5601            . #x5D4F)       ; �����
-    (ideograph-daikanwa                . 26872)        ; �����
+    (=jis-x0208-1978   . #x4A34)       ; �����
+    (japanese-jisx0208 . #x4A34)       ; �����
+    (korean-ksc5601    . #x5D4F)       ; �����
+    (ideograph-daikanwa . 26872)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        26872 0 0)
@@ -511,7 +511,7 @@
     (ideographic-radical . 119)        ; ⽶
     (ideographic-strokes . 4)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x6464)       ; �����
+    (=jis-x0208-1978   . #x6464)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7C90)       ; 粐
@@ -1295,7 +1295,7 @@
     (ideographic-radical . 119)        ; ⽶
     (ideographic-strokes . 7)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x646E)       ; �����
+    (=jis-x0208-1978   . #x646E)       ; �����
     ))
 (define-char
   '((ideographic-radical . 119)        ; ⽶
@@ -4201,8 +4201,8 @@
     (ideographic-radical . 119)        ; ⽶
     (ideographic-strokes . 14)
     (total-strokes      . 20)
-    (japanese-jisx0208-1978    . #x647A)       ; �����
-    (japanese-jisx0208         . #x647A)       ; �����
+    (=jis-x0208-1978   . #x647A)       ; �����
+    (japanese-jisx0208 . #x647A)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        27181 0 2)

diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el
index fd19c8b..0f8b0d2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R120-Silk.el
+++ b/lisp/utf-2000/Ideograph-R120-Silk.el
@@ -1415,11 +1415,11 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 4)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x4A36)       ; �����
-    (japanese-jisx0208         . #x4A36)       ; �����
-    (korean-ksc5601            . #x5D51)       ; �����
-    (ideograph-daikanwa                . 27295)        ; �����
-    (=jef-china3               . #x5EF3)       ; �����
+    (=jis-x0208-1978   . #x4A36)       ; �����
+    (japanese-jisx0208 . #x4A36)       ; �����
+    (korean-ksc5601    . #x5D51)       ; �����
+    (ideograph-daikanwa . 27295)       ; �����
+    (=jef-china3       . #x5EF3)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7D1B)       ; 紛
@@ -3875,10 +3875,10 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 6)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x394A)       ; �����
-    (japanese-jisx0208         . #x394A)       ; �����
-    (korean-ksc5601            . #x4E6D)       ; �����
-    (ideograph-daikanwa                . 27421)        ; �����
+    (=jis-x0208-1978   . #x394A)       ; �����
+    (japanese-jisx0208 . #x394A)       ; �����
+    (korean-ksc5601    . #x4E6D)       ; �����
+    (ideograph-daikanwa . 27421)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7D5E)       ; 絞
@@ -4414,8 +4414,8 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 7)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x652C)       ; �����
-    (japanese-jisx0208         . #x652C)       ; �����
+    (=jis-x0208-1978   . #x652C)       ; �����
+    (japanese-jisx0208 . #x652C)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        27449 0 2)
@@ -6043,8 +6043,8 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 7)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x6539)       ; �����
-    (ideograph-daikanwa                . 27534)        ; �����
+    (=jis-x0208-1978   . #x6539)       ; �����
+    (ideograph-daikanwa . 27534)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        27534 0 1)
@@ -6419,8 +6419,8 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 8)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x6546)       ; �����
-    (ideograph-daikanwa                . 27540)        ; �����
+    (=jis-x0208-1978   . #x6546)       ; �����
+    (ideograph-daikanwa . 27540)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        27540 0 1)
@@ -6907,9 +6907,9 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 8)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x653B)       ; �����
-    (chinese-cns11643-2                . #x4C7D)       ; �����
-    (ideograph-daikanwa                . 27569)        ; �����
+    (=jis-x0208-1978   . #x653B)       ; �����
+    (chinese-cns11643-2 . #x4C7D)      ; �����
+    (ideograph-daikanwa . 27569)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7DAE)       ; 綮
@@ -7569,9 +7569,9 @@
     (total-strokes      . 14)
     (shinjigen-1       . 6096)
     (shinjigen-2       . 6096)
-    (japanese-jisx0208-1978    . #x486C)       ; �����
-    (japanese-jisx0208         . #x486C)       ; �����
-    (ideograph-daikanwa                . 27604)        ; �����
+    (=jis-x0208-1978   . #x486C)       ; �����
+    (japanese-jisx0208 . #x486C)       ; �����
+    (ideograph-daikanwa . 27604)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7DCB)       ; 緋
@@ -7848,9 +7848,9 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 8)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x416D)       ; �����
-    (japanese-jisx0208         . #x416D)       ; �����
-    (ideograph-daikanwa                . 27620)        ; �����
+    (=jis-x0208-1978   . #x416D)       ; �����
+    (japanese-jisx0208 . #x416D)       ; �����
+    (ideograph-daikanwa . 27620)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7DCF)       ; 総
@@ -8587,9 +8587,9 @@
     (total-strokes      . 15)
     (shinjigen-1       . 6116)
     (shinjigen-2       . 6116)
-    (japanese-jisx0208-1978    . #x6549)       ; �����
-    (japanese-jisx0208         . #x6549)       ; �����
-    (ideograph-daikanwa                . 27645)        ; �����
+    (=jis-x0208-1978   . #x6549)       ; �����
+    (japanese-jisx0208 . #x6549)       ; �����
+    (ideograph-daikanwa . 27645)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7DDD)       ; 緝
@@ -9332,8 +9332,8 @@
     (ideographic-strokes . 10)
     (total-strokes      . 16)
     (shinjigen-2       . 6136)
-    (japanese-jisx0208-1978    . #x305E)       ; �����
-    (japanese-jisx0208         . #x305E)       ; �����
+    (=jis-x0208-1978   . #x305E)       ; �����
+    (japanese-jisx0208 . #x305E)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7DEF)       ; 緯
@@ -12453,9 +12453,9 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 11)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x655C)       ; �����
-    (japanese-jisx0208         . #x655C)       ; �����
-    (ideograph-daikanwa                . 27829)        ; �����
+    (=jis-x0208-1978   . #x655C)       ; �����
+    (japanese-jisx0208 . #x655C)       ; �����
+    (ideograph-daikanwa . 27829)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7E35)       ; 縵
@@ -14144,12 +14144,12 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 12)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x3D2B)       ; �����
-    (korean-ksc5601            . #x6239)       ; �����
-    (japanese-jisx0212         . #x5457)       ; �����
-    (=jis-x0213-1-2000         . #x7A36)       ; �����
-    (ideograph-daikanwa                . 27913)        ; �����
-    (=ucs@jis                  . #x7E61)       ; �����
+    (=jis-x0208-1978   . #x3D2B)       ; �����
+    (korean-ksc5601    . #x6239)       ; �����
+    (japanese-jisx0212 . #x5457)       ; �����
+    (=jis-x0213-1-2000 . #x7A36)       ; �����
+    (ideograph-daikanwa . 27913)       ; �����
+    (=ucs@jis          . #x7E61)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        27913 0 1)
@@ -14620,11 +14620,11 @@
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 13)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x3752)       ; �����
-    (korean-ksc5601            . #x4D28)       ; �����
-    (japanese-jisx0212         . #x545A)       ; �����
-    (ideograph-daikanwa                . 27940)        ; �����
-    (=ucs@jis                  . #x7E6B)       ; �����
+    (=jis-x0208-1978   . #x3752)       ; �����
+    (korean-ksc5601    . #x4D28)       ; �����
+    (japanese-jisx0212 . #x545A)       ; �����
+    (ideograph-daikanwa . 27940)       ; �����
+    (=ucs@jis          . #x7E6B)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        27940 0 2)

diff --git a/lisp/utf-2000/Ideograph-R122-Net.el b/lisp/utf-2000/Ideograph-R122-Net.el
index 4f5c572..bb58945 100644 (file)
--- a/lisp/utf-2000/Ideograph-R122-Net.el
+++ b/lisp/utf-2000/Ideograph-R122-Net.el
@@ -1160,9 +1160,9 @@
     (ideographic-radical . 122)        ; ⽹
     (ideographic-strokes . 8)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x3A61)       ; �����
-    (japanese-jisx0208         . #x3A61)       ; �����
-    (ideograph-daikanwa                . 28293)        ; �����
+    (=jis-x0208-1978   . #x3A61)       ; �����
+    (japanese-jisx0208 . #x3A61)       ; �����
+    (ideograph-daikanwa . 28293)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7F6A)       ; 罪

diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el
index f709421..04110a2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R124-Feather.el
+++ b/lisp/utf-2000/Ideograph-R124-Feather.el
@@ -450,10 +450,10 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((japanese-jisx0208-1978    . #x3878)     ; �����
-      (japanese-jisx0208         . #x3878)     ; �����
-      (korean-ksc5601            . #x4D6B)     ; �����
-      (ideograph-daikanwa        . 01452)      ; �����
+     ((=jis-x0208-1978   . #x3878)     ; �����
+      (japanese-jisx0208  . #x3878)    ; �����
+      (korean-ksc5601    . #x4D6B)     ; �����
+      (ideograph-daikanwa . 01452)     ; �����
       )
      ((korean-ksc5601    . #x6962)     ; �����
       (ideograph-daikanwa . 28614)     ; �����
@@ -472,15 +472,15 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((japanese-jisx0208-1978    . #x3878)     ; �����
-      (japanese-jisx0208         . #x3878)     ; �����
-      (korean-ksc5601            . #x4D6B)     ; �����
-      (ideograph-daikanwa        . 01452)      ; �����
+     ((=jis-x0208-1978   . #x3878)     ; �����
+      (japanese-jisx0208  . #x3878)    ; �����
+      (korean-ksc5601    . #x4D6B)     ; �����
+      (ideograph-daikanwa . 01452)     ; �����
       )
      ((=ucs              . #x7FBD)     ; 羽
       ))
-    (japanese-jisx0208-1978    . #x3227)       ; �����
-    (japanese-jisx0208         . #x3227)       ; �����
+    (=jis-x0208-1978   . #x3227)       ; �����
+    (japanese-jisx0208 . #x3227)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        28635 1 0)
@@ -515,10 +515,10 @@
      ((korean-ksc5601    . #x6962)     ; �����
       (ideograph-daikanwa . 28614)     ; �����
       )
-     ((japanese-jisx0208-1978    . #x4A2C)     ; �����
-      (japanese-jisx0208         . #x4A2C)     ; �����
-      (korean-ksc5601            . #x5D42)     ; �����
-      (ideograph-daikanwa        . 01853)      ; �����
+     ((=jis-x0208-1978   . #x4A2C)     ; �����
+      (japanese-jisx0208  . #x4A2C)    ; �����
+      (korean-ksc5601    . #x5D42)     ; �����
+      (ideograph-daikanwa . 01853)     ; �����
       ))
     (chinese-big5      . #xD364)       ; ������
     (ideograph-daikanwa . 28636)       ; �����
@@ -1755,10 +1755,10 @@
       ))
     (shinjigen-1       . 6310)
     (shinjigen-2       . 6310)
-    (japanese-jisx0208-1978    . #x6646)       ; �����
-    (korean-ksc5601            . #x5F56)       ; �����
-    (chinese-big5              . #xB5BE)       ; ������
-    (ideograph-daikanwa                . 28689)        ; �����
+    (=jis-x0208-1978   . #x6646)       ; �����
+    (korean-ksc5601    . #x5F56)       ; �����
+    (chinese-big5      . #xB5BE)       ; ������
+    (ideograph-daikanwa . 28689)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7FD4)       ; 翔
@@ -2618,10 +2618,10 @@
       (korean-ksc5601    . #x706F)     ; �����
       (ideograph-daikanwa . 02740)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x3F69)       ; �����
-    (korean-ksc5601            . #x7628)       ; �����
-    (chinese-big5              . #xBB41)       ; ������
-    (ideograph-daikanwa                . 28732)        ; �����
+    (=jis-x0208-1978   . #x3F69)       ; �����
+    (korean-ksc5601    . #x7628)       ; �����
+    (chinese-big5      . #xBB41)       ; ������
+    (ideograph-daikanwa . 28732)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7FE0)       ; 翠
@@ -2681,11 +2681,11 @@
       (ideograph-daikanwa . 28614)     ; �����
       ))
     (shinjigen-2       . 6316)
-    (japanese-jisx0208-1978    . #x6647)       ; �����
-    (japanese-jisx0208         . #x6647)       ; �����
-    (korean-ksc5601            . #x5D7D)       ; �����
-    (chinese-big5              . #xBB42)       ; ������
-    (ideograph-daikanwa                . 28733)        ; �����
+    (=jis-x0208-1978   . #x6647)       ; �����
+    (japanese-jisx0208 . #x6647)       ; �����
+    (korean-ksc5601    . #x5D7D)       ; �����
+    (chinese-big5      . #xBB42)       ; ������
+    (ideograph-daikanwa . 28733)       ; �����
     ))
 (define-char
   '((=>ucs             . #x7FE1)       ; 翡
@@ -3555,10 +3555,10 @@
       )
      ((=ucs              . #x5143)     ; 元
       ))
-    (japanese-jisx0208-1978    . #x3465)       ; �����
-    (korean-ksc5601            . #x6851)       ; �����
-    (chinese-big5              . #xE6F6)       ; ������
-    (ideograph-daikanwa                . 28766)        ; �����
+    (=jis-x0208-1978   . #x3465)       ; �����
+    (korean-ksc5601    . #x6851)       ; �����
+    (chinese-big5      . #xE6F6)       ; ������
+    (ideograph-daikanwa . 28766)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        28766 0 2)
@@ -3861,10 +3861,10 @@
     (ideographic-radical . 124)        ; ⽻
     (ideographic-strokes . 10)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x344D)       ; �����
-    (korean-ksc5601            . #x7957)       ; �����
-    (chinese-big5              . #xBFAB)       ; ������
-    (ideograph-daikanwa                . 28780)        ; �����
+    (=jis-x0208-1978   . #x344D)       ; �����
+    (korean-ksc5601    . #x7957)       ; �����
+    (chinese-big5      . #xBFAB)       ; ������
+    (ideograph-daikanwa . 28780)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        28780 0 2)
@@ -4394,11 +4394,11 @@
       )
      ((=ucs              . #x7570)     ; 異
       ))
-    (japanese-jisx0208-1978    . #x4D63)       ; �����
-    (chinese-gb2312            . #x526D)       ; �����
-    (japanese-jisx0208         . #x4D63)       ; �����
-    (=iso-ir165                        . #x526D)       ; �����
-    (=ucs                      . #x7FFC)       ; 翼
+    (=jis-x0208-1978   . #x4D63)       ; �����
+    (chinese-gb2312    . #x526D)       ; �����
+    (japanese-jisx0208 . #x4D63)       ; �����
+    (=iso-ir165                . #x526D)       ; �����
+    (=ucs              . #x7FFC)       ; 翼
     ))
 (define-char
   '((=>ucs             . #x7FFC)       ; 翼
@@ -5044,9 +5044,9 @@
       (=jis-x0213-1-2000  . #x7A40)    ; �����
       (ideograph-daikanwa . 28727)     ; �����
       ))
-    (japanese-jisx0208-1978    . #x4D54)       ; �����
-    (korean-ksc5601            . #x6925)       ; �����
-    (ideograph-daikanwa                . 28828)        ; �����
+    (=jis-x0208-1978   . #x4D54)       ; �����
+    (korean-ksc5601    . #x6925)       ; �����
+    (ideograph-daikanwa . 28828)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8000)       ; 耀

diff --git a/lisp/utf-2000/Ideograph-R125-Old.el b/lisp/utf-2000/Ideograph-R125-Old.el
index 7bbdf9b..27d8edf 100644 (file)
--- a/lisp/utf-2000/Ideograph-R125-Old.el
+++ b/lisp/utf-2000/Ideograph-R125-Old.el
@@ -33,13 +33,13 @@
     (ideographic-strokes . 2)
     (total-strokes      . 6)
     (shinjigen-2       . 6339)
-    (japanese-jisx0208-1978    . #x394D)       ; �����
-    (chinese-gb2312            . #x3F3C)       ; �����
-    (japanese-jisx0208         . #x394D)       ; �����
-    (=iso-ir165                        . #x3F3C)       ; �����
-    (chinese-cns11643-1                . #x4853)       ; �����
-    (ideograph-daikanwa                . 28843)        ; �����
-    (=ucs                      . #x8003)       ; 考
+    (=jis-x0208-1978   . #x394D)       ; �����
+    (chinese-gb2312    . #x3F3C)       ; �����
+    (japanese-jisx0208 . #x394D)       ; �����
+    (=iso-ir165                . #x3F3C)       ; �����
+    (chinese-cns11643-1 . #x4853)      ; �����
+    (ideograph-daikanwa . 28843)       ; �����
+    (=ucs              . #x8003)       ; 考
     ))
 (define-char
   '((=>ucs             . #x8003)       ; 考

diff --git a/lisp/utf-2000/Ideograph-R128-Ear.el b/lisp/utf-2000/Ideograph-R128-Ear.el
index 935a1cf..38cd300 100644 (file)
--- a/lisp/utf-2000/Ideograph-R128-Ear.el
+++ b/lisp/utf-2000/Ideograph-R128-Ear.el
@@ -139,12 +139,12 @@
     (ideographic-radical . 128)        ; ⽿
     (ideographic-strokes . 3)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x4C6D)       ; �����
-    (chinese-gb2312            . #x522E)       ; �����
-    (japanese-jisx0208         . #x4C6D)       ; �����
-    (korean-ksc5601            . #x652D)       ; �����
-    (=iso-ir165                        . #x522E)       ; �����
-    (=ucs                      . #x8036)       ; 耶
+    (=jis-x0208-1978   . #x4C6D)       ; �����
+    (chinese-gb2312    . #x522E)       ; �����
+    (japanese-jisx0208 . #x4C6D)       ; �����
+    (korean-ksc5601    . #x652D)       ; �����
+    (=iso-ir165                . #x522E)       ; �����
+    (=ucs              . #x8036)       ; 耶
     ))
 (define-char
   '((ideographic-radical . 128)        ; ⽿
@@ -1169,12 +1169,12 @@
     (ideographic-strokes . 8)
     (total-strokes      . 14)
     (shinjigen-2       . 6391)
-    (japanese-jisx0208-1978    . #x665C)       ; �����
-    (chinese-gb2312            . #x3E5B)       ; �����
-    (japanese-jisx0208         . #x665C)       ; �����
-    (korean-ksc5601            . #x7629)       ; �����
-    (=iso-ir165                        . #x3E5B)       ; �����
-    (=ucs                      . #x805A)       ; 聚
+    (=jis-x0208-1978   . #x665C)       ; �����
+    (chinese-gb2312    . #x3E5B)       ; �����
+    (japanese-jisx0208 . #x665C)       ; �����
+    (korean-ksc5601    . #x7629)       ; �����
+    (=iso-ir165                . #x3E5B)       ; �����
+    (=ucs              . #x805A)       ; 聚
     ))
 (define-char
   '((=>ucs             . #x805A)       ; 聚
@@ -1344,9 +1344,9 @@
     (ideographic-radical . 128)        ; ⽿
     (ideographic-strokes . 8)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x665D)       ; �����
-    (japanese-jisx0208         . #x665D)       ; �����
-    (=ucs                      . #x805F)       ; 聟
+    (=jis-x0208-1978   . #x665D)       ; �����
+    (japanese-jisx0208 . #x665D)       ; �����
+    (=ucs              . #x805F)       ; 聟
     ))
 (define-char
   '((=>ucs             . #x805F)       ; 聟
@@ -1390,8 +1390,8 @@
     (ideographic-radical . 128)        ; ⽿
     (ideographic-strokes . 8)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x416F)       ; �����
-    (japanese-jisx0208         . #x416F)       ; �����
+    (=jis-x0208-1978   . #x416F)       ; �����
+    (japanese-jisx0208 . #x416F)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        29109 0 2)
@@ -1932,11 +1932,11 @@
     (ideographic-radical . 128)        ; ⽿
     (ideographic-strokes . 11)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x4E7E)       ; �����
-    (japanese-jisx0208         . #x4E7E)       ; �����
-    (korean-ksc5601            . #x5624)       ; �����
-    (chinese-gb12345           . #x412A)       ; 聯
-    (=ucs                      . #x806F)       ; 聯
+    (=jis-x0208-1978   . #x4E7E)       ; �����
+    (japanese-jisx0208 . #x4E7E)       ; �����
+    (korean-ksc5601    . #x5624)       ; �����
+    (chinese-gb12345   . #x412A)       ; 聯
+    (=ucs              . #x806F)       ; 聯
     ))
 (define-char
   '((=>ucs             . #x806F)       ; 聯
@@ -1950,11 +1950,11 @@
   '((ideographic-radical . 128)        ; ⽿
     (ideographic-strokes . 11)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x6662)       ; �����
-    (japanese-jisx0208         . #x6662)       ; �����
-    (chinese-gb12345           . #x344F)       ; 聰
-    (ideograph-daikanwa                . 29154)        ; �����
-    (=ucs                      . #x8070)       ; 聰
+    (=jis-x0208-1978   . #x6662)       ; �����
+    (japanese-jisx0208 . #x6662)       ; �����
+    (chinese-gb12345   . #x344F)       ; 聰
+    (ideograph-daikanwa . 29154)       ; �����
+    (=ucs              . #x8070)       ; 聰
     ))
 (define-char
   '((=>ucs             . #x8070)       ; 聰
@@ -2181,8 +2181,8 @@
     (ideographic-radical . 128)        ; ⽿
     (ideographic-strokes . 10)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x6660)       ; �����
-    (japanese-jisx0208         . #x6660)       ; �����
+    (=jis-x0208-1978   . #x6660)       ; �����
+    (japanese-jisx0208 . #x6660)       ; �����
     ))
 (define-char
   '((ideographic-radical . 128)        ; ⽿
@@ -2249,10 +2249,10 @@
     (ideographic-strokes . 11)
     (total-strokes      . 17)
     (shinjigen-2       . 6400)
-    (japanese-jisx0208-1978    . #x4430)       ; �����
-    (japanese-jisx0208         . #x4430)       ; �����
-    (ideograph-daikanwa                . 29173)        ; �����
-    (=ucs                      . #x8074)       ; 聴
+    (=jis-x0208-1978   . #x4430)       ; �����
+    (japanese-jisx0208 . #x4430)       ; �����
+    (ideograph-daikanwa . 29173)       ; �����
+    (=ucs              . #x8074)       ; 聴
     ))
 (define-char
   '((=>ucs             . #x8074)       ; 聴
@@ -2356,9 +2356,9 @@
     (ideographic-strokes . 12)
     (total-strokes      . 18)
     (shinjigen-2       . 6405)
-    (japanese-jisx0208-1978    . #x6663)       ; �����
-    (japanese-jisx0208         . #x6663)       ; �����
-    (ideograph-daikanwa                . 29179)        ; �����
+    (=jis-x0208-1978   . #x6663)       ; �����
+    (japanese-jisx0208 . #x6663)       ; �����
+    (ideograph-daikanwa . 29179)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8076)       ; 聶
@@ -2455,10 +2455,10 @@
     (ideographic-strokes . 12)
     (total-strokes      . 18)
     (shinjigen-2       . 6406)
-    (japanese-jisx0208-1978    . #x3F26)       ; �����
-    (japanese-jisx0208         . #x3F26)       ; �����
-    (chinese-gb12345           . #x5630)       ; 職
-    (=ucs                      . #x8077)       ; 職
+    (=jis-x0208-1978   . #x3F26)       ; �����
+    (japanese-jisx0208 . #x3F26)       ; �����
+    (chinese-gb12345   . #x5630)       ; 職
+    (=ucs              . #x8077)       ; 職
     ))
 (define-char
   '((=>ucs             . #x8077)       ; 職
@@ -2803,11 +2803,11 @@
     (ideographic-radical . 128)        ; ⽿
     (ideographic-strokes . 16)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x4F38)       ; �����
-    (japanese-jisx0208         . #x4F38)       ; �����
-    (korean-ksc5601            . #x566C)       ; �����
-    (chinese-gb12345           . #x417B)       ; 聾
-    (=ucs                      . #x807E)       ; 聾
+    (=jis-x0208-1978   . #x4F38)       ; �����
+    (japanese-jisx0208 . #x4F38)       ; �����
+    (korean-ksc5601    . #x566C)       ; �����
+    (chinese-gb12345   . #x417B)       ; 聾
+    (=ucs              . #x807E)       ; 聾
     ))
 (define-char
   '((=>ucs             . #x807E)       ; 聾

diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el
index 3983293..6f7a79f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R130-Meat.el
+++ b/lisp/utf-2000/Ideograph-R130-Meat.el
@@ -4197,9 +4197,9 @@
     (ideographic-radical . 130)        ; ⾁
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x4C2E)       ; �����
-    (japanese-jisx0208         . #x4C2E)       ; �����
-    (ideograph-daikanwa                . 29470)        ; �����
+    (=jis-x0208-1978   . #x4C2E)       ; �����
+    (japanese-jisx0208 . #x4C2E)       ; �����
+    (ideograph-daikanwa . 29470)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8108)       ; 脈
@@ -6927,9 +6927,9 @@
     (total-strokes      . 12)
     (shinjigen-1       . 6519)
     (shinjigen-2       . 6519)
-    (japanese-jisx0208-1978    . #x6724)       ; �����
-    (japanese-jisx0208         . #x6724)       ; �����
-    (ideograph-daikanwa                . 29629)        ; �����
+    (=jis-x0208-1978   . #x6724)       ; �����
+    (japanese-jisx0208 . #x6724)       ; �����
+    (ideograph-daikanwa . 29629)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8153)       ; 腓
@@ -8982,9 +8982,9 @@
     (ideographic-radical . 130)        ; ⾁
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x425C)       ; �����
-    (korean-ksc5601            . #x775A)       ; �����
-    (ideograph-daikanwa                . 29747)        ; �����
+    (=jis-x0208-1978   . #x425C)       ; �����
+    (korean-ksc5601    . #x775A)       ; �����
+    (ideograph-daikanwa . 29747)       ; �����
     ))
 (define-char
   '((=>ucs             . #x817F)       ; 腿
@@ -9632,8 +9632,8 @@
     (ideographic-radical . 130)        ; ⾁
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x672E)       ; �����
-    (japanese-jisx0208         . #x672E)       ; �����
+    (=jis-x0208-1978   . #x672E)       ; �����
+    (japanese-jisx0208 . #x672E)       ; �����
     ))
 (define-char
   '((ideographic-radical . 130)        ; ⾁
@@ -11993,8 +11993,8 @@
     (ideographic-radical . 130)        ; ⾁
     (ideographic-strokes . 11)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x6739)       ; �����
-    (japanese-jisx0208         . #x6739)       ; �����
+    (=jis-x0208-1978   . #x6739)       ; �����
+    (japanese-jisx0208 . #x6739)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        29920 0 2)
@@ -12924,9 +12924,9 @@
     (ideographic-radical . 130)        ; ⾁
     (ideographic-strokes . 14)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x6741)       ; �����
-    (japanese-jisx0208         . #x6741)       ; �����
-    (korean-ksc5601            . #x7030)       ; �����
+    (=jis-x0208-1978   . #x6741)       ; �����
+    (japanese-jisx0208 . #x6741)       ; �����
+    (korean-ksc5601    . #x7030)       ; �����
     ))
 (define-char
   '((=>ucs             . #x26890)      ; 𦢐

diff --git a/lisp/utf-2000/Ideograph-R136-Oppose.el b/lisp/utf-2000/Ideograph-R136-Oppose.el
index 9b86d19..16655eb 100644 (file)
--- a/lisp/utf-2000/Ideograph-R136-Oppose.el
+++ b/lisp/utf-2000/Ideograph-R136-Oppose.el
@@ -51,9 +51,9 @@
     (ideographic-radical . 136)        ; ⾇
     (ideographic-strokes . 6)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x3D58)       ; �����
-    (japanese-jisx0208         . #x3D58)       ; �����
-    (korean-ksc5601            . #x626F)       ; �����
+    (=jis-x0208-1978   . #x3D58)       ; �����
+    (japanese-jisx0208 . #x3D58)       ; �����
+    (korean-ksc5601    . #x626F)       ; �����
     ))
 (define-char
   '((=>ucs             . #x821C)       ; 舜

diff --git a/lisp/utf-2000/Ideograph-R137-Boat.el b/lisp/utf-2000/Ideograph-R137-Boat.el
index b4bca7e..6440f91 100644 (file)
--- a/lisp/utf-2000/Ideograph-R137-Boat.el
+++ b/lisp/utf-2000/Ideograph-R137-Boat.el
@@ -451,7 +451,7 @@
     (ideographic-radical . 137)        ; ⾈
     (ideographic-strokes . 4)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x6764)       ; �����
+    (=jis-x0208-1978   . #x6764)       ; �����
     ))
 (define-char
   '((=>ucs             . #x822E)       ; 舮
@@ -656,9 +656,9 @@
     (ideographic-strokes . 5)
     (total-strokes      . 11)
     (shinjigen-1       . 6652)
-    (japanese-jisx0208-1978    . #x4125)       ; �����
-    (japanese-jisx0208         . #x4125)       ; �����
-    (ideograph-daikanwa                . 30407)        ; �����
+    (=jis-x0208-1978   . #x4125)       ; �����
+    (japanese-jisx0208 . #x4125)       ; �����
+    (ideograph-daikanwa . 30407)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8239)       ; 船
@@ -1046,10 +1046,10 @@
     (ideographic-strokes . 7)
     (total-strokes      . 13)
     (shinjigen-2       . 6657)
-    (japanese-jisx0208-1978    . #x447A)       ; �����
-    (japanese-jisx0208         . #x447A)       ; �����
-    (korean-ksc5601            . #x6F73)       ; �����
-    (ideograph-daikanwa                . 30440)        ; �����
+    (=jis-x0208-1978   . #x447A)       ; �����
+    (japanese-jisx0208 . #x447A)       ; �����
+    (korean-ksc5601    . #x6F73)       ; �����
+    (ideograph-daikanwa . 30440)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        30440 0 0)

diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el
index 727881e..26be50e 100644 (file)
--- a/lisp/utf-2000/Ideograph-R140-Grass.el
+++ b/lisp/utf-2000/Ideograph-R140-Grass.el
@@ -593,8 +593,8 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 3)
     (total-strokes      . 6)
-    (japanese-jisx0208-1978    . #x6769)       ; �����
-    (korean-ksc5601            . #x6D4B)       ; �����
+    (=jis-x0208-1978   . #x6769)       ; �����
+    (korean-ksc5601    . #x6D4B)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        30674 0 3)
@@ -2273,7 +2273,7 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x6772)       ; �����
+    (=jis-x0208-1978   . #x6772)       ; �����
     ))
 (define-char
   '((=>ucs             . #x82D2)       ; 苒
@@ -3553,9 +3553,9 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x326A)       ; �����
-    (japanese-jisx0208         . #x326A)       ; �����
-    (korean-ksc5601            . #x6434)       ; �����
+    (=jis-x0208-1978   . #x326A)       ; �����
+    (japanese-jisx0208 . #x326A)       ; �����
+    (korean-ksc5601    . #x6434)       ; �����
     ))
 (define-char
   '((=>ucs             . #x82BD)       ; 芽
@@ -4945,10 +4945,10 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 6)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x3755)       ; �����
-    (chinese-gb2312            . #x3E23)       ; �����
-    (=iso-ir165                        . #x3E23)       ; �����
-    (=ucs                      . #x8346)       ; 荆
+    (=jis-x0208-1978   . #x3755)       ; �����
+    (chinese-gb2312    . #x3E23)       ; �����
+    (=iso-ir165                . #x3E23)       ; �����
+    (=ucs              . #x8346)       ; 荆
     ))
 (define-char
   '((=>ucs             . #x834A)       ; 荊
@@ -5812,8 +5812,8 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (japanese-jisx0208-1978    . #x683B)       ; �����
-    (=ucs                      . #x8375)       ; 荵
+    (=jis-x0208-1978   . #x683B)       ; �����
+    (=ucs              . #x8375)       ; 荵
     ))
 (define-char
   '((=>ucs             . #x8375)       ; 荵
@@ -7132,7 +7132,7 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x6834)       ; �����
+    (=jis-x0208-1978   . #x6834)       ; �����
     ))
 (define-char
   '((ideographic-radical . 140)        ; ⾋
@@ -8386,7 +8386,7 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x4551)       ; �����
+    (=jis-x0208-1978   . #x4551)       ; �����
     ))
 (define-char
   '((=>ucs             . #x83DF)       ; 菟
@@ -8880,9 +8880,9 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x684B)       ; �����
-    (japanese-jisx0208         . #x684B)       ; �����
-    (korean-ksc5601            . #x5E23)       ; �����
+    (=jis-x0208-1978   . #x684B)       ; �����
+    (japanese-jisx0208 . #x684B)       ; �����
+    (korean-ksc5601    . #x5E23)       ; �����
     ))
 (define-char
   '((=>ucs             . #x83F2)       ; 菲
@@ -9505,12 +9505,12 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x4D69)       ; �����
-    (korean-ksc5601            . #x5551)       ; �����
-    (japanese-jisx0212         . #x5847)       ; �����
-    (=jis-x0213-1-2000         . #x7B26)       ; �����
-    (chinese-gb12345           . #x4033)       ; 萊
-    (=ucs                      . #x840A)       ; 萊
+    (=jis-x0208-1978   . #x4D69)       ; �����
+    (korean-ksc5601    . #x5551)       ; �����
+    (japanese-jisx0212 . #x5847)       ; �����
+    (=jis-x0213-1-2000 . #x7B26)       ; �����
+    (chinese-gb12345   . #x4033)       ; 萊
+    (=ucs              . #x840A)       ; 萊
     ))
 (define-char
   '((ideographic-radical . 140)        ; ⾋
@@ -12474,11 +12474,11 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x4978)       ; �����
-    (chinese-gb2312            . #x5D5D)       ; �����
-    (japanese-jisx0208         . #x4978)       ; �����
-    (=iso-ir165                        . #x5D5D)       ; �����
-    (=ucs                      . #x847A)       ; 葺
+    (=jis-x0208-1978   . #x4978)       ; �����
+    (chinese-gb2312    . #x5D5D)       ; �����
+    (japanese-jisx0208 . #x4978)       ; �����
+    (=iso-ir165                . #x5D5D)       ; �����
+    (=ucs              . #x847A)       ; 葺
     ))
 (define-char
   '((=>ucs             . #x847B)       ; 葻
@@ -15856,8 +15856,8 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x4B29)       ; �����
-    (korean-ksc5601            . #x5C6F)       ; �����
+    (=jis-x0208-1978   . #x4B29)       ; �����
+    (korean-ksc5601    . #x5C6F)       ; �����
     ))
 (define-char
   '((=>ucs             . #x84EC)       ; 蓬
@@ -15917,8 +15917,8 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x4F21)       ; �����
-    (korean-ksc5601            . #x5625)       ; �����
+    (=jis-x0208-1978   . #x4F21)       ; �����
+    (korean-ksc5601    . #x5625)       ; �����
     ))
 (define-char
   '((=>ucs             . #x84EE)       ; 蓮
@@ -16870,7 +16870,7 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x6874)       ; �����
+    (=jis-x0208-1978   . #x6874)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8518)       ; 蔘
@@ -17213,12 +17213,12 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x3E55)       ; �����
-    (korean-ksc5601            . #x6D78)       ; �����
-    (japanese-jisx0212         . #x5936)       ; �����
-    (=jis-x0213-1-2000         . #x7B36)       ; �����
-    (chinese-gb12345           . #x3D2F)       ; 蔣
-    (=ucs                      . #x8523)       ; 蔣
+    (=jis-x0208-1978   . #x3E55)       ; �����
+    (korean-ksc5601    . #x6D78)       ; �����
+    (japanese-jisx0212 . #x5936)       ; �����
+    (=jis-x0213-1-2000 . #x7B36)       ; �����
+    (chinese-gb12345   . #x3D2F)       ; 蔣
+    (=ucs              . #x8523)       ; 蔣
     ))
 (define-char
   '((ideographic-radical . 140)        ; ⾋
@@ -18162,8 +18162,8 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4A43)       ; �����
-    (korean-ksc5601            . #x784C)       ; �����
+    (=jis-x0208-1978   . #x4A43)       ; �����
+    (korean-ksc5601    . #x784C)       ; �����
     ))
 (define-char
   '((=>ucs             . #x853D)       ; 蔽
@@ -18787,14 +18787,14 @@
   '((ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 12)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x6922)       ; �����
-    (chinese-gb2312            . #x486F)       ; �����
-    (japanese-jisx0208         . #x3C49)       ; �����
-    (=iso-ir165                        . #x486F)       ; �����
-    (chinese-cns11643-1                . #x717E)       ; �����
-    (=jis-x0208-1990           . #x3C49)       ; �����
-    (ideograph-daikanwa                . 31939)        ; �����
-    (=ucs                      . #x854A)       ; 蕊
+    (=jis-x0208-1978   . #x6922)       ; �����
+    (chinese-gb2312    . #x486F)       ; �����
+    (japanese-jisx0208 . #x3C49)       ; �����
+    (=iso-ir165                . #x486F)       ; �����
+    (chinese-cns11643-1 . #x717E)      ; �����
+    (=jis-x0208-1990   . #x3C49)       ; �����
+    (ideograph-daikanwa . 31939)       ; �����
+    (=ucs              . #x854A)       ; 蕊
     ))
 (define-char
   '((=>ucs             . #x854B)       ; 蕋
@@ -19122,8 +19122,8 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x6924)       ; �����
-    (japanese-jisx0208         . #x6924)       ; �����
+    (=jis-x0208-1978   . #x6924)       ; �����
+    (japanese-jisx0208 . #x6924)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8555)       ; 蕕
@@ -21890,13 +21890,13 @@
     (ideographic-strokes . 13)
     (total-strokes      . 16)
     (hanyu-dazidian    5 3306 7)
-    (japanese-jisx0208-1978    . #x692E)       ; �����
-    (chinese-gb2312            . #x5E34)       ; �����
-    (japanese-jisx0208         . #x4C79)       ; �����
-    (=iso-ir165                        . #x5E34)       ; �����
-    (=jis-x0208-1990           . #x4C79)       ; �����
-    (=hanziku-9                        . #xACD8)       ; ������
-    (=ucs                      . #x85AE)       ; 薮
+    (=jis-x0208-1978   . #x692E)       ; �����
+    (chinese-gb2312    . #x5E34)       ; �����
+    (japanese-jisx0208 . #x4C79)       ; �����
+    (=iso-ir165                . #x5E34)       ; �����
+    (=jis-x0208-1990   . #x4C79)       ; �����
+    (=hanziku-9                . #xACD8)       ; ������
+    (=ucs              . #x85AE)       ; 薮
     ))
 (define-char
   '((ideographic-radical . 140)        ; ⾋
@@ -21955,8 +21955,8 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 14)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x3B27)       ; �����
-    (korean-ksc5601            . #x5F31)       ; �����
+    (=jis-x0208-1978   . #x3B27)       ; �����
+    (korean-ksc5601    . #x5F31)       ; �����
     ))
 (define-char
   '((=>ucs             . #x85A9)       ; 薩
@@ -23307,8 +23307,8 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 15)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x6939)       ; �����
-    (japanese-jisx0208         . #x6939)       ; �����
+    (=jis-x0208-1978   . #x6939)       ; �����
+    (japanese-jisx0208 . #x6939)       ; �����
     ))
 (define-char
   '((=>ucs             . #x85D5)       ; 藕
@@ -23972,12 +23972,12 @@
     (ideographic-radical . 140)        ; ⾋
     (ideographic-strokes . 15)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x4C79)       ; �����
-    (japanese-jisx0208         . #x692E)       ; �����
-    (korean-ksc5601            . #x623F)       ; �����
-    (=jis-x0208-1990           . #x692E)       ; �����
-    (chinese-gb12345           . #x5E34)       ; 藪
-    (=ucs                      . #x85EA)       ; 藪
+    (=jis-x0208-1978   . #x4C79)       ; �����
+    (japanese-jisx0208 . #x692E)       ; �����
+    (korean-ksc5601    . #x623F)       ; �����
+    (=jis-x0208-1990   . #x692E)       ; �����
+    (chinese-gb12345   . #x5E34)       ; 藪
+    (=ucs              . #x85EA)       ; 藪
     ))
 (define-char
   '((ideographic-radical . 140)        ; ⾋
@@ -24731,12 +24731,12 @@
     (ideographic-strokes . 16)
     (total-strokes      . 19)
     (hanyu-dazidian    5 3329 9)
-    (japanese-jisx0208-1978    . #x3C49)       ; �����
-    (japanese-jisx0208         . #x6922)       ; �����
-    (korean-ksc5601            . #x675E)       ; �����
-    (=jis-x0208-1990           . #x6922)       ; �����
-    (=hanziku-9                        . #xB1A9)       ; ������
-    (=ucs                      . #x8602)       ; 蘂
+    (=jis-x0208-1978   . #x3C49)       ; �����
+    (japanese-jisx0208 . #x6922)       ; �����
+    (korean-ksc5601    . #x675E)       ; �����
+    (=jis-x0208-1990   . #x6922)       ; �����
+    (=hanziku-9                . #xB1A9)       ; ������
+    (=ucs              . #x8602)       ; 蘂
     ))
 (define-char
   '((=>ucs             . #x8603)       ; 蘃

diff --git a/lisp/utf-2000/Ideograph-R142-Insect.el b/lisp/utf-2000/Ideograph-R142-Insect.el
index 7a1860e..c01085e 100644 (file)
--- a/lisp/utf-2000/Ideograph-R142-Insect.el
+++ b/lisp/utf-2000/Ideograph-R142-Insect.el
@@ -1850,8 +1850,8 @@
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 6)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x6961)       ; �����
-    (korean-ksc5601            . #x7148)       ; �����
+    (=jis-x0208-1978   . #x6961)       ; �����
+    (korean-ksc5601    . #x7148)       ; �����
     ))
 (define-char
   '((ideographic-radical . 142)        ; ⾍
@@ -2471,8 +2471,8 @@
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 7)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x427D)       ; �����
-    (ideograph-daikanwa                . 33072)        ; �����
+    (=jis-x0208-1978   . #x427D)       ; �����
+    (ideograph-daikanwa . 33072)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        33072 0 2)
@@ -3170,9 +3170,9 @@
     (total-strokes      . 14)
     (shinjigen-1       . 7210)
     (shinjigen-2       . 7211)
-    (japanese-jisx0208-1978    . #x6974)       ; �����
-    (japanese-jisx0208         . #x6974)       ; �����
-    (ideograph-daikanwa                . 33138)        ; �����
+    (=jis-x0208-1978   . #x6974)       ; �����
+    (japanese-jisx0208 . #x6974)       ; �����
+    (ideograph-daikanwa . 33138)       ; �����
     ))
 (define-char
   '((=>ucs             . #x871A)       ; 蜚
@@ -4390,9 +4390,9 @@
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 9)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x3F2A)       ; �����
-    (korean-ksc5601            . #x635A)       ; �����
-    (ideograph-daikanwa                . 33264)        ; �����
+    (=jis-x0208-1978   . #x3F2A)       ; �����
+    (korean-ksc5601    . #x635A)       ; �����
+    (ideograph-daikanwa . 33264)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        33264 0 2)
@@ -5267,10 +5267,10 @@
   '((ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 9)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x6A24)       ; �����
-    (japanese-jisx0208         . #x4768)       ; �����
-    (=jis-x0208-1990           . #x4768)       ; �����
-    (=ucs                      . #x877F)       ; 蝿
+    (=jis-x0208-1978   . #x6A24)       ; �����
+    (japanese-jisx0208 . #x4768)       ; �����
+    (=jis-x0208-1990   . #x4768)       ; �����
+    (=ucs              . #x877F)       ; 蝿
     ))
 (define-char
   '((ideographic-radical . 142)        ; ⾍
@@ -5308,7 +5308,7 @@
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 10)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x6A27)       ; �����
+    (=jis-x0208-1978   . #x6A27)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        33362 0 2)
@@ -7367,10 +7367,10 @@
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 10)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x6A3D)       ; �����
-    (chinese-gb2312            . #x727E)       ; �����
-    (=iso-ir165                        . #x727E)       ; �����
-    (=ucs                      . #x87D2)       ; 蟒
+    (=jis-x0208-1978   . #x6A3D)       ; �����
+    (chinese-gb2312    . #x727E)       ; �����
+    (=iso-ir165                . #x727E)       ; �����
+    (=ucs              . #x87D2)       ; 蟒
     ))
 (define-char
   '((=>ucs             . #x87D2)       ; 蟒
@@ -7803,13 +7803,13 @@
   '((ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 12)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x4066)       ; �����
-    (korean-ksc5601            . #x6051)       ; �����
-    (chinese-cns11643-1                . #x7738)       ; �����
-    (=jis-x0213-1-2000         . #x7B62)       ; �����
-    (chinese-gb12345           . #x3275)       ; 蟬
-    (ideograph-daikanwa                . 33616)        ; �����
-    (=ucs                      . #x87EC)       ; 蟬
+    (=jis-x0208-1978   . #x4066)       ; �����
+    (korean-ksc5601    . #x6051)       ; �����
+    (chinese-cns11643-1 . #x7738)      ; �����
+    (=jis-x0213-1-2000 . #x7B62)       ; �����
+    (chinese-gb12345   . #x3275)       ; 蟬
+    (ideograph-daikanwa . 33616)       ; �����
+    (=ucs              . #x87EC)       ; 蟬
     ))
 (define-char
   '((ideographic-radical . 142)        ; ⾍
@@ -8529,10 +8529,10 @@
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 13)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x4768)       ; �����
-    (japanese-jisx0208         . #x6A24)       ; �����
-    (=jis-x0208-1990           . #x6A24)       ; �����
-    (=ucs@jis                  . #x8805)       ; �����
+    (=jis-x0208-1978   . #x4768)       ; �����
+    (japanese-jisx0208 . #x6A24)       ; �����
+    (=jis-x0208-1990   . #x6A24)       ; �����
+    (=ucs@jis          . #x8805)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8805)       ; 蠅
@@ -9431,13 +9431,13 @@
   '((ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 15)
     (total-strokes      . 21)
-    (japanese-jisx0208-1978    . #x4F39)       ; �����
-    (korean-ksc5601            . #x5545)       ; �����
-    (japanese-jisx0212         . #x5B78)       ; �����
-    (=jis-x0213-1-2000         . #x7B67)       ; �����
-    (chinese-gb12345           . #x402F)       ; 蠟
-    (ideograph-daikanwa                . 33786)        ; �����
-    (=ucs                      . #x881F)       ; 蠟
+    (=jis-x0208-1978   . #x4F39)       ; �����
+    (korean-ksc5601    . #x5545)       ; �����
+    (japanese-jisx0212 . #x5B78)       ; �����
+    (=jis-x0213-1-2000 . #x7B67)       ; �����
+    (chinese-gb12345   . #x402F)       ; 蠟
+    (ideograph-daikanwa . 33786)       ; �����
+    (=ucs              . #x881F)       ; 蠟
     ))
 (define-char
   '((=>ucs             . #x881F)       ; 蠟
@@ -9578,24 +9578,24 @@
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 14)
     (total-strokes      . 20)
-    (japanese-jisx0208-1978    . #x3342)       ; �����
-    (japanese-jisx0208         . #x695A)       ; �����
-    (korean-ksc5601            . #x556E)       ; �����
-    (=jis-x0208-1990           . #x695A)       ; �����
-    (chinese-gb12345           . #x7243)       ; 蠣
-    (=ucs                      . #x8823)       ; 蠣
+    (=jis-x0208-1978   . #x3342)       ; �����
+    (japanese-jisx0208 . #x695A)       ; �����
+    (korean-ksc5601    . #x556E)       ; �����
+    (=jis-x0208-1990   . #x695A)       ; �����
+    (chinese-gb12345   . #x7243)       ; 蠣
+    (=ucs              . #x8823)       ; 蠣
     ))
 (define-char
   '((morohashi-daikanwa        33799 0 8)
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 5)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x695A)       ; �����
-    (chinese-gb2312            . #x7243)       ; �����
-    (japanese-jisx0208         . #x3342)       ; �����
-    (=iso-ir165                        . #x7243)       ; �����
-    (=jis-x0208-1990           . #x3342)       ; �����
-    (=ucs                      . #x86CE)       ; 蛎
+    (=jis-x0208-1978   . #x695A)       ; �����
+    (chinese-gb2312    . #x7243)       ; �����
+    (japanese-jisx0208 . #x3342)       ; �����
+    (=iso-ir165                . #x7243)       ; �����
+    (=jis-x0208-1990   . #x3342)       ; �����
+    (=ucs              . #x86CE)       ; 蛎
     ))
 (define-char
   '((ideographic-radical . 142)        ; ⾍
@@ -10307,8 +10307,8 @@
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 20)
     (total-strokes      . 26)
-    (japanese-jisx0208-1978    . #x6A44)       ; �����
-    (japanese-jisx0208         . #x6A44)       ; �����
+    (=jis-x0208-1978   . #x6A44)       ; �����
+    (japanese-jisx0208 . #x6A44)       ; �����
     ))
 (define-char
   '((ideographic-radical . 142)        ; ⾍

diff --git a/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el b/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el
index 57dc16b..14aeb46 100644 (file)
--- a/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el
@@ -499,8 +499,8 @@
     (ideographic-radical . 144)        ; ⾏
     (ideographic-strokes . 10)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x3152)       ; �����
-    (japanese-jisx0208         . #x3152)       ; �����
+    (=jis-x0208-1978   . #x3152)       ; �����
+    (japanese-jisx0208 . #x3152)       ; �����
     ))
 (define-char
   '((=>ucs             . #x885B)       ; 衛

diff --git a/lisp/utf-2000/Ideograph-R145-Clothes.el b/lisp/utf-2000/Ideograph-R145-Clothes.el
index 354ccbb..f4e31c7 100644 (file)
--- a/lisp/utf-2000/Ideograph-R145-Clothes.el
+++ b/lisp/utf-2000/Ideograph-R145-Clothes.el
@@ -1284,12 +1284,12 @@
   '((ideographic-radical . 145)        ; ⾐
     (ideographic-strokes . 5)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x6A51)       ; �����
-    (japanese-jisx0208         . #x6A51)       ; �����
-    (korean-ksc5601            . #x4D65)       ; �����
-    (chinese-big5              . #xB34F)       ; ������
-    (ideograph-daikanwa                . 34203)        ; �����
-    (=ucs                      . #x889E)       ; 袞
+    (=jis-x0208-1978   . #x6A51)       ; �����
+    (japanese-jisx0208 . #x6A51)       ; �����
+    (korean-ksc5601    . #x4D65)       ; �����
+    (chinese-big5      . #xB34F)       ; ������
+    (ideograph-daikanwa . 34203)       ; �����
+    (=ucs              . #x889E)       ; 袞
     ))
 (define-char
   '((=>ucs             . #x889E)       ; 袞
@@ -2457,9 +2457,9 @@
     (ideographic-radical . 145)        ; ⾐
     (ideographic-strokes . 7)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x6A64)       ; �����
-    (japanese-jisx0208         . #x6A64)       ; �����
-    (ideograph-daikanwa                . 34312)        ; �����
+    (=jis-x0208-1978   . #x6A64)       ; �����
+    (japanese-jisx0208 . #x6A64)       ; �����
+    (ideograph-daikanwa . 34312)       ; �����
     ))
 (define-char
   '((=>ucs             . #x88D8)       ; 裘
@@ -3074,9 +3074,9 @@
     (ideographic-radical . 145)        ; ⾐
     (ideographic-strokes . 8)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x6A6A)       ; �����
-    (japanese-jisx0208         . #x6A6A)       ; �����
-    (ideograph-daikanwa                . 34362)        ; �����
+    (=jis-x0208-1978   . #x6A6A)       ; �����
+    (japanese-jisx0208 . #x6A6A)       ; �����
+    (ideograph-daikanwa . 34362)       ; �����
     ))
 (define-char
   '((=>ucs             . #x88F4)       ; 裴
@@ -3706,10 +3706,10 @@
     (ideographic-radical . 145)        ; ⾐
     (ideographic-strokes . 9)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x6A6F)       ; �����
-    (chinese-cns11643-1                . #x6E73)       ; �����
-    (chinese-big5              . #xBDCA)       ; ������
-    (ideograph-daikanwa                . 34420)        ; �����
+    (=jis-x0208-1978   . #x6A6F)       ; �����
+    (chinese-cns11643-1 . #x6E73)      ; �����
+    (chinese-big5      . #xBDCA)       ; ������
+    (ideograph-daikanwa . 34420)       ; �����
     ))
 (define-char
   '((=>ucs             . #x890A)       ; 褊
@@ -4739,12 +4739,12 @@
     (ideographic-radical . 145)        ; ⾐
     (ideographic-strokes . 10)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x6A75)       ; �����
-    (chinese-gb2312            . #x715D)       ; �����
-    (japanese-jisx0208         . #x6A75)       ; �����
-    (=iso-ir165                        . #x715D)       ; �����
-    (chinese-big5              . #xBFC9)       ; ������
-    (=ucs                      . #x892B)       ; 褫
+    (=jis-x0208-1978   . #x6A75)       ; �����
+    (chinese-gb2312    . #x715D)       ; �����
+    (japanese-jisx0208 . #x6A75)       ; �����
+    (=iso-ir165                . #x715D)       ; �����
+    (chinese-big5      . #xBFC9)       ; ������
+    (=ucs              . #x892B)       ; 褫
     ))
 (define-char
   '((ideographic-radical . 145)        ; ⾐
@@ -5100,8 +5100,8 @@
     (ideographic-radical . 145)        ; ⾐
     (ideographic-strokes . 11)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x6A78)       ; �����
-    (japanese-jisx0208         . #x6A78)       ; �����
+    (=jis-x0208-1978   . #x6A78)       ; �����
+    (japanese-jisx0208 . #x6A78)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        34536 0 1)
@@ -6099,9 +6099,9 @@
     (ideographic-radical . 145)        ; ⾐
     (ideographic-strokes . 13)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x3228)       ; �����
-    (chinese-cns11643-1                . #x7878)       ; �����
-    (ideograph-daikanwa                . 34629)        ; �����
+    (=jis-x0208-1978   . #x3228)       ; �����
+    (chinese-cns11643-1 . #x7878)      ; �����
+    (ideograph-daikanwa . 34629)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        34629 0 3)
@@ -6781,8 +6781,8 @@
     (ideographic-radical . 145)        ; ⾐
     (ideographic-strokes . 14)
     (total-strokes      . 20)
-    (japanese-jisx0208-1978    . #x6B24)       ; �����
-    (japanese-jisx0208         . #x6B24)       ; �����
+    (=jis-x0208-1978   . #x6B24)       ; �����
+    (japanese-jisx0208 . #x6B24)       ; �����
     ))
 (define-char
   '((ideographic-radical . 145)        ; ⾐
@@ -6980,8 +6980,8 @@
     (ideographic-radical . 145)        ; ⾐
     (ideographic-strokes . 16)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x6B25)       ; �����
-    (japanese-jisx0208         . #x6B25)       ; �����
+    (=jis-x0208-1978   . #x6B25)       ; �����
+    (japanese-jisx0208 . #x6B25)       ; �����
     ))
 (define-char
   '((ideographic-radical . 145)        ; ⾐

diff --git a/lisp/utf-2000/Ideograph-R147-See.el b/lisp/utf-2000/Ideograph-R147-See.el
index aebbf5f..db93b75 100644 (file)
--- a/lisp/utf-2000/Ideograph-R147-See.el
+++ b/lisp/utf-2000/Ideograph-R147-See.el
@@ -1134,8 +1134,8 @@
     (ideographic-radical . 147)        ; ⾒
     (ideographic-strokes . 9)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x3F46)       ; �����
-    (japanese-jisx0208         . #x3F46)       ; �����
+    (=jis-x0208-1978   . #x3F46)       ; �����
+    (japanese-jisx0208 . #x3F46)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        34918 0 2)
@@ -1309,8 +1309,8 @@
     (ideographic-radical . 147)        ; ⾒
     (ideographic-strokes . 10)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x6B32)       ; �����
-    (ideograph-daikanwa                . 34937)        ; �����
+    (=jis-x0208-1978   . #x6B32)       ; �����
+    (ideograph-daikanwa . 34937)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        34937 0 1)

diff --git a/lisp/utf-2000/Ideograph-R149-Speech.el b/lisp/utf-2000/Ideograph-R149-Speech.el
index 32dd806..36187ce 100644 (file)
--- a/lisp/utf-2000/Ideograph-R149-Speech.el
+++ b/lisp/utf-2000/Ideograph-R149-Speech.el
@@ -818,8 +818,8 @@
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 5)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x6B43)       ; �����
-    (japanese-jisx0208         . #x6B43)       ; �����
+    (=jis-x0208-1978   . #x6B43)       ; �����
+    (japanese-jisx0208 . #x6B43)       ; �����
     ))
 (define-char
   '((ideographic-radical . 149)        ; ⾔
@@ -877,10 +877,10 @@
     (ideographic-strokes . 4)
     (total-strokes      . 11)
     (shinjigen-1       . 7561)
-    (japanese-jisx0208-1978    . #x3E59)       ; �����
-    (japanese-jisx0208         . #x3E59)       ; �����
-    (korean-ksc5601            . #x6168)       ; �����
-    (ideograph-daikanwa                . 35266)        ; �����
+    (=jis-x0208-1978   . #x3E59)       ; �����
+    (japanese-jisx0208 . #x3E59)       ; �����
+    (korean-ksc5601    . #x6168)       ; �����
+    (ideograph-daikanwa . 35266)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8A1F)       ; 訟
@@ -1678,9 +1678,9 @@
     (total-strokes      . 12)
     (shinjigen-1       . 7592)
     (shinjigen-2       . 7592)
-    (japanese-jisx0208-1978    . #x4370)       ; �����
-    (korean-ksc5601            . #x7149)       ; �����
-    (ideograph-daikanwa                . 35340)        ; �����
+    (=jis-x0208-1978   . #x4370)       ; �����
+    (korean-ksc5601    . #x7149)       ; �����
+    (ideograph-daikanwa . 35340)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8A3B)       ; 註
@@ -2852,9 +2852,9 @@
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 6)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x4127)       ; �����
-    (korean-ksc5601            . #x6F2C)       ; �����
-    (ideograph-daikanwa                . 35435)        ; �����
+    (=jis-x0208-1978   . #x4127)       ; �����
+    (korean-ksc5601    . #x6F2C)       ; �����
+    (ideograph-daikanwa . 35435)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8A6E)       ; 詮
@@ -4832,8 +4832,8 @@
     (total-strokes      . 15)
     (shinjigen-1       . 7681)
     (shinjigen-2       . 7681)
-    (japanese-jisx0208-1978    . #x4870)       ; �����
-    (japanese-jisx0208         . #x4870)       ; �����
+    (=jis-x0208-1978   . #x4870)       ; �����
+    (japanese-jisx0208 . #x4870)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        35601 0 1)
@@ -5257,12 +5257,12 @@
   '((ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 8)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x6B5D)       ; �����
-    (japanese-jisx0208         . #x3452)       ; �����
-    (chinese-cns11643-3                . #x4E69)       ; �����
-    (=jis-x0208-1990           . #x3452)       ; �����
-    (ideograph-daikanwa                . 35642)        ; �����
-    (=ucs                      . #x8ACC)       ; 諌
+    (=jis-x0208-1978   . #x6B5D)       ; �����
+    (japanese-jisx0208 . #x3452)       ; �����
+    (chinese-cns11643-3 . #x4E69)      ; �����
+    (=jis-x0208-1990   . #x3452)       ; �����
+    (ideograph-daikanwa . 35642)       ; �����
+    (=ucs              . #x8ACC)       ; 諌
     ))
 (define-char
   '((=>ucs             . #x8ACD)       ; 諍
@@ -5704,9 +5704,9 @@
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 8)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4342)       ; �����
-    (japanese-jisx0208         . #x4342)       ; �����
-    (korean-ksc5601            . #x772B)       ; �����
+    (=jis-x0208-1978   . #x4342)       ; �����
+    (japanese-jisx0208 . #x4342)       ; �����
+    (korean-ksc5601    . #x772B)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8A95)       ; 誕
@@ -6052,8 +6052,8 @@
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 9)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x6B66)       ; �����
-    (ideograph-daikanwa                . 35703)        ; �����
+    (=jis-x0208-1978   . #x6B66)       ; �����
+    (ideograph-daikanwa . 35703)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8ADE)       ; 諞
@@ -6286,14 +6286,14 @@
     (ideographic-strokes . 9)
     (total-strokes      . 16)
     (shinjigen-2       . 7688)
-    (japanese-jisx0208-1978    . #x3452)       ; �����
-    (japanese-jisx0208         . #x6B5D)       ; �����
-    (korean-ksc5601            . #x4A5F)       ; �����
-    (chinese-cns11643-1                . #x7239)       ; �����
-    (=jis-x0208-1990           . #x6B5D)       ; �����
-    (chinese-gb12345           . #x5A49)       ; 諫
-    (ideograph-daikanwa                . 35724)        ; �����
-    (=ucs                      . #x8AEB)       ; 諫
+    (=jis-x0208-1978   . #x3452)       ; �����
+    (japanese-jisx0208 . #x6B5D)       ; �����
+    (korean-ksc5601    . #x4A5F)       ; �����
+    (chinese-cns11643-1 . #x7239)      ; �����
+    (=jis-x0208-1990   . #x6B5D)       ; �����
+    (chinese-gb12345   . #x5A49)       ; 諫
+    (ideograph-daikanwa . 35724)       ; �����
+    (=ucs              . #x8AEB)       ; 諫
     ))
 (define-char
   '((=>ucs             . #x27A72)      ; 𧩲
@@ -6631,9 +6631,9 @@
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 9)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x3841)       ; �����
-    (korean-ksc5601            . #x656C)       ; �����
-    (ideograph-daikanwa                . 35747)        ; �����
+    (=jis-x0208-1978   . #x3841)       ; �����
+    (korean-ksc5601    . #x656C)       ; �����
+    (ideograph-daikanwa . 35747)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8AFA)       ; 諺
@@ -7368,9 +7368,9 @@
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 10)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x4666)       ; �����
-    (korean-ksc5601            . #x5A3A)       ; �����
-    (ideograph-daikanwa                . 35800)        ; �����
+    (=jis-x0208-1978   . #x4666)       ; �����
+    (korean-ksc5601    . #x5A3A)       ; �����
+    (ideograph-daikanwa . 35800)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8B0E)       ; 謎
@@ -7710,10 +7710,10 @@
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 10)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x3C55)       ; �����
-    (japanese-jisx0208         . #x3C55)       ; �����
-    (chinese-gb12345           . #x503B)       ; 謝
-    (=ucs                      . #x8B1D)       ; 謝
+    (=jis-x0208-1978   . #x3C55)       ; �����
+    (japanese-jisx0208 . #x3C55)       ; �����
+    (chinese-gb12345   . #x503B)       ; 謝
+    (=ucs              . #x8B1D)       ; 謝
     ))
 (define-char
   '((ideographic-radical . 149)        ; ⾔
@@ -8257,9 +8257,9 @@
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 11)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x4935)       ; �����
-    (korean-ksc5601            . #x573D)       ; �����
-    (ideograph-daikanwa                . 35872)        ; �����
+    (=jis-x0208-1978   . #x4935)       ; �����
+    (korean-ksc5601    . #x573D)       ; �����
+    (ideograph-daikanwa . 35872)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8B2C)       ; 謬
@@ -8947,7 +8947,7 @@
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 11)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x6B76)       ; �����
+    (=jis-x0208-1978   . #x6B76)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        35928 0 2)

diff --git a/lisp/utf-2000/Ideograph-R152-Pig.el b/lisp/utf-2000/Ideograph-R152-Pig.el
index fa2b9da..e1f4c3a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R152-Pig.el
+++ b/lisp/utf-2000/Ideograph-R152-Pig.el
@@ -18,9 +18,9 @@
     (ideographic-radical . 152)        ; ⾗
     (ideographic-strokes . 0)
     (total-strokes      . 7)
-    (japanese-jisx0208-1978    . #x6C35)       ; �����
-    (japanese-jisx0208         . #x6C35)       ; �����
-    (chinese-cns11643-1                . #x4B49)       ; �����
+    (=jis-x0208-1978   . #x6C35)       ; �����
+    (japanese-jisx0208 . #x6C35)       ; �����
+    (chinese-cns11643-1 . #x4B49)      ; �����
     ))
 (define-char
   '((morohashi-daikanwa        36334 0 1)

diff --git a/lisp/utf-2000/Ideograph-R154-Shell.el b/lisp/utf-2000/Ideograph-R154-Shell.el
index c01bb2f..e8e3eb5 100644 (file)
--- a/lisp/utf-2000/Ideograph-R154-Shell.el
+++ b/lisp/utf-2000/Ideograph-R154-Shell.el
@@ -300,10 +300,10 @@
     (ideographic-strokes . 4)
     (total-strokes      . 11)
     (shinjigen-1       . 7868)
-    (japanese-jisx0208-1978    . #x494F)       ; �����
-    (japanese-jisx0208         . #x494F)       ; �����
-    (korean-ksc5601            . #x5E38)       ; �����
-    (ideograph-daikanwa                . 36677)        ; �����
+    (=jis-x0208-1978   . #x494F)       ; �����
+    (japanese-jisx0208 . #x494F)       ; �����
+    (korean-ksc5601    . #x5E38)       ; �����
+    (ideograph-daikanwa . 36677)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        36677 0 0)
@@ -404,10 +404,10 @@
     (ideographic-radical . 154)        ; ⾙
     (ideographic-strokes . 4)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x3453)       ; �����
-    (japanese-jisx0208         . #x3453)       ; �����
-    (korean-ksc5601            . #x4E3B)       ; �����
-    (chinese-cns11643-1                . #x5D4B)       ; �����
+    (=jis-x0208-1978   . #x3453)       ; �����
+    (japanese-jisx0208 . #x3453)       ; �����
+    (korean-ksc5601    . #x4E3B)       ; �����
+    (chinese-cns11643-1 . #x5D4B)      ; �����
     ))
 (define-char
   '((ideographic-radical . 154)        ; ⾙
@@ -1553,10 +1553,10 @@
   '((ideographic-radical . 154)        ; ⾙
     (ideographic-strokes . 6)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x6C4D)       ; �����
-    (japanese-jisx0208         . #x4128)       ; �����
-    (=jis-x0208-1990           . #x4128)       ; �����
-    (=ucs                      . #x8CCE)       ; 賎
+    (=jis-x0208-1978   . #x6C4D)       ; �����
+    (japanese-jisx0208 . #x4128)       ; �����
+    (=jis-x0208-1990   . #x4128)       ; �����
+    (=ucs              . #x8CCE)       ; 賎
     ))
 (define-char
   '((ideographic-radical . 154)        ; ⾙
@@ -2237,14 +2237,14 @@
     (ideographic-strokes . 8)
     (total-strokes      . 15)
     (shinjigen-2       . 7903)
-    (japanese-jisx0208-1978    . #x4128)       ; �����
-    (japanese-jisx0208         . #x6C4D)       ; �����
-    (korean-ksc5601            . #x7441)       ; �����
-    (chinese-cns11643-1                . #x6F2D)       ; �����
-    (=jis-x0208-1990           . #x6C4D)       ; �����
-    (chinese-gb12345           . #x3C7A)       ; 賤
-    (ideograph-daikanwa                . 36826)        ; �����
-    (=ucs                      . #x8CE4)       ; 賤
+    (=jis-x0208-1978   . #x4128)       ; �����
+    (japanese-jisx0208 . #x6C4D)       ; �����
+    (korean-ksc5601    . #x7441)       ; �����
+    (chinese-cns11643-1 . #x6F2D)      ; �����
+    (=jis-x0208-1990   . #x6C4D)       ; �����
+    (chinese-gb12345   . #x3C7A)       ; 賤
+    (ideograph-daikanwa . 36826)       ; �����
+    (=ucs              . #x8CE4)       ; 賤
     ))
 (define-char
   '((ideographic-radical . 154)        ; ⾙
@@ -2565,9 +2565,9 @@
     (ideographic-radical . 154)        ; ⾙
     (ideographic-strokes . 9)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4552)       ; �����
-    (korean-ksc5601            . #x542E)       ; �����
-    (ideograph-daikanwa                . 36847)        ; �����
+    (=jis-x0208-1978   . #x4552)       ; �����
+    (korean-ksc5601    . #x542E)       ; �����
+    (ideograph-daikanwa . 36847)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        36847 0 2)
@@ -2988,10 +2988,10 @@
     (ideographic-radical . 154)        ; ⾙
     (ideographic-strokes . 10)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x3958)       ; �����
-    (japanese-jisx0208         . #x3958)       ; �����
-    (chinese-gb12345           . #x393A)       ; 購
-    (=ucs                      . #x8CFC)       ; 購
+    (=jis-x0208-1978   . #x3958)       ; �����
+    (japanese-jisx0208 . #x3958)       ; �����
+    (chinese-gb12345   . #x393A)       ; 購
+    (=ucs              . #x8CFC)       ; 購
     ))
 (define-char
   '((=>ucs             . #x8CFC)       ; 購
@@ -3277,12 +3277,12 @@
     (ideographic-radical . 154)        ; ⾙
     (ideographic-strokes . 11)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x6C54)       ; �����
-    (japanese-jisx0208         . #x6C54)       ; �����
-    (korean-ksc5601            . #x7621)       ; �����
-    (chinese-cns11643-1                . #x7743)       ; �����
-    (chinese-gb12345           . #x5738)       ; 贅
-    (=ucs                      . #x8D05)       ; 贅
+    (=jis-x0208-1978   . #x6C54)       ; �����
+    (japanese-jisx0208 . #x6C54)       ; �����
+    (korean-ksc5601    . #x7621)       ; �����
+    (chinese-cns11643-1 . #x7743)      ; �����
+    (chinese-gb12345   . #x5738)       ; 贅
+    (=ucs              . #x8D05)       ; 贅
     ))
 (define-char
   '((ideographic-radical . 154)        ; ⾙
@@ -3777,10 +3777,10 @@
     (ideographic-radical . 154)        ; ⾙
     (ideographic-strokes . 13)
     (total-strokes      . 20)
-    (japanese-jisx0208-1978    . #x6C57)       ; �����
-    (japanese-jisx0208         . #x6C57)       ; �����
-    (chinese-gb12345           . #x532E)       ; 贏
-    (=ucs                      . #x8D0F)       ; 贏
+    (=jis-x0208-1978   . #x6C57)       ; �����
+    (japanese-jisx0208 . #x6C57)       ; �����
+    (chinese-gb12345   . #x532E)       ; 贏
+    (=ucs              . #x8D0F)       ; 贏
     ))
 (define-char
   '((=>ucs             . #x8D0F)       ; 贏

diff --git a/lisp/utf-2000/Ideograph-R157-Foot.el b/lisp/utf-2000/Ideograph-R157-Foot.el
index 6460371..2aa754b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R157-Foot.el
+++ b/lisp/utf-2000/Ideograph-R157-Foot.el
@@ -1011,11 +1011,11 @@
   '((ideographic-radical . 157)        ; ⾜
     (ideographic-strokes . 5)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x6C69)       ; �����
-    (chinese-gb2312            . #x7547)       ; �����
-    (=iso-ir165                        . #x7547)       ; �����
-    (ideograph-daikanwa                . 37477)        ; �����
-    (=ucs                      . #x8DDA)       ; 跚
+    (=jis-x0208-1978   . #x6C69)       ; �����
+    (chinese-gb2312    . #x7547)       ; �����
+    (=iso-ir165                . #x7547)       ; �����
+    (ideograph-daikanwa . 37477)       ; �����
+    (=ucs              . #x8DDA)       ; 跚
     ))
 (define-char
   '((=>ucs             . #x8DDA)       ; 跚
@@ -1518,9 +1518,9 @@
     (ideographic-strokes . 6)
     (total-strokes      . 13)
     (shinjigen-2       . 8008)
-    (japanese-jisx0208-1978    . #x4437)       ; �����
-    (japanese-jisx0208         . #x4437)       ; �����
-    (ideograph-daikanwa                . 37533)        ; �����
+    (=jis-x0208-1978   . #x4437)       ; �����
+    (japanese-jisx0208 . #x4437)       ; �����
+    (ideograph-daikanwa . 37533)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        37533 0 0)
@@ -2048,7 +2048,7 @@
     (ideographic-radical . 157)        ; ⾜
     (ideographic-strokes . 7)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x6C74)       ; �����
+    (=jis-x0208-1978   . #x6C74)       ; �����
     ))
 (define-char
   '((ideographic-radical . 157)        ; ⾜
@@ -5867,9 +5867,9 @@
     (ideographic-strokes . 15)
     (total-strokes      . 22)
     (shinjigen-2       . 8088)
-    (japanese-jisx0208-1978    . #x6D36)       ; �����
-    (japanese-jisx0208         . #x6D36)       ; �����
-    (ideograph-daikanwa                . 37963)        ; �����
+    (=jis-x0208-1978   . #x6D36)       ; �����
+    (japanese-jisx0208 . #x6D36)       ; �����
+    (ideograph-daikanwa . 37963)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8E91)       ; 躑
@@ -6347,9 +6347,9 @@
     (ideographic-strokes . 18)
     (total-strokes      . 25)
     (shinjigen-2       . 8095)
-    (japanese-jisx0208-1978    . #x6D3A)       ; �����
-    (japanese-jisx0208         . #x6D3A)       ; �����
-    (ideograph-daikanwa                . 38009)        ; �����
+    (=jis-x0208-1978   . #x6D3A)       ; �����
+    (japanese-jisx0208 . #x6D3A)       ; �����
+    (ideograph-daikanwa . 38009)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8EA1)       ; 躡

diff --git a/lisp/utf-2000/Ideograph-R158-Body.el b/lisp/utf-2000/Ideograph-R158-Body.el
index d6cc62f..78b62e9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R158-Body.el
+++ b/lisp/utf-2000/Ideograph-R158-Body.el
@@ -782,12 +782,12 @@
     (ideographic-radical . 158)        ; ⾝
     (ideographic-strokes . 11)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x366D)       ; �����
-    (korean-ksc5601            . #x4F46)       ; �����
-    (japanese-jisx0212         . #x6054)       ; �����
-    (=jis-x0213-1-2000         . #x7C4A)       ; �����
-    (ideograph-daikanwa                . 38137)        ; �����
-    (=ucs@jis                  . #x8EC0)       ; �����
+    (=jis-x0208-1978   . #x366D)       ; �����
+    (korean-ksc5601    . #x4F46)       ; �����
+    (japanese-jisx0212 . #x6054)       ; �����
+    (=jis-x0213-1-2000 . #x7C4A)       ; �����
+    (ideograph-daikanwa . 38137)       ; �����
+    (=ucs@jis          . #x8EC0)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8EC0)       ; 軀

diff --git a/lisp/utf-2000/Ideograph-R159-Cart.el b/lisp/utf-2000/Ideograph-R159-Cart.el
index 77689f4..b7e1ec6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R159-Cart.el
+++ b/lisp/utf-2000/Ideograph-R159-Cart.el
@@ -1672,7 +1672,7 @@
     (ideographic-radical . 159)        ; ⾞
     (ideographic-strokes . 8)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x6D4E)       ; �����
+    (=jis-x0208-1978   . #x6D4E)       ; �����
     ))
 (define-char
   '((ideographic-radical . 159)        ; ⾞
@@ -2235,9 +2235,9 @@
     (ideographic-strokes . 8)
     (total-strokes      . 15)
     (shinjigen-2       . 8154)
-    (japanese-jisx0208-1978    . #x475A)       ; �����
-    (japanese-jisx0208         . #x475A)       ; �����
-    (ideograph-daikanwa                . 38398)        ; �����
+    (=jis-x0208-1978   . #x475A)       ; �����
+    (japanese-jisx0208 . #x475A)       ; �����
+    (ideograph-daikanwa . 38398)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8F29)       ; 輩
@@ -2495,11 +2495,11 @@
     (ideographic-strokes . 9)
     (total-strokes      . 16)
     (shinjigen-2       . 8163)
-    (japanese-jisx0208-1978    . #x3D34)       ; �����
-    (japanese-jisx0208         . #x3D34)       ; �����
-    (korean-ksc5601            . #x727E)       ; �����
-    (chinese-gb12345           . #x3C2D)       ; 輯
-    (=ucs                      . #x8F2F)       ; 輯
+    (=jis-x0208-1978   . #x3D34)       ; �����
+    (japanese-jisx0208 . #x3D34)       ; �����
+    (korean-ksc5601    . #x727E)       ; �����
+    (chinese-gb12345   . #x3C2D)       ; 輯
+    (=ucs              . #x8F2F)       ; 輯
     ))
 (define-char
   '((=>ucs             . #x8F2F)       ; 輯

diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el
index 0daa932..a42d180 100644 (file)
--- a/lisp/utf-2000/Ideograph-R162-Walk.el
+++ b/lisp/utf-2000/Ideograph-R162-Walk.el
@@ -179,8 +179,8 @@
     (jisx0208-type     . 78/4-)
     (shinjigen-1       . 8212)
     (shinjigen-2       . 8212)
-    (japanese-jisx0208-1978    . #x4454)       ; �����
-    (ideograph-daikanwa                . 38711)        ; �����
+    (=jis-x0208-1978   . #x4454)       ; �����
+    (ideograph-daikanwa . 38711)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        38711 0 3)
@@ -303,8 +303,8 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 3)
     (total-strokes      . 7)
-    (japanese-jisx0208-1978    . #x4329)       ; �����
-    (ideograph-daikanwa                . 38718)        ; �����
+    (=jis-x0208-1978   . #x4329)       ; �����
+    (ideograph-daikanwa . 38718)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8FBF)       ; 辿
@@ -387,9 +387,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 3)
     (total-strokes      . 7)
-    (japanese-jisx0208-1978    . #x312A)       ; �����
-    (korean-ksc5601            . #x6966)       ; �����
-    (ideograph-daikanwa                . 38722)        ; �����
+    (=jis-x0208-1978   . #x312A)       ; �����
+    (korean-ksc5601    . #x6966)       ; �����
+    (ideograph-daikanwa . 38722)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8FC2)       ; 迂
@@ -431,8 +431,8 @@
     (ideographic-strokes . 3)
     (total-strokes      . 7)
     (jisx0208-type     . 78/4-)
-    (japanese-jisx0208-1978    . #x4B78)       ; �����
-    (ideograph-daikanwa                . 38724)        ; �����
+    (=jis-x0208-1978   . #x4B78)       ; �����
+    (ideograph-daikanwa . 38724)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8FC4)       ; 迄
@@ -1597,9 +1597,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 5)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x3260)       ; �����
-    (korean-ksc5601            . #x4A3C)       ; �����
-    (ideograph-daikanwa                . 38789)        ; �����
+    (=jis-x0208-1978   . #x3260)       ; �����
+    (korean-ksc5601    . #x4A3C)       ; �����
+    (ideograph-daikanwa . 38789)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8FE6)       ; 迦
@@ -1698,8 +1698,8 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 5)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x6D6E)       ; �����
-    (ideograph-daikanwa                . 38793)        ; �����
+    (=jis-x0208-1978   . #x6D6E)       ; �����
+    (ideograph-daikanwa . 38793)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8FE9)       ; 迩
@@ -1748,9 +1748,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 5)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x6D6C)       ; �����
-    (korean-ksc5601            . #x6E68)       ; �����
-    (ideograph-daikanwa                . 38795)        ; �����
+    (=jis-x0208-1978   . #x6D6C)       ; �����
+    (korean-ksc5601    . #x6E68)       ; �����
+    (ideograph-daikanwa . 38795)       ; �����
     ))
 (define-char
   '((=>ucs             . #x8FEA)       ; 迪
@@ -2644,8 +2644,8 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 6)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x4628)       ; �����
-    (japanese-jisx0208         . #x4628)       ; �����
+    (=jis-x0208-1978   . #x4628)       ; �����
+    (japanese-jisx0208 . #x4628)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        38845 1 0)
@@ -3143,9 +3143,9 @@
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (shinjigen-2       . 8327)
-    (japanese-jisx0208-1978    . #x6E25)       ; �����
-    (japanese-jisx0208         . #x6E25)       ; �����
-    (ideograph-daikanwa                . 38874)        ; �����
+    (=jis-x0208-1978   . #x6E25)       ; �����
+    (japanese-jisx0208 . #x6E25)       ; �����
+    (ideograph-daikanwa . 38874)       ; �����
     ))
 (define-char
   '((=>ucs             . #x900E)       ; 逎
@@ -3443,9 +3443,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x3F60)       ; �����
-    (korean-ksc5601            . #x5468)       ; �����
-    (ideograph-daikanwa                . 38887)        ; �����
+    (=jis-x0208-1978   . #x3F60)       ; �����
+    (korean-ksc5601    . #x5468)       ; �����
+    (ideograph-daikanwa . 38887)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9017)       ; 逗
@@ -3488,9 +3488,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x4767)       ; �����
-    (korean-ksc5601            . #x6E4F)       ; �����
-    (ideograph-daikanwa                . 38889)        ; �����
+    (=jis-x0208-1978   . #x4767)       ; �����
+    (korean-ksc5601    . #x6E4F)       ; �����
+    (ideograph-daikanwa . 38889)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9019)       ; 這
@@ -3612,9 +3612,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x4042)       ; �����
-    (korean-ksc5601            . #x6026)       ; �����
-    (ideograph-daikanwa                . 38895)        ; �����
+    (=jis-x0208-1978   . #x4042)       ; �����
+    (korean-ksc5601    . #x6026)       ; �����
+    (ideograph-daikanwa . 38895)       ; �����
     ))
 (define-char
   '((=>ucs             . #x901D)       ; 逝
@@ -3765,9 +3765,9 @@
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (jisx0208-type     . 78/4-)
-    (japanese-jisx0208-1978    . #x3029)       ; �����
-    (korean-ksc5601            . #x5C71)       ; �����
-    (ideograph-daikanwa                . 38901)        ; �����
+    (=jis-x0208-1978   . #x3029)       ; �����
+    (korean-ksc5601    . #x5C71)       ; �����
+    (ideograph-daikanwa . 38901)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9022)       ; 逢
@@ -4942,9 +4942,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x492F)       ; �����
-    (korean-ksc5601            . #x793A)       ; �����
-    (ideograph-daikanwa                . 38973)        ; �����
+    (=jis-x0208-1978   . #x492F)       ; �����
+    (korean-ksc5601    . #x793A)       ; �����
+    (ideograph-daikanwa . 38973)       ; �����
     ))
 (define-char
   '((=>ucs             . #x903C)       ; 逼
@@ -5099,9 +5099,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x465B)       ; �����
-    (korean-ksc5601            . #x546D)       ; �����
-    (ideograph-daikanwa                . 38982)        ; �����
+    (=jis-x0208-1978   . #x465B)       ; �����
+    (korean-ksc5601    . #x546D)       ; �����
+    (ideograph-daikanwa . 38982)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9041)       ; 遁
@@ -5177,8 +5177,8 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x3F6B)       ; �����
-    (japanese-jisx0208         . #x3F6B)       ; �����
+    (=jis-x0208-1978   . #x3F6B)       ; �����
+    (japanese-jisx0208 . #x3F6B)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        38985 1 0)
@@ -5684,9 +5684,9 @@
     (total-strokes      . 13)
     (shinjigen-1       . 8326)
     (shinjigen-2       . 8326)
-    (japanese-jisx0208-1978    . #x6E24)       ; �����
-    (japanese-jisx0208         . #x6E24)       ; �����
-    (ideograph-daikanwa                . 39008)        ; �����
+    (=jis-x0208-1978   . #x6E24)       ; �����
+    (japanese-jisx0208 . #x6E24)       ; �����
+    (ideograph-daikanwa . 39008)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9052)       ; 遒
@@ -6040,8 +6040,8 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x6E29)       ; �����
-    (ideograph-daikanwa                . 39031)        ; �����
+    (=jis-x0208-1978   . #x6E29)       ; �����
+    (ideograph-daikanwa . 39031)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9058)       ; 遘
@@ -6117,14 +6117,14 @@
     (ideographic-strokes . 10)
     (total-strokes      . 14)
     (shinjigen-2       . 8352)
-    (japanese-jisx0208-1978    . #x4D5A)       ; �����
-    (japanese-jisx0208         . #x7423)       ; �����
-    (korean-ksc5601            . #x692B)       ; �����
-    (=jis-x0208-1990           . #x7423)       ; �����
-    (=gt-pj-1                  . #x7423)       ; �����
-    (ideograph-daikanwa                . 39035)        ; �����
-    (=gt-k                     . 11244)        ; ������
-    (=ucs@jis                  . #x9059)       ; �����
+    (=jis-x0208-1978   . #x4D5A)       ; �����
+    (japanese-jisx0208 . #x7423)       ; �����
+    (korean-ksc5601    . #x692B)       ; �����
+    (=jis-x0208-1990   . #x7423)       ; �����
+    (=gt-pj-1          . #x7423)       ; �����
+    (ideograph-daikanwa . 39035)       ; �����
+    (=gt-k             . 11244)        ; ������
+    (=ucs@jis          . #x9059)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39035 0 2)
@@ -6180,9 +6180,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x423D)       ; �����
-    (korean-ksc5601            . #x6161)       ; �����
-    (ideograph-daikanwa                . 39038)        ; �����
+    (=jis-x0208-1978   . #x423D)       ; �����
+    (korean-ksc5601    . #x6161)       ; �����
+    (ideograph-daikanwa . 39038)       ; �����
     ))
 (define-char
   '((=>ucs             . #x905C)       ; 遜
@@ -6377,9 +6377,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x414C)       ; �����
-    (korean-ksc5601            . #x614F)       ; �����
-    (ideograph-daikanwa                . 39048)        ; �����
+    (=jis-x0208-1978   . #x414C)       ; �����
+    (korean-ksc5601    . #x614F)       ; �����
+    (ideograph-daikanwa . 39048)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9061)       ; 遡
@@ -6589,8 +6589,8 @@
     (total-strokes      . 13)
     (shinjigen-1       . 8353)
     (shinjigen-2       . 8354)
-    (japanese-jisx0208-1978    . #x3063)       ; �����
-    (japanese-jisx0208         . #x3063)       ; �����
+    (=jis-x0208-1978   . #x3063)       ; �����
+    (japanese-jisx0208 . #x3063)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9055)       ; 違
@@ -6952,9 +6952,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 11)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x3C57)       ; �����
-    (korean-ksc5601            . #x7334)       ; �����
-    (ideograph-daikanwa                . 39086)        ; �����
+    (=jis-x0208-1978   . #x3C57)       ; �����
+    (korean-ksc5601    . #x7334)       ; �����
+    (ideograph-daikanwa . 39086)       ; �����
     ))
 (define-char
   '((=>ucs             . #x906E)       ; 遮
@@ -7768,9 +7768,9 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 12)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x4E4B)       ; �����
-    (korean-ksc5601            . #x5721)       ; �����
-    (ideograph-daikanwa                . 39137)        ; �����
+    (=jis-x0208-1978   . #x4E4B)       ; �����
+    (korean-ksc5601    . #x5721)       ; �����
+    (ideograph-daikanwa . 39137)       ; �����
     ))
 (define-char
   '((=>ucs             . #x907C)       ; 遼
@@ -8666,12 +8666,12 @@
     (total-strokes      . 18)
     (shinjigen-1       . 8399)
     (shinjigen-2       . 8399)
-    (japanese-jisx0208-1978    . #x4676)       ; �����
-    (japanese-jisx0208         . #x6D6E)       ; �����
-    (korean-ksc5601            . #x6C44)       ; �����
-    (=jis-x0208-1990           . #x6D6E)       ; �����
-    (ideograph-daikanwa                . 39193)        ; �����
-    (=ucs@jis                  . #x9087)       ; �����
+    (=jis-x0208-1978   . #x4676)       ; �����
+    (japanese-jisx0208 . #x6D6E)       ; �����
+    (korean-ksc5601    . #x6C44)       ; �����
+    (=jis-x0208-1990   . #x6D6E)       ; �����
+    (ideograph-daikanwa . 39193)       ; �����
+    (=ucs@jis          . #x9087)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9087)       ; 邇
@@ -8970,7 +8970,7 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 13)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x6E35)       ; �����
+    (=jis-x0208-1978   . #x6E35)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9089)       ; 邉

diff --git a/lisp/utf-2000/Ideograph-R163-City.el b/lisp/utf-2000/Ideograph-R163-City.el
index d7d7e07..3ed200a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R163-City.el
+++ b/lisp/utf-2000/Ideograph-R163-City.el
@@ -391,9 +391,9 @@
     (ideographic-radical . 163)        ; ⾢
     (ideographic-strokes . 4)
     (total-strokes      . 7)
-    (japanese-jisx0208-1978    . #x4661)       ; �����
-    (korean-ksc5601            . #x5161)       ; �����
-    (ideograph-daikanwa                . 39305)        ; �����
+    (=jis-x0208-1978   . #x4661)       ; �����
+    (korean-ksc5601    . #x5161)       ; �����
+    (ideograph-daikanwa . 39305)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39305 0 1)
@@ -959,8 +959,8 @@
     (ideographic-radical . 163)        ; ⾢
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x3C59)       ; �����
-    (japanese-jisx0208         . #x3C59)       ; �����
+    (=jis-x0208-1978   . #x3C59)       ; �����
+    (japanese-jisx0208 . #x3C59)       ; �����
     ))
 (define-char
   '((=>ucs             . #x90AA)       ; 邪
@@ -3913,9 +3913,9 @@
     (ideographic-radical . 163)        ; ⾢
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4522)       ; �����
-    (korean-ksc5601            . #x6F77)       ; �����
-    (ideograph-daikanwa                . 39647)        ; �����
+    (=jis-x0208-1978   . #x4522)       ; �����
+    (korean-ksc5601    . #x6F77)       ; �����
+    (ideograph-daikanwa . 39647)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39647 0 2)
@@ -4022,9 +4022,9 @@
     (ideographic-strokes . 12)
     (total-strokes      . 15)
     (shinjigen-2       . 8934)
-    (japanese-jisx0208-1978    . #x6E43)       ; �����
-    (japanese-jisx0208         . #x6E43)       ; �����
-    (ideograph-daikanwa                . 39656)        ; �����
+    (=jis-x0208-1978   . #x6E43)       ; �����
+    (japanese-jisx0208 . #x6E43)       ; �����
+    (ideograph-daikanwa . 39656)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39656 0 0)

diff --git a/lisp/utf-2000/Ideograph-R164-Wine.el b/lisp/utf-2000/Ideograph-R164-Wine.el
index 0014fc5..4e84faa 100644 (file)
--- a/lisp/utf-2000/Ideograph-R164-Wine.el
+++ b/lisp/utf-2000/Ideograph-R164-Wine.el
@@ -31,9 +31,9 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 2)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x3D36)       ; �����
-    (korean-ksc5601            . #x755C)       ; �����
-    (ideograph-daikanwa                . 39765)        ; �����
+    (=jis-x0208-1978   . #x3D36)       ; �����
+    (korean-ksc5601    . #x755C)       ; �����
+    (ideograph-daikanwa . 39765)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39765 0 2)
@@ -281,10 +281,10 @@
     (ideographic-strokes . 4)
     (total-strokes      . 11)
     (shinjigen-2       . 8503)
-    (japanese-jisx0208-1978    . #x6E45)       ; �����
-    (japanese-jisx0208         . #x6E45)       ; �����
-    (chinese-cns11643-2                . #x3975)       ; �����
-    (ideograph-daikanwa                . 39792)        ; �����
+    (=jis-x0208-1978   . #x6E45)       ; �����
+    (japanese-jisx0208 . #x6E45)       ; �����
+    (chinese-cns11643-2 . #x3975)      ; �����
+    (ideograph-daikanwa . 39792)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39792 0 0)
@@ -343,10 +343,10 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 4)
     (total-strokes      . 11)
-    (japanese-jisx0208-1978    . #x6E46)       ; �����
-    (japanese-jisx0208         . #x6E46)       ; �����
-    (chinese-cns11643-2                . #x3976)       ; �����
-    (ideograph-daikanwa                . 39797)        ; �����
+    (=jis-x0208-1978   . #x6E46)       ; �����
+    (japanese-jisx0208 . #x6E46)       ; �����
+    (chinese-cns11643-2 . #x3976)      ; �����
+    (ideograph-daikanwa . 39797)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39797 0 0)
@@ -727,10 +727,10 @@
     (ideographic-strokes . 5)
     (total-strokes      . 12)
     (shinjigen-2       . 8508)
-    (japanese-jisx0208-1978    . #x6E48)       ; �����
-    (japanese-jisx0208         . #x6E48)       ; �����
-    (chinese-cns11643-1                . #x6257)       ; �����
-    (ideograph-daikanwa                . 39835)        ; �����
+    (=jis-x0208-1978   . #x6E48)       ; �����
+    (japanese-jisx0208 . #x6E48)       ; �����
+    (chinese-cns11643-1 . #x6257)      ; �����
+    (ideograph-daikanwa . 39835)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39835 0 0)
@@ -1033,11 +1033,11 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 7)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x6E4B)       ; �����
-    (chinese-gb2312            . #x7528)       ; �����
-    (japanese-jisx0208         . #x6E4B)       ; �����
-    (=iso-ir165                        . #x7528)       ; �����
-    (=ucs                      . #x9172)       ; 酲
+    (=jis-x0208-1978   . #x6E4B)       ; �����
+    (chinese-gb2312    . #x7528)       ; �����
+    (japanese-jisx0208 . #x6E4B)       ; �����
+    (=iso-ir165                . #x7528)       ; �����
+    (=ucs              . #x9172)       ; 酲
     ))
 (define-char
   '((=>ucs             . #x9173)       ; 酳
@@ -1045,9 +1045,9 @@
     (ideographic-strokes . 7)
     (total-strokes      . 14)
     (shinjigen-2       . 8516)
-    (japanese-jisx0208-1978    . #x6E4A)       ; �����
-    (japanese-jisx0208         . #x6E4A)       ; �����
-    (ideograph-daikanwa                . 39866)        ; �����
+    (=jis-x0208-1978   . #x6E4A)       ; �����
+    (japanese-jisx0208 . #x6E4A)       ; �����
+    (ideograph-daikanwa . 39866)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39866 0 0)
@@ -2154,10 +2154,10 @@
     (ideographic-strokes . 10)
     (total-strokes      . 17)
     (shinjigen-2       . 8536)
-    (japanese-jisx0208-1978    . #x6E4F)       ; �����
-    (japanese-jisx0208         . #x6E4F)       ; �����
-    (chinese-cns11643-2                . #x5F72)       ; �����
-    (ideograph-daikanwa                . 39981)        ; �����
+    (=jis-x0208-1978   . #x6E4F)       ; �����
+    (japanese-jisx0208 . #x6E4F)       ; �����
+    (chinese-cns11643-2 . #x5F72)      ; �����
+    (ideograph-daikanwa . 39981)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        39981 0 0)
@@ -2379,12 +2379,12 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 11)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x6E52)       ; �����
-    (chinese-gb2312            . #x7532)       ; �����
-    (japanese-jisx0208         . #x6E52)       ; �����
-    (=iso-ir165                        . #x7532)       ; �����
-    (chinese-cns11643-2                . #x637C)       ; �����
-    (=ucs                      . #x91AA)       ; 醪
+    (=jis-x0208-1978   . #x6E52)       ; �����
+    (chinese-gb2312    . #x7532)       ; �����
+    (japanese-jisx0208 . #x6E52)       ; �����
+    (=iso-ir165                . #x7532)       ; �����
+    (chinese-cns11643-2 . #x637C)      ; �����
+    (=ucs              . #x91AA)       ; 醪
     ))
 (define-char
   '((ideographic-radical . 164)        ; ⾣
@@ -2460,13 +2460,13 @@
   '((ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 11)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x3E5F)       ; �����
-    (korean-ksc5601            . #x6D7D)       ; �����
-    (japanese-jisx0212         . #x6273)       ; �����
-    (=jis-x0213-1-2000         . #x7C79)       ; �����
-    (chinese-gb12345           . #x3D34)       ; 醬
-    (ideograph-daikanwa                . 40011)        ; �����
-    (=ucs                      . #x91AC)       ; 醬
+    (=jis-x0208-1978   . #x3E5F)       ; �����
+    (korean-ksc5601    . #x6D7D)       ; �����
+    (japanese-jisx0212 . #x6273)       ; �����
+    (=jis-x0213-1-2000 . #x7C79)       ; �����
+    (chinese-gb12345   . #x3D34)       ; 醬
+    (ideograph-daikanwa . 40011)       ; �����
+    (=ucs              . #x91AC)       ; 醬
     ))
 (define-char
   '((=>ucs             . #x91AC)       ; 醬
@@ -2682,10 +2682,10 @@
     (ideographic-strokes . 12)
     (total-strokes      . 19)
     (shinjigen-2       . 8540)
-    (japanese-jisx0208-1978    . #x6E51)       ; �����
-    (japanese-jisx0208         . #x6E51)       ; �����
-    (korean-ksc5601            . #x7B38)       ; �����
-    (ideograph-daikanwa                . 40036)        ; �����
+    (=jis-x0208-1978   . #x6E51)       ; �����
+    (japanese-jisx0208 . #x6E51)       ; �����
+    (korean-ksc5601    . #x7B38)       ; �����
+    (ideograph-daikanwa . 40036)       ; �����
     ))
 (define-char
   '((=>ucs             . #x91AF)       ; 醯
@@ -2760,12 +2760,12 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 12)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x4830)       ; �����
-    (korean-ksc5601            . #x5B23)       ; �����
-    (japanese-jisx0212         . #x6277)       ; �����
-    (=jis-x0213-1-2000         . #x7C7A)       ; �����
-    (ideograph-daikanwa                . 40041)        ; �����
-    (=ucs@jis                  . #x91B1)       ; �����
+    (=jis-x0208-1978   . #x4830)       ; �����
+    (korean-ksc5601    . #x5B23)       ; �����
+    (japanese-jisx0212 . #x6277)       ; �����
+    (=jis-x0213-1-2000 . #x7C7A)       ; �����
+    (ideograph-daikanwa . 40041)       ; �����
+    (=ucs@jis          . #x91B1)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        40041 0 0)
@@ -2874,10 +2874,10 @@
     (ideographic-strokes . 13)
     (total-strokes      . 20)
     (shinjigen-2       . 8553)
-    (japanese-jisx0208-1978    . #x6E54)       ; �����
-    (japanese-jisx0208         . #x6E54)       ; �����
-    (chinese-cns11643-1                . #x7A4A)       ; �����
-    (ideograph-daikanwa                . 40053)        ; �����
+    (=jis-x0208-1978   . #x6E54)       ; �����
+    (japanese-jisx0208 . #x6E54)       ; �����
+    (chinese-cns11643-1 . #x7A4A)      ; �����
+    (ideograph-daikanwa . 40053)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        40053 0 0)
@@ -3052,10 +3052,10 @@
     (ideographic-strokes . 14)
     (total-strokes      . 21)
     (shinjigen-2       . 8554)
-    (japanese-jisx0208-1978    . #x6E55)       ; �����
-    (japanese-jisx0208         . #x6E55)       ; �����
-    (chinese-cns11643-1                . #x7B34)       ; �����
-    (ideograph-daikanwa                . 40070)        ; �����
+    (=jis-x0208-1978   . #x6E55)       ; �����
+    (japanese-jisx0208 . #x6E55)       ; �����
+    (chinese-cns11643-1 . #x7B34)      ; �����
+    (ideograph-daikanwa . 40070)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        40070 0 0)
@@ -3369,7 +3369,7 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 19)
     (total-strokes      . 26)
-    (japanese-jisx0208-1978    . #x6E57)       ; �����
+    (=jis-x0208-1978   . #x6E57)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        40103 0 5)

diff --git a/lisp/utf-2000/Ideograph-R165-Distinguish.el b/lisp/utf-2000/Ideograph-R165-Distinguish.el
index 820fc75..154703a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R165-Distinguish.el
+++ b/lisp/utf-2000/Ideograph-R165-Distinguish.el
@@ -15,9 +15,9 @@
     (ideographic-radical . 165)        ; ⾤
     (ideographic-strokes . 1)
     (total-strokes      . 8)
-    (japanese-jisx0208-1978    . #x3A53)       ; �����
-    (korean-ksc5601            . #x737A)       ; �����
-    (ideograph-daikanwa                . 40116)        ; �����
+    (=jis-x0208-1978   . #x3A53)       ; �����
+    (korean-ksc5601    . #x737A)       ; �����
+    (ideograph-daikanwa . 40116)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        40116 0 2)

diff --git a/lisp/utf-2000/Ideograph-R167-Gold.el b/lisp/utf-2000/Ideograph-R167-Gold.el
index 705a912..496f91a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R167-Gold.el
+++ b/lisp/utf-2000/Ideograph-R167-Gold.el
@@ -1595,9 +1595,9 @@
     (ideographic-strokes . 5)
     (total-strokes      . 13)
     (shinjigen-2       . 8603)
-    (japanese-jisx0208-1978    . #x385A)       ; �����
-    (japanese-jisx0208         . #x385A)       ; �����
-    (ideograph-daikanwa                . 40270)        ; �����
+    (=jis-x0208-1978   . #x385A)       ; �����
+    (japanese-jisx0208 . #x385A)       ; �����
+    (ideograph-daikanwa . 40270)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        40270 0 0)
@@ -2016,9 +2016,9 @@
     (ideographic-strokes . 5)
     (total-strokes      . 13)
     (shinjigen-2       . 8597)
-    (japanese-jisx0208-1978    . #x3174)       ; �����
-    (japanese-jisx0208         . #x3174)       ; �����
-    (ideograph-daikanwa                . 40310)        ; �����
+    (=jis-x0208-1978   . #x3174)       ; �����
+    (japanese-jisx0208 . #x3174)       ; �����
+    (ideograph-daikanwa . 40310)       ; �����
     ))
 (define-char
   '((=>ucs             . #x925B)       ; 鉛
@@ -5044,8 +5044,8 @@
     (ideographic-radical . 167)        ; ⾦
     (ideographic-strokes . 8)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x3B2C)       ; �����
-    (ideograph-daikanwa                . 40523)        ; �����
+    (=jis-x0208-1978   . #x3B2C)       ; �����
+    (ideograph-daikanwa . 40523)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        40523 0 4)
@@ -7418,9 +7418,9 @@
     (ideographic-radical . 167)        ; ⾦
     (ideographic-strokes . 10)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x444A)       ; �����
-    (korean-ksc5601            . #x7560)       ; �����
-    (ideograph-daikanwa                . 40715)        ; �����
+    (=jis-x0208-1978   . #x444A)       ; �����
+    (korean-ksc5601    . #x7560)       ; �����
+    (ideograph-daikanwa . 40715)       ; �����
     ))
 (define-char
   '((=>ucs             . #x939A)       ; 鎚
@@ -10699,8 +10699,8 @@
     (ideographic-radical . 167)        ; ⾦
     (ideographic-strokes . 14)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x4C7A)       ; �����
-    (ideograph-daikanwa                . 40998)        ; �����
+    (=jis-x0208-1978   . #x4C7A)       ; �����
+    (ideograph-daikanwa . 40998)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        40998 0 3)
@@ -11450,9 +11450,9 @@
     (ideographic-strokes . 18)
     (total-strokes      . 26)
     (shinjigen-2       . 8787)
-    (japanese-jisx0208-1978    . #x6F52)       ; �����
-    (japanese-jisx0208         . #x6F52)       ; �����
-    (ideograph-daikanwa                . 41069)        ; �����
+    (=jis-x0208-1978   . #x6F52)       ; �����
+    (japanese-jisx0208 . #x6F52)       ; �����
+    (ideograph-daikanwa . 41069)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        41069 0 1)

diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el
index 84e712c..8281d79 100644 (file)
--- a/lisp/utf-2000/Ideograph-R170-Mound.el
+++ b/lisp/utf-2000/Ideograph-R170-Mound.el
@@ -861,9 +861,9 @@
     (ideographic-radical . 170)        ; ⾩
     (ideographic-strokes . 6)
     (total-strokes      . 9)
-    (japanese-jisx0208-1978    . #x395F)       ; �����
-    (japanese-jisx0208         . #x395F)       ; �����
-    (korean-ksc5601            . #x4B3D)       ; �����
+    (=jis-x0208-1978   . #x395F)       ; �����
+    (japanese-jisx0208 . #x395F)       ; �����
+    (korean-ksc5601    . #x4B3D)       ; �����
     ))
 (define-char
   '((=>ucs             . #x964D)       ; 降
@@ -2818,10 +2818,10 @@
     (ideographic-strokes . 10)
     (total-strokes      . 13)
     (shinjigen-2       . 8913)
-    (japanese-jisx0208-1978    . #x7027)       ; �����
-    (japanese-jisx0208         . #x7027)       ; �����
-    (korean-ksc5601            . #x6476)       ; �����
-    (ideograph-daikanwa                . 41791)        ; �����
+    (=jis-x0208-1978   . #x7027)       ; �����
+    (japanese-jisx0208 . #x7027)       ; �����
+    (korean-ksc5601    . #x6476)       ; �����
+    (ideograph-daikanwa . 41791)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9698)       ; 隘
@@ -3037,8 +3037,8 @@
     (ideographic-radical . 170)        ; ⾩
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x3764)       ; �����
-    (ideograph-daikanwa                . 41813)        ; �����
+    (=jis-x0208-1978   . #x3764)       ; �����
+    (ideograph-daikanwa . 41813)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        41813 0 0)
@@ -3470,9 +3470,9 @@
     (ideographic-radical . 170)        ; ⾩
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4E59)       ; �����
-    (japanese-jisx0208         . #x4E59)       ; �����
-    (korean-ksc5601            . #x5776)       ; �����
+    (=jis-x0208-1978   . #x4E59)       ; �����
+    (japanese-jisx0208 . #x4E59)       ; �����
+    (korean-ksc5601    . #x5776)       ; �����
     ))
 (define-char
   '((=>ucs             . #x96A3)       ; 隣

diff --git a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
index c461cf1..0259ae1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
+++ b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
@@ -589,8 +589,8 @@
     (ideographic-radical . 172)        ; ⾫
     (ideographic-strokes . 5)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x326D)       ; �����
-    (japanese-jisx0208         . #x326D)       ; �����
+    (=jis-x0208-1978   . #x326D)       ; �����
+    (japanese-jisx0208 . #x326D)       ; �����
     ))
 (define-char
   '((=>ucs             . #x96C5)       ; 雅
@@ -2683,10 +2683,10 @@
     (total-strokes      . 18)
     (shinjigen-1       . 903)
     (shinjigen-2       . 903)
-    (japanese-jisx0208-1978    . #x5256)       ; �����
-    (japanese-jisx0208         . #x5256)       ; �����
-    (korean-ksc5601            . #x642A)       ; �����
-    (ideograph-daikanwa                . 42116)        ; �����
+    (=jis-x0208-1978   . #x5256)       ; �����
+    (japanese-jisx0208 . #x5256)       ; �����
+    (korean-ksc5601    . #x642A)       ; �����
+    (ideograph-daikanwa . 42116)       ; �����
     ))
 (define-char
   '((=>ucs             . #x96D9)       ; 雙

diff --git a/lisp/utf-2000/Ideograph-R173-Rain.el b/lisp/utf-2000/Ideograph-R173-Rain.el
index 05a6d3b..031a4a4 100644 (file)
--- a/lisp/utf-2000/Ideograph-R173-Rain.el
+++ b/lisp/utf-2000/Ideograph-R173-Rain.el
@@ -309,10 +309,10 @@
     (ideographic-radical . 173)        ; ⾬
     (ideographic-strokes . 4)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x4A37)       ; �����
-    (japanese-jisx0208         . #x4A37)       ; �����
-    (korean-ksc5601            . #x5D54)       ; �����
-    (ideograph-daikanwa                . 42231)        ; �����
+    (=jis-x0208-1978   . #x4A37)       ; �����
+    (japanese-jisx0208 . #x4A37)       ; �����
+    (korean-ksc5601    . #x5D54)       ; �����
+    (ideograph-daikanwa . 42231)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        42231 0 0)
@@ -4218,9 +4218,9 @@
     (ideographic-radical . 173)        ; ⾬
     (ideographic-strokes . 14)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x7049)       ; �����
-    (japanese-jisx0208         . #x7049)       ; �����
-    (korean-ksc5601            . #x7038)       ; �����
+    (=jis-x0208-1978   . #x7049)       ; �����
+    (japanese-jisx0208 . #x7049)       ; �����
+    (korean-ksc5601    . #x7038)       ; �����
     ))
 (define-char
   '((ideographic-radical . 173)        ; ⾬

diff --git a/lisp/utf-2000/Ideograph-R175-Wrong.el b/lisp/utf-2000/Ideograph-R175-Wrong.el
index 0e0486f..27a8ed4 100644 (file)
--- a/lisp/utf-2000/Ideograph-R175-Wrong.el
+++ b/lisp/utf-2000/Ideograph-R175-Wrong.el
@@ -219,7 +219,7 @@
     (ideographic-radical . 175)        ; ⾮
     (ideographic-strokes . 7)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x7051)       ; �����
+    (=jis-x0208-1978   . #x7051)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9760)       ; 靠

diff --git a/lisp/utf-2000/Ideograph-R177-Leather.el b/lisp/utf-2000/Ideograph-R177-Leather.el
index dde3077..4019983 100644 (file)
--- a/lisp/utf-2000/Ideograph-R177-Leather.el
+++ b/lisp/utf-2000/Ideograph-R177-Leather.el
@@ -60,10 +60,10 @@
       :char    ((ideograph-daikanwa . 43109)   ; �����
                 )
       ))
-    (japanese-jisx0208-1978    . #x7057)       ; �����
-    (korean-ksc5601            . #x6C65)       ; �����
-    (ideograph-daikanwa                . 42715)        ; �����
-    (=ucs                      . #x976D)       ; 靭
+    (=jis-x0208-1978   . #x7057)       ; �����
+    (korean-ksc5601    . #x6C65)       ; �����
+    (ideograph-daikanwa . 42715)       ; �����
+    (=ucs              . #x976D)       ; 靭
     ))
 (define-char
   '((=>ucs             . #x976D)       ; 靭
@@ -179,7 +179,7 @@
     (ideographic-radical . 177)        ; ⾰
     (ideographic-strokes . 3)
     (total-strokes      . 12)
-    (japanese-jisx0208-1978    . #x3F59)       ; �����
+    (=jis-x0208-1978   . #x3F59)       ; �����
     ))
 (define-char
   '((ideographic-radical . 177)        ; ⾰
@@ -242,11 +242,11 @@
     (ideographic-strokes . 4)
     (total-strokes      . 13)
     (shinjigen-2       . 9052)
-    (japanese-jisx0208-1978    . #x3724)       ; �����
-    (chinese-gb2312            . #x5125)       ; �����
-    (=iso-ir165                        . #x5125)       ; �����
-    (ideograph-daikanwa                . 42729)        ; �����
-    (=ucs                      . #x9774)       ; 靴
+    (=jis-x0208-1978   . #x3724)       ; �����
+    (chinese-gb2312    . #x5125)       ; �����
+    (=iso-ir165                . #x5125)       ; �����
+    (ideograph-daikanwa . 42729)       ; �����
+    (=ucs              . #x9774)       ; 靴
     ))
 (define-char
   '((=>ucs             . #x9774)       ; 靴
@@ -668,10 +668,10 @@
   '((ideographic-radical . 177)        ; ⾰
     (ideographic-strokes . 5)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x3373)       ; �����
-    (chinese-cns11643-2                . #x4F2E)       ; �����
-    (ideograph-daikanwa                . 42781)        ; �����
-    (=ucs                      . #x9784)       ; 鞄
+    (=jis-x0208-1978   . #x3373)       ; �����
+    (chinese-cns11643-2 . #x4F2E)      ; �����
+    (ideograph-daikanwa . 42781)       ; �����
+    (=ucs              . #x9784)       ; 鞄
     ))
 (define-char
   '((=>ucs             . #x9784)       ; 鞄
@@ -1202,8 +1202,8 @@
     (ideographic-radical . 177)        ; ⾰
     (ideographic-strokes . 7)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x3E64)       ; �����
-    (ideograph-daikanwa                . 42850)        ; �����
+    (=jis-x0208-1978   . #x3E64)       ; �����
+    (ideograph-daikanwa . 42850)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        42850 0 2)

diff --git a/lisp/utf-2000/Ideograph-R181-Leaf.el b/lisp/utf-2000/Ideograph-R181-Leaf.el
index e007737..78868a2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R181-Leaf.el
+++ b/lisp/utf-2000/Ideograph-R181-Leaf.el
@@ -385,10 +385,10 @@
     (ideographic-strokes . 4)
     (total-strokes      . 13)
     (shinjigen-2       . 9152)
-    (japanese-jisx0208-1978    . #x7073)       ; �����
-    (japanese-jisx0208         . #x7073)       ; �����
-    (korean-ksc5601            . #x616B)       ; �����
-    (ideograph-daikanwa                . 43365)        ; �����
+    (=jis-x0208-1978   . #x7073)       ; �����
+    (japanese-jisx0208 . #x7073)       ; �����
+    (korean-ksc5601    . #x616B)       ; �����
+    (ideograph-daikanwa . 43365)       ; �����
     ))
 (define-char
   '((=>ucs             . #x980C)       ; 頌
@@ -509,9 +509,9 @@
     (ideographic-strokes . 4)
     (total-strokes      . 13)
     (shinjigen-2       . 9147)
-    (japanese-jisx0208-1978    . #x3468)       ; �����
-    (japanese-jisx0208         . #x3468)       ; �����
-    (ideograph-daikanwa                . 43374)        ; �����
+    (=jis-x0208-1978   . #x3468)       ; �����
+    (japanese-jisx0208 . #x3468)       ; �����
+    (ideograph-daikanwa . 43374)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        43374 0 2)
@@ -561,10 +561,10 @@
     (ideographic-strokes . 4)
     (total-strokes      . 13)
     (shinjigen-2       . 9155)
-    (japanese-jisx0208-1978    . #x4852)       ; �����
-    (japanese-jisx0208         . #x4852)       ; �����
-    (korean-ksc5601            . #x5A78)       ; �����
-    (ideograph-daikanwa                . 43378)        ; �����
+    (=jis-x0208-1978   . #x4852)       ; �����
+    (japanese-jisx0208 . #x4852)       ; �����
+    (korean-ksc5601    . #x5A78)       ; �����
+    (ideograph-daikanwa . 43378)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        43378 0 0)
@@ -595,8 +595,8 @@
     (ideographic-radical . 181)        ; ⾴
     (ideographic-strokes . 4)
     (total-strokes      . 13)
-    (japanese-jisx0208-1978    . #x465C)       ; �����
-    (ideograph-daikanwa                . 43381)        ; �����
+    (=jis-x0208-1978   . #x465C)       ; �����
+    (ideograph-daikanwa . 43381)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9813)       ; 頓
@@ -1136,12 +1136,12 @@
   '((ideographic-radical . 181)        ; ⾴
     (ideographic-strokes . 5)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x7074)       ; �����
-    (japanese-jisx0208         . #x375B)       ; �����
-    (chinese-cns11643-3                . #x4A56)       ; �����
-    (=jis-x0208-1990           . #x375B)       ; �����
-    (ideograph-daikanwa                . 43434)        ; �����
-    (=ucs                      . #x981A)       ; 頚
+    (=jis-x0208-1978   . #x7074)       ; �����
+    (japanese-jisx0208 . #x375B)       ; �����
+    (chinese-cns11643-3 . #x4A56)      ; �����
+    (=jis-x0208-1990   . #x375B)       ; �����
+    (ideograph-daikanwa . 43434)       ; �����
+    (=ucs              . #x981A)       ; 頚
     ))
 (define-char
   '((ideographic-radical . 181)        ; ⾴
@@ -1385,10 +1385,10 @@
     (ideographic-radical . 181)        ; ⾴
     (ideographic-strokes . 7)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x7075)       ; �����
-    (chinese-cns11643-1                . #x7326)       ; �����
-    (chinese-gb12345           . #x5243)       ; 頤
-    (=ucs                      . #x9824)       ; 頤
+    (=jis-x0208-1978   . #x7075)       ; �����
+    (chinese-cns11643-1 . #x7326)      ; �����
+    (chinese-gb12345   . #x5243)       ; 頤
+    (=ucs              . #x9824)       ; 頤
     ))
 (define-char
   '((ideographic-radical . 181)        ; ⾴
@@ -1792,14 +1792,14 @@
   '((ideographic-radical . 181)        ; ⾴
     (ideographic-strokes . 7)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x4B4B)       ; �����
-    (korean-ksc5601            . #x7A7A)       ; �����
-    (japanese-jisx0212         . #x6824)       ; �����
-    (chinese-cns11643-1                . #x727E)       ; �����
-    (=jis-x0213-1-2000         . #x7D7A)       ; �����
-    (chinese-gb12345           . #x3C55)       ; 頰
-    (ideograph-daikanwa                . 43496)        ; �����
-    (=ucs                      . #x9830)       ; 頰
+    (=jis-x0208-1978   . #x4B4B)       ; �����
+    (korean-ksc5601    . #x7A7A)       ; �����
+    (japanese-jisx0212 . #x6824)       ; �����
+    (chinese-cns11643-1 . #x727E)      ; �����
+    (=jis-x0213-1-2000 . #x7D7A)       ; �����
+    (chinese-gb12345   . #x3C55)       ; 頰
+    (ideograph-daikanwa . 43496)       ; �����
+    (=ucs              . #x9830)       ; 頰
     ))
 (define-char
   '((morohashi-daikanwa        43496 0 5)
@@ -1983,14 +1983,14 @@
     (ideographic-strokes . 7)
     (total-strokes      . 16)
     (shinjigen-2       . 9169)
-    (japanese-jisx0208-1978    . #x375B)       ; �����
-    (japanese-jisx0208         . #x7074)       ; �����
-    (korean-ksc5601            . #x4C72)       ; �����
-    (chinese-cns11643-1                . #x7321)       ; �����
-    (=jis-x0208-1990           . #x7074)       ; �����
-    (chinese-gb12345           . #x3E31)       ; 頸
-    (ideograph-daikanwa                . 43515)        ; �����
-    (=ucs                      . #x9838)       ; 頸
+    (=jis-x0208-1978   . #x375B)       ; �����
+    (japanese-jisx0208 . #x7074)       ; �����
+    (korean-ksc5601    . #x4C72)       ; �����
+    (chinese-cns11643-1 . #x7321)      ; �����
+    (=jis-x0208-1990   . #x7074)       ; �����
+    (chinese-gb12345   . #x3E31)       ; 頸
+    (ideograph-daikanwa . 43515)       ; �����
+    (=ucs              . #x9838)       ; 頸
     ))
 (define-char
   '((ideographic-radical . 181)        ; ⾴
@@ -2035,12 +2035,12 @@
     (ideographic-strokes . 7)
     (japanese-strokes   . 8)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x4951)       ; �����
-    (korean-ksc5601            . #x5E3A)       ; �����
-    (=jis-x0213-1-2000         . #x7D7B)       ; �����
-    (ideograph-daikanwa                . 43519)        ; �����
-    (=ucs@ks                   . #x983B)       ; 頻
-    (=ucs                      . #xFA6A)       ; 頻
+    (=jis-x0208-1978   . #x4951)       ; �����
+    (korean-ksc5601    . #x5E3A)       ; �����
+    (=jis-x0213-1-2000 . #x7D7B)       ; �����
+    (ideograph-daikanwa . 43519)       ; �����
+    (=ucs@ks           . #x983B)       ; 頻
+    (=ucs              . #xFA6A)       ; 頻
     ))
 (define-char
   '((=>ucs@jis         . #xFA6A)       ; 頻
@@ -3304,13 +3304,13 @@
   '((ideographic-radical . 181)        ; ⾴
     (ideographic-strokes . 10)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x453F)       ; �����
-    (korean-ksc5601            . #x6F34)       ; �����
-    (japanese-jisx0212         . #x6833)       ; �����
-    (chinese-cns11643-4                . #x6230)       ; �����
-    (=jis-x0213-1-2000         . #x7E23)       ; �����
-    (ideograph-daikanwa                . 43628)        ; �����
-    (=ucs                      . #x985A)       ; 顚
+    (=jis-x0208-1978   . #x453F)       ; �����
+    (korean-ksc5601    . #x6F34)       ; �����
+    (japanese-jisx0212 . #x6833)       ; �����
+    (chinese-cns11643-4 . #x6230)      ; �����
+    (=jis-x0213-1-2000 . #x7E23)       ; �����
+    (ideograph-daikanwa . 43628)       ; �����
+    (=ucs              . #x985A)       ; 顚
     ))
 (define-char
   '((morohashi-daikanwa        43628 0 4)
@@ -4549,9 +4549,9 @@
     (ideographic-strokes . 18)
     (total-strokes      . 27)
     (shinjigen-2       . 9210)
-    (japanese-jisx0208-1978    . #x7123)       ; �����
-    (japanese-jisx0208         . #x7123)       ; �����
-    (ideograph-daikanwa                . 43750)        ; �����
+    (=jis-x0208-1978   . #x7123)       ; �����
+    (japanese-jisx0208 . #x7123)       ; �����
+    (ideograph-daikanwa . 43750)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9873)       ; 顳

diff --git a/lisp/utf-2000/Ideograph-R182-Wind.el b/lisp/utf-2000/Ideograph-R182-Wind.el
index 80ab812..38230ab 100644 (file)
--- a/lisp/utf-2000/Ideograph-R182-Wind.el
+++ b/lisp/utf-2000/Ideograph-R182-Wind.el
@@ -2524,9 +2524,9 @@
     (ideographic-strokes . 11)
     (total-strokes      . 20)
     (shinjigen-2       . 9228)
-    (japanese-jisx0208-1978    . #x7129)       ; �����
-    (japanese-jisx0208         . #x7129)       ; �����
-    (ideograph-daikanwa                . 43945)        ; �����
+    (=jis-x0208-1978   . #x7129)       ; �����
+    (japanese-jisx0208 . #x7129)       ; �����
+    (ideograph-daikanwa . 43945)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        43945 0 0)

diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el
index 75c0ef1..bd4acf3 100644 (file)
--- a/lisp/utf-2000/Ideograph-R184-Eat.el
+++ b/lisp/utf-2000/Ideograph-R184-Eat.el
@@ -1180,9 +1180,9 @@
     (ideographic-radical . 184)        ; ⾷
     (ideographic-strokes . 5)
     (total-strokes      . 14)
-    (japanese-jisx0208-1978    . #x303B)       ; �����
-    (korean-ksc5601            . #x6C47)       ; �����
-    (ideograph-daikanwa                . 44080)        ; �����
+    (=jis-x0208-1978   . #x303B)       ; �����
+    (korean-ksc5601    . #x6C47)       ; �����
+    (ideograph-daikanwa . 44080)       ; �����
     ))
 (define-char
   '((=>ucs             . #x98F4)       ; 飴
@@ -2036,8 +2036,8 @@
     (ideographic-radical . 184)        ; ⾷
     (ideographic-strokes . 6)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x4C5F)       ; �����
-    (ideograph-daikanwa                . 44133)        ; �����
+    (=jis-x0208-1978   . #x4C5F)       ; �����
+    (ideograph-daikanwa . 44133)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9905)       ; 餅
@@ -2282,7 +2282,7 @@
     (ideographic-radical . 184)        ; ⾷
     (ideographic-strokes . 6)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x3142)       ; �����
+    (=jis-x0208-1978   . #x3142)       ; �����
     ))
 (define-char
   '((=>ucs             . #x990C)       ; 餌

diff --git a/lisp/utf-2000/Ideograph-R187-Horse.el b/lisp/utf-2000/Ideograph-R187-Horse.el
index faa9e43..4bf3e0d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R187-Horse.el
+++ b/lisp/utf-2000/Ideograph-R187-Horse.el
@@ -4105,12 +4105,12 @@
     (ideographic-strokes . 11)
     (total-strokes      . 21)
     (shinjigen-2       . 9336)
-    (japanese-jisx0208-1978    . #x715C)       ; �����
-    (japanese-jisx0208         . #x715C)       ; �����
-    (korean-ksc5601            . #x4F4C)       ; �����
-    (chinese-gb12345           . #x477D)       ; 驅
-    (ideograph-daikanwa                . 44968)        ; �����
-    (=ucs                      . #x9A45)       ; 驅
+    (=jis-x0208-1978   . #x715C)       ; �����
+    (japanese-jisx0208 . #x715C)       ; �����
+    (korean-ksc5601    . #x4F4C)       ; �����
+    (chinese-gb12345   . #x477D)       ; 驅
+    (ideograph-daikanwa . 44968)       ; �����
+    (=ucs              . #x9A45)       ; 驅
     ))
 (define-char
   '((=>ucs             . #x9A45)       ; 驅
@@ -4463,11 +4463,11 @@
   '((ideographic-radical . 187)        ; ⾺
     (ideographic-strokes . 12)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x424D)       ; �����
-    (chinese-cns11643-2                . #x6E4F)       ; �����
-    (=jis-x0213-1-2000         . #x7E34)       ; �����
-    (ideograph-daikanwa                . 45002)        ; �����
-    (=ucs                      . #x9A52)       ; 驒
+    (=jis-x0208-1978   . #x424D)       ; �����
+    (chinese-cns11643-2 . #x6E4F)      ; �����
+    (=jis-x0213-1-2000 . #x7E34)       ; �����
+    (ideograph-daikanwa . 45002)       ; �����
+    (=ucs              . #x9A52)       ; 驒
     ))
 (define-char
   '((ideographic-radical . 187)        ; ⾺

diff --git a/lisp/utf-2000/Ideograph-R191-Fight.el b/lisp/utf-2000/Ideograph-R191-Fight.el
index 9e65e55..c757646 100644 (file)
--- a/lisp/utf-2000/Ideograph-R191-Fight.el
+++ b/lisp/utf-2000/Ideograph-R191-Fight.el
@@ -300,7 +300,7 @@
     (ideographic-radical . 191)        ; ⾾
     (ideographic-strokes . 16)
     (total-strokes      . 26)
-    (japanese-jisx0208-1978    . #x722D)       ; �����
+    (=jis-x0208-1978   . #x722D)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        45659 0 2)

diff --git a/lisp/utf-2000/Ideograph-R194-Ghost.el b/lisp/utf-2000/Ideograph-R194-Ghost.el
index 9c98bb5..7b18013 100644 (file)
--- a/lisp/utf-2000/Ideograph-R194-Ghost.el
+++ b/lisp/utf-2000/Ideograph-R194-Ghost.el
@@ -985,9 +985,9 @@
     (ideographic-radical . 194)        ; ⿁
     (ideographic-strokes . 8)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x7233)       ; �����
-    (japanese-jisx0208         . #x7233)       ; �����
-    (chinese-cns11643-1                . #x777D)       ; �����
+    (=jis-x0208-1978   . #x7233)       ; �����
+    (japanese-jisx0208 . #x7233)       ; �����
+    (chinese-cns11643-1 . #x777D)      ; �����
     ))
 (define-char
   '((morohashi-daikanwa        45869 0 1)

diff --git a/lisp/utf-2000/Ideograph-R195-Fish.el b/lisp/utf-2000/Ideograph-R195-Fish.el
index f5122d6..361da1a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R195-Fish.el
+++ b/lisp/utf-2000/Ideograph-R195-Fish.el
@@ -1308,8 +1308,8 @@
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 5)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x723C)       ; �����
-    (ideograph-daikanwa                . 46091)        ; �����
+    (=jis-x0208-1978   . #x723C)       ; �����
+    (ideograph-daikanwa . 46091)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        46091 0 0)
@@ -2371,8 +2371,8 @@
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 7)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x7244)       ; �����
-    (japanese-jisx0208         . #x7244)       ; �����
+    (=jis-x0208-1978   . #x7244)       ; �����
+    (japanese-jisx0208 . #x7244)       ; �����
     ))
 (define-char
   '((ideographic-radical . 195)        ; ⿂
@@ -2754,9 +2754,9 @@
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 8)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x3B2A)       ; �����
-    (korean-ksc5601            . #x746D)       ; �����
-    (ideograph-daikanwa                . 46210)        ; �����
+    (=jis-x0208-1978   . #x3B2A)       ; �����
+    (korean-ksc5601    . #x746D)       ; �����
+    (ideograph-daikanwa . 46210)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        46210 0 5)
@@ -3071,9 +3071,9 @@
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 8)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x724C)       ; �����
-    (japanese-jisx0208         . #x724C)       ; �����
-    (ideograph-daikanwa                . 46243)        ; �����
+    (=jis-x0208-1978   . #x724C)       ; �����
+    (japanese-jisx0208 . #x724C)       ; �����
+    (ideograph-daikanwa . 46243)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9BE1)       ; 鯡
@@ -3558,17 +3558,17 @@
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 8)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x724F)       ; �����
-    (japanese-jisx0208         . #x724F)       ; �����
-    (=ucs                      . #x9BF1)       ; 鯱
+    (=jis-x0208-1978   . #x724F)       ; �����
+    (japanese-jisx0208 . #x724F)       ; �����
+    (=ucs              . #x9BF1)       ; 鯱
     ))
 (define-char
   '((=>ucs             . #x9BF2)       ; 鯲
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 8)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x724E)       ; �����
-    (ideograph-daikanwa                . 46287)        ; �����
+    (=jis-x0208-1978   . #x724E)       ; �����
+    (ideograph-daikanwa . 46287)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        46287 0 0)
@@ -5108,8 +5108,8 @@
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 10)
     (total-strokes      . 21)
-    (japanese-jisx0208-1978    . #x3073)       ; �����
-    (ideograph-daikanwa                . 46413)        ; �����
+    (=jis-x0208-1978   . #x3073)       ; �����
+    (ideograph-daikanwa . 46413)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        46413 0 2)
@@ -5472,22 +5472,22 @@
     (ideographic-strokes . 11)
     (total-strokes      . 22)
     (shinjigen-2       . 9618)
-    (japanese-jisx0208-1978    . #x3033)       ; �����
-    (japanese-jisx0208         . #x724D)       ; �����
-    (chinese-cns11643-3                . #x6023)       ; �����
-    (=jis-x0208-1990           . #x724D)       ; �����
-    (ideograph-daikanwa                . 46442)        ; �����
-    (=ucs                      . #x9C3A)       ; 鰺
+    (=jis-x0208-1978   . #x3033)       ; �����
+    (japanese-jisx0208 . #x724D)       ; �����
+    (chinese-cns11643-3 . #x6023)      ; �����
+    (=jis-x0208-1990   . #x724D)       ; �����
+    (ideograph-daikanwa . 46442)       ; �����
+    (=ucs              . #x9C3A)       ; 鰺
     ))
 (define-char
   '((morohashi-daikanwa        46442 0 6)
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 8)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x724D)       ; �����
-    (japanese-jisx0208         . #x3033)       ; �����
-    (=jis-x0208-1990           . #x3033)       ; �����
-    (=ucs                      . #x9BF5)       ; 鯵
+    (=jis-x0208-1978   . #x724D)       ; �����
+    (japanese-jisx0208 . #x3033)       ; �����
+    (=jis-x0208-1990   . #x3033)       ; �����
+    (=ucs              . #x9BF5)       ; 鯵
     ))
 (define-char
   '((=>ucs             . #x9C3B)       ; 鰻
@@ -5757,8 +5757,8 @@
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 11)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x432D)       ; �����
-    (ideograph-daikanwa                . 46470)        ; �����
+    (=jis-x0208-1978   . #x432D)       ; �����
+    (ideograph-daikanwa . 46470)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9C48)       ; 鱈
@@ -6030,8 +6030,8 @@
     (ideographic-radical . 195)        ; ⿂
     (ideographic-strokes . 12)
     (total-strokes      . 23)
-    (japanese-jisx0208-1978    . #x4B70)       ; �����
-    (ideograph-daikanwa                . 46492)        ; �����
+    (=jis-x0208-1978   . #x4B70)       ; �����
+    (ideograph-daikanwa . 46492)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9C52)       ; 鱒

diff --git a/lisp/utf-2000/Ideograph-R196-Bird.el b/lisp/utf-2000/Ideograph-R196-Bird.el
index 8b9c5df..8ec6fbb 100644 (file)
--- a/lisp/utf-2000/Ideograph-R196-Bird.el
+++ b/lisp/utf-2000/Ideograph-R196-Bird.el
@@ -887,7 +887,7 @@
     (ideographic-radical . 196)        ; ⿃
     (ideographic-strokes . 4)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x463E)       ; �����
+    (=jis-x0208-1978   . #x463E)       ; �����
     ))
 (define-char
   '((ideographic-radical . 196)        ; ⿃
@@ -1783,10 +1783,10 @@
   '((ideographic-radical . 196)        ; ⿃
     (ideographic-strokes . 5)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x7274)       ; �����
-    (japanese-jisx0208         . #x3229)       ; �����
-    (=jis-x0208-1990           . #x3229)       ; �����
-    (=ucs                      . #x9D2C)       ; 鴬
+    (=jis-x0208-1978   . #x7274)       ; �����
+    (japanese-jisx0208 . #x3229)       ; �����
+    (=jis-x0208-1990   . #x3229)       ; �����
+    (=ucs              . #x9D2C)       ; 鴬
     ))
 (define-char
   '((ideographic-radical . 196)        ; ⿃
@@ -2528,9 +2528,9 @@
   '((ideographic-radical . 196)        ; ⿃
     (ideographic-strokes . 6)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x727E)       ; �����
-    (japanese-jisx0208         . #x727E)       ; �����
-    (=ucs                      . #x9D48)       ; 鵈
+    (=jis-x0208-1978   . #x727E)       ; �����
+    (japanese-jisx0208 . #x727E)       ; �����
+    (=ucs              . #x9D48)       ; 鵈
     ))
 (define-char
   '((=>ucs             . #x9D48)       ; 鵈
@@ -3088,9 +3088,9 @@
     (ideographic-radical . 196)        ; ⿃
     (ideographic-strokes . 7)
     (total-strokes      . 18)
-    (japanese-jisx0208-1978    . #x3974)       ; �����
-    (korean-ksc5601            . #x4D5C)       ; �����
-    (ideograph-daikanwa                . 46961)        ; �����
+    (=jis-x0208-1978   . #x3974)       ; �����
+    (korean-ksc5601    . #x4D5C)       ; �����
+    (ideograph-daikanwa . 46961)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        46961 0 2)
@@ -5161,14 +5161,14 @@
     (ideographic-strokes . 10)
     (total-strokes      . 21)
     (shinjigen-2       . 9726)
-    (japanese-jisx0208-1978    . #x3229)       ; �����
-    (japanese-jisx0208         . #x7274)       ; �����
-    (korean-ksc5601            . #x6523)       ; �����
-    (chinese-cns11643-1                . #x7B4D)       ; �����
-    (=jis-x0208-1990           . #x7274)       ; �����
-    (chinese-gb12345           . #x5D3A)       ; 鶯
-    (ideograph-daikanwa                . 47169)        ; �����
-    (=ucs                      . #x9DAF)       ; 鶯
+    (=jis-x0208-1978   . #x3229)       ; �����
+    (japanese-jisx0208 . #x7274)       ; �����
+    (korean-ksc5601    . #x6523)       ; �����
+    (chinese-cns11643-1 . #x7B4D)      ; �����
+    (=jis-x0208-1990   . #x7274)       ; �����
+    (chinese-gb12345   . #x5D3A)       ; 鶯
+    (ideograph-daikanwa . 47169)       ; �����
+    (=ucs              . #x9DAF)       ; 鶯
     ))
 (define-char
   '((ideographic-radical . 196)        ; ⿃
@@ -5691,8 +5691,8 @@
     (ideographic-radical . 196)        ; ⿃
     (ideographic-strokes . 10)
     (total-strokes      . 21)
-    (japanese-jisx0208-1978    . #x7337)       ; �����
-    (japanese-jisx0208         . #x7337)       ; �����
+    (=jis-x0208-1978   . #x7337)       ; �����
+    (japanese-jisx0208 . #x7337)       ; �����
     ))
 (define-char
   '((ideographic-radical . 196)        ; ⿃
@@ -6216,13 +6216,13 @@
   '((ideographic-radical . 196)        ; ⿃
     (ideographic-strokes . 11)
     (total-strokes      . 22)
-    (japanese-jisx0208-1978    . #x322A)       ; �����
-    (korean-ksc5601            . #x4F4E)       ; �����
-    (japanese-jisx0212         . #x6C3F)       ; �����
-    (=jis-x0213-1-2000         . #x7E65)       ; �����
-    (chinese-gb12345           . #x4538)       ; 鷗
-    (ideograph-daikanwa                . 47268)        ; �����
-    (=ucs                      . #x9DD7)       ; 鷗
+    (=jis-x0208-1978   . #x322A)       ; �����
+    (korean-ksc5601    . #x4F4E)       ; �����
+    (japanese-jisx0212 . #x6C3F)       ; �����
+    (=jis-x0213-1-2000 . #x7E65)       ; �����
+    (chinese-gb12345   . #x4538)       ; 鷗
+    (ideograph-daikanwa . 47268)       ; �����
+    (=ucs              . #x9DD7)       ; 鷗
     ))
 (define-char
   '((=>ucs             . #x9DD7)       ; 鷗

diff --git a/lisp/utf-2000/Ideograph-R197-Salt.el b/lisp/utf-2000/Ideograph-R197-Salt.el
index cd24ec7..8d18cb5 100644 (file)
--- a/lisp/utf-2000/Ideograph-R197-Salt.el
+++ b/lisp/utf-2000/Ideograph-R197-Salt.el
@@ -451,13 +451,13 @@
   '((ideographic-radical . 197)        ; ⿄
     (ideographic-strokes . 13)
     (total-strokes      . 24)
-    (japanese-jisx0208-1978    . #x3834)       ; �����
-    (japanese-jisx0212         . #x6C5B)       ; �����
-    (chinese-cns11643-1                . #x7C7B)       ; �����
-    (=jis-x0213-1-2000         . #x7E6A)       ; �����
-    (chinese-gb12345           . #x3C6F)       ; 鹼
-    (ideograph-daikanwa                . 47576)        ; �����
-    (=ucs                      . #x9E7C)       ; 鹼
+    (=jis-x0208-1978   . #x3834)       ; �����
+    (japanese-jisx0212 . #x6C5B)       ; �����
+    (chinese-cns11643-1 . #x7C7B)      ; �����
+    (=jis-x0213-1-2000 . #x7E6A)       ; �����
+    (chinese-gb12345   . #x3C6F)       ; 鹼
+    (ideograph-daikanwa . 47576)       ; �����
+    (=ucs              . #x9E7C)       ; 鹼
     ))
 (define-char
   '((ideographic-radical . 197)        ; ⿄

diff --git a/lisp/utf-2000/Ideograph-R198-Deer.el b/lisp/utf-2000/Ideograph-R198-Deer.el
index f8c0438..acba47c 100644 (file)
--- a/lisp/utf-2000/Ideograph-R198-Deer.el
+++ b/lisp/utf-2000/Ideograph-R198-Deer.el
@@ -712,10 +712,10 @@
     (ideographic-strokes . 8)
     (total-strokes      . 19)
     (shinjigen-2       . 9782)
-    (japanese-jisx0208-1978    . #x4E6F)       ; �����
-    (japanese-jisx0208         . #x4E6F)       ; �����
-    (korean-ksc5601            . #x5572)       ; �����
-    (ideograph-daikanwa                . 47663)        ; �����
+    (=jis-x0208-1978   . #x4E6F)       ; �����
+    (japanese-jisx0208 . #x4E6F)       ; �����
+    (korean-ksc5601    . #x5572)       ; �����
+    (ideograph-daikanwa . 47663)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9E97)       ; 麗
@@ -1075,8 +1075,8 @@
     (ideographic-radical . 198)        ; ⿅
     (ideographic-strokes . 12)
     (total-strokes      . 23)
-    (japanese-jisx0208-1978    . #x4E5B)       ; �����
-    (japanese-jisx0208         . #x4E5B)       ; �����
+    (=jis-x0208-1978   . #x4E5B)       ; �����
+    (japanese-jisx0208 . #x4E5B)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9E9F)       ; 麟

diff --git a/lisp/utf-2000/Ideograph-R199-Wheat.el b/lisp/utf-2000/Ideograph-R199-Wheat.el
index a6d59b2..8f5ae57 100644 (file)
--- a/lisp/utf-2000/Ideograph-R199-Wheat.el
+++ b/lisp/utf-2000/Ideograph-R199-Wheat.el
@@ -360,9 +360,9 @@
   '((ideographic-radical . 199)        ; ⿆
     (ideographic-strokes . 4)
     (total-strokes      . 15)
-    (japanese-jisx0208-1978    . #x7351)       ; �����
-    (ideograph-daikanwa                . 47742)        ; �����
-    (=ucs                      . #x9EAA)       ; 麪
+    (=jis-x0208-1978   . #x7351)       ; �����
+    (ideograph-daikanwa . 47742)       ; �����
+    (=ucs              . #x9EAA)       ; 麪
     ))
 (define-char
   '((=>ucs             . #x9EAA)       ; 麪
@@ -1280,12 +1280,12 @@
     (ideographic-radical . 199)        ; ⿆
     (ideographic-strokes . 8)
     (total-strokes      . 19)
-    (japanese-jisx0208-1978    . #x396D)       ; �����
-    (korean-ksc5601            . #x4F55)       ; �����
-    (japanese-jisx0212         . #x6C6F)       ; �����
-    (=jis-x0213-1-2000         . #x7E6F)       ; �����
-    (ideograph-daikanwa                . 47818)        ; �����
-    (=ucs@jis                  . #x9EB4)       ; �����
+    (=jis-x0208-1978   . #x396D)       ; �����
+    (korean-ksc5601    . #x4F55)       ; �����
+    (japanese-jisx0212 . #x6C6F)       ; �����
+    (=jis-x0213-1-2000 . #x7E6F)       ; �����
+    (ideograph-daikanwa . 47818)       ; �����
+    (=ucs@jis          . #x9EB4)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9EB4)       ; 麴
@@ -1417,12 +1417,12 @@
     (ideographic-radical . 199)        ; ⿆
     (ideographic-strokes . 9)
     (total-strokes      . 20)
-    (japanese-jisx0208-1978    . #x4C4D)       ; �����
-    (korean-ksc5601            . #x587D)       ; �����
-    (japanese-jisx0212         . #x6C70)       ; �����
-    (=jis-x0213-1-2000         . #x7E70)       ; �����
-    (ideograph-daikanwa                . 47827)        ; �����
-    (=ucs@jis                  . #x9EB5)       ; �����
+    (=jis-x0208-1978   . #x4C4D)       ; �����
+    (korean-ksc5601    . #x587D)       ; �����
+    (japanese-jisx0212 . #x6C70)       ; �����
+    (=jis-x0213-1-2000 . #x7E70)       ; �����
+    (ideograph-daikanwa . 47827)       ; �����
+    (=ucs@jis          . #x9EB5)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9EB5)       ; 麵

diff --git a/lisp/utf-2000/Ideograph-R203-Black.el b/lisp/utf-2000/Ideograph-R203-Black.el
index 0b7ac3c..c5a7537 100644 (file)
--- a/lisp/utf-2000/Ideograph-R203-Black.el
+++ b/lisp/utf-2000/Ideograph-R203-Black.el
@@ -364,13 +364,13 @@
   '((ideographic-radical . 203)        ; ⿊
     (ideographic-strokes . 5)
     (total-strokes      . 17)
-    (japanese-jisx0208-1978    . #x4263)       ; �����
-    (chinese-gb2312            . #x776C)       ; �����
-    (korean-ksc5601            . #x536A)       ; �����
-    (=iso-ir165                        . #x776C)       ; �����
-    (chinese-cns11643-1                . #x7638)       ; �����
-    (ideograph-daikanwa                . 48075)        ; �����
-    (=ucs                      . #x9EDB)       ; 黛
+    (=jis-x0208-1978   . #x4263)       ; �����
+    (chinese-gb2312    . #x776C)       ; �����
+    (korean-ksc5601    . #x536A)       ; �����
+    (=iso-ir165                . #x776C)       ; �����
+    (chinese-cns11643-1 . #x7638)      ; �����
+    (ideograph-daikanwa . 48075)       ; �����
+    (=ucs              . #x9EDB)       ; 黛
     ))
 (define-char
   '((=>ucs             . #x9EDB)       ; 黛

diff --git a/lisp/utf-2000/Ideograph-R205-Frog.el b/lisp/utf-2000/Ideograph-R205-Frog.el
index 720350b..96e8915 100644 (file)
--- a/lisp/utf-2000/Ideograph-R205-Frog.el
+++ b/lisp/utf-2000/Ideograph-R205-Frog.el
@@ -520,9 +520,9 @@
     (ideographic-radical . 205)        ; ⿌
     (ideographic-strokes . 12)
     (total-strokes      . 25)
-    (japanese-jisx0208-1978    . #x7368)       ; �����
-    (japanese-jisx0208         . #x7368)       ; �����
-    (korean-ksc5601            . #x5C2F)       ; �����
+    (=jis-x0208-1978   . #x7368)       ; �����
+    (japanese-jisx0208 . #x7368)       ; �����
+    (korean-ksc5601    . #x5C2F)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        48305 0 2)

diff --git a/lisp/utf-2000/Ideograph-R210-Even.el b/lisp/utf-2000/Ideograph-R210-Even.el
index 9cf10ed..38ae9b9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R210-Even.el
+++ b/lisp/utf-2000/Ideograph-R210-Even.el
@@ -194,8 +194,8 @@
     (ideographic-radical . 210)        ; ⿑
     (ideographic-strokes . 7)
     (total-strokes      . 21)
-    (japanese-jisx0208-1978    . #x6C5A)       ; �����
-    (japanese-jisx0208         . #x6C5A)       ; �����
+    (=jis-x0208-1978   . #x6C5A)       ; �����
+    (japanese-jisx0208 . #x6C5A)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9F4E)       ; 齎

diff --git a/lisp/utf-2000/Ideograph-R213-Turtle.el b/lisp/utf-2000/Ideograph-R213-Turtle.el
index ddb9ee1..d9433b2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R213-Turtle.el
+++ b/lisp/utf-2000/Ideograph-R213-Turtle.el
@@ -17,7 +17,7 @@
     (ideographic-radical . 213)        ; ⿔
     (ideographic-strokes . 0)
     (total-strokes      . 16)
-    (japanese-jisx0208-1978    . #x737D)       ; �����
+    (=jis-x0208-1978   . #x737D)       ; �����
     ))
 (define-char
   '((=>ucs             . #x9F9C)       ; 龜
@@ -264,7 +264,7 @@
     (ideographic-radical . 213)        ; ⿔
     (ideographic-strokes . 5)
     (total-strokes      . 21)
-    (japanese-jisx0208-1978    . #x6354)       ; �����
+    (=jis-x0208-1978   . #x6354)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        48869 0 2)