Rename `<-simplified-ideograph' to `<-simplified'.

diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el
index 606b36b..065883b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R002-Line.el
+++ b/lisp/utf-2000/Ideograph-R002-Line.el
@@ -419,7 +419,7 @@
   '((ideographic-radical . 2)  ; ⼁
     (ideographic-strokes . 7)
     (total-strokes      . 8)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 00084)      ; �����
       ))
     (=big5-cdp         . #x89CD)       ; ������

diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index ca1445f..0a4a9b2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -190,7 +190,7 @@
   '((ideographic-radical . 8)  ; ⼇
     (ideographic-strokes . 3)
     (total-strokes      . 5)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 45313)      ; �����
       ))
     (ideographic-structure
@@ -698,7 +698,7 @@
   '((ideographic-radical . 8)  ; ⼇
     (ideographic-strokes . 5)
     (total-strokes      . 7)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 45313)      ; �����
       ))
     (ideographic-structure

diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index ebbeab6..c566f8f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -4604,7 +4604,7 @@
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 8)
     (total-strokes      . 10)
-    (<-simplified-ideograph
+    (<-simplified
      (:char    ((shinjigen-1        . 653)
                 (=daikanwa          . 02228)   ; �����
                 )
@@ -4636,7 +4636,7 @@
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 8)
     (total-strokes      . 10)
-    (<-simplified-ideograph
+    (<-simplified
      (:sources (shinjigen-1)
       :char    ((shinjigen-1        . 659)
                 (=jis-x0208         . #x517D)  ; �����
@@ -5348,7 +5348,7 @@
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 9)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x5294)     ; 劔
       ))
     (=jef-china3       . #x44CF)       ; �����
@@ -5358,7 +5358,7 @@
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 9)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x5294)     ; 劔
       ))
     (ideographic-structure
@@ -5377,7 +5377,7 @@
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 9)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=jis-x0208        . #x5179)     ; �����
       (=daikanwa         . 02245)      ; �����
       ))

diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el
index 14734aa..4f66243 100644 (file)
--- a/lisp/utf-2000/Ideograph-R019-Power.el
+++ b/lisp/utf-2000/Ideograph-R019-Power.el
@@ -742,7 +742,7 @@
     (ideographic-radical . 19) ; ⼒
     (ideographic-strokes . 5)
     (total-strokes      . 7)
-    (<-simplified-ideograph
+    (<-simplified
      (:sources (sougen-irai-zokujifu morohashi-daikanwa shinjigen-1)
       :char    ((shinjigen-1        . 716)
                 (=daikanwa          . 02472)   ; �����
@@ -2774,10 +2774,10 @@
     (ideographic-radical . 19) ; ⼒
     (ideographic-strokes . 10)
     (total-strokes      . 12)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 02424)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (<-vulgar-ideograph
      ((shinjigen-1       . 744)
@@ -3185,7 +3185,7 @@
     (ideographic-radical . 19) ; ⼒
     (ideographic-strokes . 11)
     (total-strokes      . 13)
-    (<-simplified-ideograph
+    (<-simplified
      (:char    ((shinjigen-1        . 751)
                 (=daikanwa          . 02486)   ; �����
                 )

diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index a3e1ef6..cc518ca 100644 (file)
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -89,7 +89,7 @@
     (ideographic-radical . 23) ; ⼖
     (ideographic-strokes . 2)
     (total-strokes      . 4)
-    (<-simplified-ideograph
+    (<-simplified
      (:sources (morohashi-daikanwa)
       :char    ((=daikanwa          . 02691)   ; �����
                 )
@@ -111,7 +111,7 @@
     (ideographic-radical . 23) ; ⼖
     (ideographic-strokes . 2)
     (total-strokes      . 4)
-    (<-simplified-ideograph
+    (<-simplified
      (:sources (shinjigen-1)
       :char    ((shinjigen-1        . 802)
                 (=daikanwa          . 02691)   ; �����

diff --git a/lisp/utf-2000/Ideograph-R024-Ten.el b/lisp/utf-2000/Ideograph-R024-Ten.el
index ca8a95f..d98acd3 100644 (file)
--- a/lisp/utf-2000/Ideograph-R024-Ten.el
+++ b/lisp/utf-2000/Ideograph-R024-Ten.el
@@ -371,7 +371,7 @@
   '((ideographic-radical . 24) ; ⼗
     (ideographic-strokes . 3)
     (total-strokes      . 5)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 07833)      ; �����
       ))
     (=big5-cdp         . #x8B75)       ; ������
@@ -1094,7 +1094,7 @@
     (ideographic-radical . 24) ; ⼗
     (ideographic-strokes . 7)
     (total-strokes      . 9)
-    (<-simplified-ideograph
+    (<-simplified
      (:char    ((shinjigen-1        . 1170)
                 (=daikanwa          . 03993)   ; �����
                 )

diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el
index d07598a..a1b6c61 100644 (file)
--- a/lisp/utf-2000/Ideograph-R027-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R027-Cliff.el
@@ -3028,7 +3028,7 @@
     (ideographic-radical . 27) ; ⼚
     (ideographic-strokes . 15)
     (total-strokes      . 17)
-    (<-simplified-ideograph
+    (<-simplified
      (:sources (morohashi-daikanwa shinjigen-1)
       :char    ((ideographic-radical . 30)     ; ⼝
                 (shinjigen-1        . 1286)

diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el
index 4b3bc71..44ea7fb 100644 (file)
--- a/lisp/utf-2000/Ideograph-R028-Private.el
+++ b/lisp/utf-2000/Ideograph-R028-Private.el
@@ -590,7 +590,7 @@
     (ideographic-radical . 28) ; ⼛
     (ideographic-strokes . 6)
     (total-strokes      . 8)
-    (<-simplified-ideograph
+    (<-simplified
      (:sources (morohashi-daikanwa shinjigen-1)
       :char    ((shinjigen-1        . 893)
                 (=daikanwa          . 03098)   ; �����

diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index 9a6bc3a..921f1a6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -29823,10 +29823,10 @@
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 15)
     (total-strokes      . 18)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 04633)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=ucs              . #x56A2)       ; 嚢
     (=jis-x0208-1983   . #x4739)       ; �����

diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el
index 388e101..ff54a56 100644 (file)
--- a/lisp/utf-2000/Ideograph-R031-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el
@@ -1185,7 +1185,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 b52a170..376291d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -3135,7 +3135,7 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 6)
     (total-strokes      . 9)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 05120)      ; �����
       ))
     (hanyu-dazidian    1 438 7)
@@ -6909,10 +6909,10 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 9)
     (total-strokes      . 12)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 05574)      ; �����
       ))
-    (<-simplified-ideograph*sources
+    (<-simplified*sources
      daikanwa)
     (=ucs              . #x5841)       ; 塁
     (=jis-x0208                . #x4E5D)       ; �����
@@ -7041,7 +7041,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 be9f8d7..33a1520 100644 (file)
--- a/lisp/utf-2000/Ideograph-R036-Evening.el
+++ b/lisp/utf-2000/Ideograph-R036-Evening.el
@@ -796,11 +796,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 a697b8f..539d47c 100644 (file)
--- a/lisp/utf-2000/Ideograph-R037-Big.el
+++ b/lisp/utf-2000/Ideograph-R037-Big.el
@@ -651,7 +651,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 1a1a800..65c096d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R041-Inch.el
+++ b/lisp/utf-2000/Ideograph-R041-Inch.el
@@ -684,7 +684,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 bc1aaeb..24170c8 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-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el
index 667f6eb..e3ff7fd 100644 (file)
--- a/lisp/utf-2000/Ideograph-R064-Hand.el
+++ b/lisp/utf-2000/Ideograph-R064-Hand.el
@@ -7974,7 +7974,7 @@
     (ideographic-radical . 64) ; ⼿
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      (:sources (morohashi-daikanwa)
       :char    ((=daikanwa          . 12389)   ; �����
                 )
@@ -10084,7 +10084,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 ab125e4..bbe073b 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 ff29a47..fb3ad0c 100644 (file)
--- a/lisp/utf-2000/Ideograph-R075-Tree.el
+++ b/lisp/utf-2000/Ideograph-R075-Tree.el
@@ -12818,10 +12818,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)       ; �����
     ))

diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 96edc03..9951fb6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -4865,10 +4865,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)      ; 海
@@ -6500,10 +6500,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)       ; �����
@@ -6639,7 +6639,7 @@
   '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (<-simplified-ideograph
+    (<-simplified
      ((=jis-x0208-1978   . #x4642)     ; �����
       (=jis-x0213-1-2000  . #x773D)    ; �����
       (=daikanwa         . 18591)      ; �����
@@ -8755,10 +8755,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)       ; 渇
@@ -14270,10 +14270,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 1702a3f..93f2dca 100644 (file)
--- a/lisp/utf-2000/Ideograph-R086-Fire.el
+++ b/lisp/utf-2000/Ideograph-R086-Fire.el
@@ -5479,10 +5479,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 896922d..b86228f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R094-Dog.el
+++ b/lisp/utf-2000/Ideograph-R094-Dog.el
@@ -3196,10 +3196,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)       ; �����
@@ -3221,13 +3221,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)       ; 猟
@@ -5782,13 +5782,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 bc79201..c3a13c8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R108-Dish.el
+++ b/lisp/utf-2000/Ideograph-R108-Dish.el
@@ -779,10 +779,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 8dbf2e3..cc60ac9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R113-Spirit.el
+++ b/lisp/utf-2000/Ideograph-R113-Spirit.el
@@ -3241,10 +3241,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 27389c7..4070309 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 8c5b356..29bcd5a 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 0722c1e..1ddfc69 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 28905e7..1bb91b2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R162-Walk.el
+++ b/lisp/utf-2000/Ideograph-R162-Walk.el
@@ -5737,12 +5737,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 7a9aa4e..378e49b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R164-Wine.el
+++ b/lisp/utf-2000/Ideograph-R164-Wine.el
@@ -2631,7 +2631,7 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 10)
     (total-strokes      . 17)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x91AC)     ; 醬
       ))
     (=ucs              . #x91A4)       ; 醤
@@ -2931,7 +2931,7 @@
     (ideographic-radical . 164)        ; ⾣
     (ideographic-strokes . 9)
     (total-strokes      . 16)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs              . #x91B1)     ; 醱
       ))
     (=ucs              . #x9197)       ; 醗
@@ -3142,7 +3142,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 1b5a878..af4c40a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R165-Distinguish.el
+++ b/lisp/utf-2000/Ideograph-R165-Distinguish.el
@@ -90,7 +90,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 501781a..8042943 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 d983c1f..56c5c80 100644 (file)
--- a/lisp/utf-2000/Ideograph-R170-Mound.el
+++ b/lisp/utf-2000/Ideograph-R170-Mound.el
@@ -2146,7 +2146,7 @@
     (ideographic-radical . 170)        ; ⾩
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 41874)      ; �����
       ))
     (=ucs              . #x967A)       ; 険
@@ -3467,10 +3467,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 aa4b9d9..fb1a0e3 100644 (file)
--- a/lisp/utf-2000/Ideograph-R181-Leaf.el
+++ b/lisp/utf-2000/Ideograph-R181-Leaf.el
@@ -1868,7 +1868,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 2a587b0..a31ddc4 100644 (file)
--- a/lisp/utf-2000/Ideograph-R211-Tooth.el
+++ b/lisp/utf-2000/Ideograph-R211-Tooth.el
@@ -505,7 +505,7 @@
     (ideographic-radical . 211)        ; ⿒
     (ideographic-strokes . 5)
     (total-strokes      . 17)
-    (<-simplified-ideograph
+    (<-simplified
      ((=daikanwa         . 48632)      ; �����
       ))
     (=jis-x0208                . #x4E70)       ; �����