Sync up with r21-4-14-chise-0_21-18.

diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el
index ce92da8..072066c 100644 (file)
--- a/lisp/utf-2000/Ideograph-R031-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el
@@ -1194,7 +1194,7 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 4)
     (total-strokes      . 7)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x5707)     ; 圇
       ))
     (hanyu-dazidian    1 715 8)

diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el
index 478df0c..0bba39a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -3154,7 +3154,7 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 6)
     (total-strokes      . 9)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 05120)      ; �����
       ))
     (hanyu-dazidian    1 438 7)
@@ -6985,11 +6985,10 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (->mojikyo         . 050137)       ; ������
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 05574)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=ucs              . #x5841)       ; 塁
     (=jis-x0208                . #x4E5D)       ; �����
@@ -7153,7 +7152,7 @@
   '((ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 05423)      ; �����
       ))
     (hanyu-dazidian    1 468 4)

diff --git a/lisp/utf-2000/Ideograph-R036-Evening.el b/lisp/utf-2000/Ideograph-R036-Evening.el
index 3cc5df2..aeae5fc 100644 (file)
--- a/lisp/utf-2000/Ideograph-R036-Evening.el
+++ b/lisp/utf-2000/Ideograph-R036-Evening.el
@@ -798,11 +798,11 @@
     (ideographic-radical . 36) ; ⼣
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (<-simplified-ideograph
+    (<-simplified
      ((shinjigen-1       . 1550)
       (=daikanwa         . 05802)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      shinjigen-1)
     (shinjigen-1       . 1549)
     (=ucs              . #x5922)       ; 夢

diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el
index 76a9e6c..0000da6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R037-Big.el
+++ b/lisp/utf-2000/Ideograph-R037-Big.el
@@ -655,7 +655,7 @@
     (ideographic-radical . 37) ; ⼤
     (ideographic-strokes . 4)
     (total-strokes      . 7)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 05991)      ; �����
       ))
     (hanyu-dazidian    1 529 9)

diff --git a/lisp/utf-2000/Ideograph-R041-Inch.el b/lisp/utf-2000/Ideograph-R041-Inch.el
index 50c2db0..1656667 100644 (file)
--- a/lisp/utf-2000/Ideograph-R041-Inch.el
+++ b/lisp/utf-2000/Ideograph-R041-Inch.el
@@ -698,7 +698,7 @@
     (ideographic-radical . 41) ; ⼨
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (<-simplified-ideograph
+    (<-simplified
      (:sources (morohashi-daikanwa)
       :char    ((=daikanwa          . 07465)   ; �����
                 )

diff --git a/lisp/utf-2000/Ideograph-R052-Short-Thread.el b/lisp/utf-2000/Ideograph-R052-Short-Thread.el
index bdcc7ca..be73837 100644 (file)
--- a/lisp/utf-2000/Ideograph-R052-Short-Thread.el
+++ b/lisp/utf-2000/Ideograph-R052-Short-Thread.el
@@ -18,7 +18,7 @@
   '((ideographic-radical . 52) ; ⼳
     (ideographic-strokes . 0)
     (total-strokes      . 2)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 09189)      ; �����
       ))
     (=big5-cdp         . #x895C)       ; ������

diff --git a/lisp/utf-2000/Ideograph-R058-Snout.el b/lisp/utf-2000/Ideograph-R058-Snout.el
index eda37ce..7a12c8e 100644 (file)
--- a/lisp/utf-2000/Ideograph-R058-Snout.el
+++ b/lisp/utf-2000/Ideograph-R058-Snout.el
@@ -108,10 +108,10 @@
     (ideographic-strokes . 3)
     (total-strokes      . 6)
     (<-vulgar-ideograph
-     (:sources (morohashi-daikanwa)
-      :char    ((=daikanwa          . 21890)   ; �����
-                )
+     ((=daikanwa         . 21890)      ; �����
       ))
+    (<-vulgar-ideograph*sources
+     daikanwa)
     (=ucs              . #x22450)      ; 𢑐
     (=cns11643-6       . #x246E)       ; �����
     (=daikanwa         . 09912)        ; �����
@@ -121,12 +121,12 @@
   '((ideographic-radical . 58) ; ⼹
     (ideographic-strokes . 3)
     (total-strokes      . 6)
-    (shinjigen-2       . 5071)
-    (simplified-ideograph-of
-     ((sources           morohashi-daikanwa)
-      (char . ((=daikanwa         . 21890)     ; �����
-              ))
+    (<-simplified
+     ((=daikanwa         . 21890)      ; �����
       ))
+    (<-simplified*sources
+     daikanwa)
+    (shinjigen-2       . 5071)
     (=ucs              . #x5F53)       ; 当
     (=jis-x0208                . #x4576)       ; �����
     (=gb2312           . #x3531)       ; �����

diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el
index 42a62ba..7b8ee89 100644 (file)
--- a/lisp/utf-2000/Ideograph-R064-Hand.el
+++ b/lisp/utf-2000/Ideograph-R064-Hand.el
@@ -8083,7 +8083,7 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      (:sources (morohashi-daikanwa)
       :char    ((=daikanwa          . 12389)   ; �����
                 )
@@ -10240,7 +10240,7 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (<-simplified-ideograph
+    (<-simplified
      (:char    ((shinjigen-1        . 3023)
                 (=jis-x0208         . #x596A)  ; �����
                 (=daikanwa          . 12479)   ; �����

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index 5ee6797..f75321f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -409,7 +409,7 @@
     (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 3)
     (total-strokes      . 7)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 30177)      ; �����
       ))
     (=gt-k             . 03318)        ; ������
@@ -420,7 +420,7 @@
     (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 3)
     (total-strokes      . 7)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 30177)      ; �����
       ))
     (=gt-k             . 03616)        ; ������

diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el
index e033b80..8aa0d1d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R075-Tree.el
+++ b/lisp/utf-2000/Ideograph-R075-Tree.el
@@ -12993,10 +12993,10 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 15364)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=jis-x0208-1978   . #x3335)       ; �����
     (mojikyo           . 050230)       ; ������

diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index a73897c..e17d891 100644 (file)
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -4931,10 +4931,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 6)
     (total-strokes      . 9)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 17503)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (shinjigen-2       . 4166)
     (=ucs              . #x2F901)      ; 海
@@ -6588,10 +6588,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 17644)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=jis-x0208                . #x4E5E)       ; �����
     (=cns11643-3       . #x317D)       ; �����
@@ -6728,7 +6728,7 @@
   '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (<-simplified-ideograph
+    (<-simplified
      ((=jis-x0208-1978   . #x4642)     ; �����
       (=jis-x0213-1-2000  . #x773D)    ; �����
       (=daikanwa         . 18591)      ; �����
@@ -8878,10 +8878,10 @@
   '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 17788)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (shinjigen-2       . 4263)
     (=ucs              . #x6E07)       ; 渇
@@ -14435,10 +14435,10 @@
     (ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 18153)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=jis-x0208                . #x3441)       ; �����
     (=gt               . 22918)        ; ������

diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el
index dfc8f91..961107d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R086-Fire.el
+++ b/lisp/utf-2000/Ideograph-R086-Fire.el
@@ -5514,10 +5514,10 @@
     (ideographic-radical . 86) ; ⽕
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 19188)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=ucs              . #x716E)       ; 煮
     (=jis-x0208                . #x3C51)       ; �����

diff --git a/lisp/utf-2000/Ideograph-R094-Dog.el b/lisp/utf-2000/Ideograph-R094-Dog.el
index 171c541..9298086 100644 (file)
--- a/lisp/utf-2000/Ideograph-R094-Dog.el
+++ b/lisp/utf-2000/Ideograph-R094-Dog.el
@@ -3255,10 +3255,10 @@
     (ideographic-radical . 94) ; ⽝
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 20534)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=ucs              . #x732A)       ; 猪
     (=jis-x0208                . #x4376)       ; �����
@@ -3281,13 +3281,13 @@
     (ideographic-radical . 94) ; ⽝
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((shinjigen-1       . 4811)
       (shinjigen-2       . 4813)
       (=jis-x0208        . #x605A)     ; �����
       (=daikanwa         . 20768)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      shinjigen-1)
     (shinjigen-1       . 4810)
     (=ucs              . #x731F)       ; 猟
@@ -5890,13 +5890,13 @@
     (ideographic-radical . 94) ; ⽝
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (<-simplified-ideograph
+    (<-simplified
      ((shinjigen-1       . 4843)
       (shinjigen-2       . 4843)
       (=jis-x0208        . #x6059)     ; �����
       (=daikanwa         . 20775)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      shinjigen-1)
     (shinjigen-1       . 4842)
     (=ucs              . #x7363)       ; 獣

diff --git a/lisp/utf-2000/Ideograph-R108-Dish.el b/lisp/utf-2000/Ideograph-R108-Dish.el
index df59b8c..fa707b6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R108-Dish.el
+++ b/lisp/utf-2000/Ideograph-R108-Dish.el
@@ -799,10 +799,10 @@
     (ideographic-radical . 108)        ; ⽫
     (ideographic-strokes . 6)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 23005)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=ucs              . #x76DB)       ; 盛
     (=jis-x0208                . #x4039)       ; �����

diff --git a/lisp/utf-2000/Ideograph-R113-Spirit.el b/lisp/utf-2000/Ideograph-R113-Spirit.el
index 2dcefb8..698ef4f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R113-Spirit.el
+++ b/lisp/utf-2000/Ideograph-R113-Spirit.el
@@ -3271,10 +3271,10 @@
     (ideographic-radical . 113)        ; ⽰
     (ideographic-strokes . 9)
     (total-strokes      . 14)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 24835)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=jis-x0208                . #x4135)       ; �����
     (=gt               . 31813)        ; ������

diff --git a/lisp/utf-2000/Ideograph-R117-Stand.el b/lisp/utf-2000/Ideograph-R117-Stand.el
index c034342..02d98b8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R117-Stand.el
+++ b/lisp/utf-2000/Ideograph-R117-Stand.el
@@ -26,7 +26,7 @@
   '((ideographic-radical . 117)        ; ⽴
     (ideographic-strokes . 0)
     (total-strokes      . 5)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 25761)      ; �����
       ))
     (=big5-cdp         . #x8BAE)       ; ������

diff --git a/lisp/utf-2000/Ideograph-R138-Stopping.el b/lisp/utf-2000/Ideograph-R138-Stopping.el
index ffe4d2f..5fac0dc 100644 (file)
--- a/lisp/utf-2000/Ideograph-R138-Stopping.el
+++ b/lisp/utf-2000/Ideograph-R138-Stopping.el
@@ -44,7 +44,7 @@
     (<-ideographic-component-forms
      ((=daikanwa         . 30597)      ; �����
       ))
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 30597)      ; �����
       ))
     (=big5-cdp         . #x8C42)       ; ������

diff --git a/lisp/utf-2000/Ideograph-R156-Run.el b/lisp/utf-2000/Ideograph-R156-Run.el
index 4b285cc..712636c 100644 (file)
--- a/lisp/utf-2000/Ideograph-R156-Run.el
+++ b/lisp/utf-2000/Ideograph-R156-Run.el
@@ -19,10 +19,10 @@
     (ideographic-radical . 156)        ; ⾛
     (ideographic-strokes . 0)
     (total-strokes      . 6)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 37034)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=ucs              . #x8D71)       ; 赱
     (=jis-x0208                . #x6C61)       ; �����

diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el
index 7cdf4b0..b740fe1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R162-Walk.el
+++ b/lisp/utf-2000/Ideograph-R162-Walk.el
@@ -5810,12 +5810,12 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (<-simplified-ideograph
+    (<-simplified
      ((shinjigen-1       . 8337)
       (=jis-x0208        . #x6E2F)     ; �����
       (=daikanwa         . 39113)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      jii daikanwa shinjigen-1)
     (shinjigen-1       . 8336)
     (=ucs              . #x9045)       ; 遅

diff --git a/lisp/utf-2000/Ideograph-R164-Wine.el b/lisp/utf-2000/Ideograph-R164-Wine.el
index 9dc19c7..957a332 100644 (file)
--- a/lisp/utf-2000/Ideograph-R164-Wine.el
+++ b/lisp/utf-2000/Ideograph-R164-Wine.el
@@ -2634,7 +2634,7 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 10)
     (total-strokes      . 17)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x91AC)     ; 醬
       ))
     (=ucs              . #x91A4)       ; 醤
@@ -2934,7 +2934,7 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 9)
     (total-strokes      . 16)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x91B1)     ; 醱
       ))
     (=ucs              . #x9197)       ; 醗
@@ -3152,7 +3152,7 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 13)
     (total-strokes      . 20)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 40099)      ; �����
       ))
     (=ucs              . #x91B8)       ; 醸

diff --git a/lisp/utf-2000/Ideograph-R165-Distinguish.el b/lisp/utf-2000/Ideograph-R165-Distinguish.el
index 1b70700..8058a55 100644 (file)
--- a/lisp/utf-2000/Ideograph-R165-Distinguish.el
+++ b/lisp/utf-2000/Ideograph-R165-Distinguish.el
@@ -91,7 +91,7 @@
     (ideographic-radical . 165)        ; ⾤
     (ideographic-strokes . 4)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 40129)      ; �����
       ))
     (=ucs              . #x91C8)       ; 釈

diff --git a/lisp/utf-2000/Ideograph-R167-Gold.el b/lisp/utf-2000/Ideograph-R167-Gold.el
index 1e55181..54b189a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R167-Gold.el
+++ b/lisp/utf-2000/Ideograph-R167-Gold.el
@@ -472,7 +472,7 @@
     (ideographic-radical . 167)        ; ⾦
     (ideographic-strokes . 3)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x91F0)     ; 釰
       ))
     (=ucs              . #x91FC)       ; 釼
@@ -483,7 +483,7 @@
     (ideographic-radical . 167)        ; ⾦
     (ideographic-strokes . 3)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x91F0)     ; 釰
       ))
     (=jis-x0208                . #x6E5F)       ; �����
@@ -1368,7 +1368,7 @@
   '((ideographic-radical . 167)        ; ⾦
     (ideographic-strokes . 4)
     (total-strokes      . 12)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x9438)     ; 鐸
       ))
     (=ucs              . #x922C)       ; 鈬

diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el
index 03c7a25..a1f76b2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R170-Mound.el
+++ b/lisp/utf-2000/Ideograph-R170-Mound.el
@@ -2159,7 +2159,7 @@
     (ideographic-radical . 170)        ; ⾩
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 41874)      ; �����
       ))
     (=ucs              . #x967A)       ; 険
@@ -3483,10 +3483,10 @@
     (ideographic-radical . 170)        ; ⾩
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 41891)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      songyuan-yilai-suzipu daikanwa)
     (=gt               . 56167)        ; ������
     (=gt-pj-7          . #x7426)       ; ������

diff --git a/lisp/utf-2000/Ideograph-R181-Leaf.el b/lisp/utf-2000/Ideograph-R181-Leaf.el
index cdc56e6..a283fd4 100644 (file)
--- a/lisp/utf-2000/Ideograph-R181-Leaf.el
+++ b/lisp/utf-2000/Ideograph-R181-Leaf.el
@@ -1870,7 +1870,7 @@
     (ideographic-radical . 181)        ; ⾴
     (ideographic-strokes . 6)
     (total-strokes      . 15)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x9830)     ; 頰
       ))
     (=ucs              . #x982C)       ; 頬

diff --git a/lisp/utf-2000/Ideograph-R211-Tooth.el b/lisp/utf-2000/Ideograph-R211-Tooth.el
index 14a788b..9c2bc60 100644 (file)
--- a/lisp/utf-2000/Ideograph-R211-Tooth.el
+++ b/lisp/utf-2000/Ideograph-R211-Tooth.el
@@ -508,7 +508,7 @@
     (ideographic-radical . 211)        ; ⿒
     (ideographic-strokes . 5)
     (total-strokes      . 17)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 48632)      ; �����
       ))
     (=jis-x0208                . #x4E70)       ; �����

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index f84f5f2..3363fbf 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,6 +1,6 @@
 ;;; char-db-util.el --- Character Database utility
 
-;; Copyright (C) 1998,1999,2000,2001,2002,2003 MORIOKA Tomohiko.
+;; Copyright (C) 1998,1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, Unicode, UCS-4, MULE.
@@ -918,9 +918,10 @@
                              ancient-ideograph-of
                              vulgar-ideograph-of
                              wrong-ideograph-of
-                             simplified-ideograph-of
+                              ;; simplified-ideograph-of
                              ideographic-variants
-                             ideographic-different-form-of))
+                              ;; ideographic-different-form-of
+                             ))
                 (insert (format "(%-18s%s " name line-breaking))
                 (setq lbs (concat "\n" (make-string (current-column) ?\ ))
                       separator nil)
@@ -940,21 +941,7 @@
                   (setq value (cdr value)))
                 (insert ")")
                 (insert line-breaking))
-                ;; ((string-match "^->" (symbol-name name))
-                ;;  (insert
-                ;;   (format "(%-18s %s)%s"
-                ;;           name
-                ;;           (mapconcat (lambda (code)
-                ;;                        (cond ((symbolp code)
-                ;;                               (symbol-name code))
-                ;;                              ((integerp code)
-                ;;                               (format "#x%04X" code))
-                ;;                              (t
-                ;;                               (format "%s%S"
-                ;;                                       line-breaking code))))
-                ;;                      value " ")
-                ;;           line-breaking)))
-               ((consp value)
+                ((consp value)
                 (insert (format "(%-18s " name))
                 (setq lbs (concat "\n" (make-string (current-column) ?\ ))
                       separator nil)