Reformatted.

diff --git a/lisp/utf-2000/Ideograph-R013-Down-Box.el b/lisp/utf-2000/Ideograph-R013-Down-Box.el
index aace78a..fd02a53 100644 (file)
--- a/lisp/utf-2000/Ideograph-R013-Down-Box.el
+++ b/lisp/utf-2000/Ideograph-R013-Down-Box.el
@@ -609,7 +609,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((=big5-cdp         . #x8A78)     ; ������
+     ((name*             . "ideographic component hood")
+      (=big5-cdp         . #x8A78)     ; ������
       )
      ((=big5-cdp         . #x8958)     ; ������
       ))
@@ -724,7 +725,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((=big5-cdp         . #x8A78)     ; ������
+     ((name*             . "ideographic component hood")
+      (=big5-cdp         . #x8A78)     ; ������
       )
      ((ucs               . #x76EE)     ; 目
       ))
@@ -836,7 +838,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((=big5-cdp         . #x8A78)     ; ������
+     ((name*             . "ideographic component hood")
+      (=big5-cdp         . #x8A78)     ; ������
       )
      ((ucs               . #x5401)     ; 吁
       ))
@@ -895,7 +898,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((=big5-cdp         . #x8A78)     ; ������
+     ((name*             . "ideographic component hood")
+      (=big5-cdp         . #x8A78)     ; ������
       )
      ((ucs               . #x898B)     ; 見
       ))
@@ -929,7 +933,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((=big5-cdp         . #x8A78)     ; ������
+     ((name*             . "ideographic component hood")
+      (=big5-cdp         . #x8A78)     ; ������
       )
      ((ucs               . #x514D)     ; 免
       ))

diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el
index 179c23b..82d5988 100644 (file)
--- a/lisp/utf-2000/Ideograph-R016-Table.el
+++ b/lisp/utf-2000/Ideograph-R016-Table.el
@@ -893,10 +893,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs               . #x2FF3)     ; ⿳
       )
-     ((ideograph-gt-pj-9  . #x4D4C)    ; ������
+     ((name*             . "ideographic component person as roof")
       (=big5-cdp         . #x8B5D)     ; ������
-      (=gt-k             . 00057)      ; ������
-      (=jef-china3       . #x71FA)     ; �����
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")

diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index 52ccbd3..4632a44 100644 (file)
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -7727,8 +7727,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs               . #x2FF0)     ; ⿰
       )
-     ((ideograph-gt-pj-k1 . #x3521)    ; ������
-      (=gt-k             . 03992)      ; ������
+     ((=gt-k             . 03992)      ; ������
       )
      ((=jis-x0208        . #x5163)     ; �����
       (ideograph-daikanwa . 01849)     ; �����
@@ -7749,8 +7748,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs               . #x2FF0)     ; ⿰
       )
-     ((ideograph-gt-pj-k1 . #x3521)    ; ������
-      (=gt-k             . 03992)      ; ������
+     ((=gt-k             . 03992)      ; ������
       )
      ((=jis-x0208        . #x3F4F)     ; �����
       (chinese-cns11643-6 . #x2138)    ; �����
@@ -7770,8 +7768,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs               . #x2FF0)     ; ⿰
       )
-     ((ideograph-gt-pj-k1 . #x3521)    ; ������
-      (=gt-k             . 03992)      ; ������
+     ((=gt-k             . 03992)      ; ������
       )
      ((ucs               . #x5203)     ; 刃
       ))

diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el
index 59133af..a8e2e6d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R019-Power.el
+++ b/lisp/utf-2000/Ideograph-R019-Power.el
@@ -2208,7 +2208,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((=big5-cdp         . #x8A78)     ; ������
+     ((name*             . "ideographic component hood")
+      (=big5-cdp         . #x8A78)     ; ������
       )
      ((ucs               . #x52A9)     ; 助
       ))

diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el
index b0a7b06..c807672 100644 (file)
--- a/lisp/utf-2000/Ideograph-R028-Private.el
+++ b/lisp/utf-2000/Ideograph-R028-Private.el
@@ -549,10 +549,8 @@
       )
      ((ucs               . #x53BD)     ; 厽
       )
-     ((ideograph-gt-pj-9  . #x4D4C)    ; ������
+     ((name*             . "ideographic component person as roof")
       (=big5-cdp         . #x8B5D)     ; ������
-      (=gt-k             . 00057)      ; ������
-      (=jef-china3       . #x71FA)     ; �����
       ))
     (ideograph-daikanwa . 03088)       ; �����
     ))

diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index e53ecc7..0b57559 100644 (file)
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -1196,18 +1196,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (ucs                . #x2FF1)   ; ⿱
-       )
-       ((ideograph-gt-pj-9  . #x4D4C)  ; ������
-       (=big5-cdp          . #x8B5D)   ; ������
-       (=gt-k              . 00057)    ; ������
-       (=jef-china3        . #x71FA)   ; �����
-       )
-       ((ucs               . #x4E00)   ; 一
-       ))
-      (=big5-cdp         . #x8AFC)     ; ������
+     ((=big5-cdp         . #x8AFC)     ; ������
       )
      ((ucs               . #x53E3)     ; 口
       ))
@@ -5214,18 +5203,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (ucs                . #x2FF1)   ; ⿱
-       )
-       ((ideograph-gt-pj-9  . #x4D4C)  ; ������
-       (=big5-cdp          . #x8B5D)   ; ������
-       (=gt-k              . 00057)    ; ������
-       (=jef-china3        . #x71FA)   ; �����
-       )
-       ((ucs               . #x4E00)   ; 一
-       ))
-      (=big5-cdp         . #x8AFC)     ; ������
+     ((=big5-cdp         . #x8AFC)     ; ������
       )
      ((ucs               . #x53E9)     ; 叩
       ))
@@ -7136,15 +7114,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (ucs                . #x2FF1)   ; ⿱
-       )
-       ((=jis-x0208        . #x5035)   ; �����
-       )
-       ((ucs               . #x53E3)   ; 口
-       ))
-      (=big5-cdp         . #x8BAA)     ; ������
+     ((=big5-cdp         . #x8BAA)     ; ������
       )
      ((ucs               . #x5184)     ; 冄
       ))
@@ -7164,11 +7134,10 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (ucs                . #x2FF1)   ; ⿱
        )
-       ((=jis-x0208        . #x5035)   ; �����
+       ((ucs               . #x4EA0)   ; 亠
        )
        ((ucs               . #x53E3)   ; 口
        ))
-      (=big5-cdp         . #x8BAA)     ; ������
       )
      ((ucs               . #x5184)     ; 冄
       ))
@@ -12965,6 +12934,7 @@
       (ucs               . #x2FF1)     ; ⿱
       )
      ((ideograph-daikanwa . 13145)     ; �����
+      (=big5-cdp         . #x8CB6)     ; ������
       )
      ((ucs               . #x53E3)     ; 口
       ))
@@ -24681,17 +24651,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-       (ucs                . #x2FF3)   ; ⿳
-       )
-       ((=jis-x0208        . #x5035)   ; �����
-       )
-       ((ucs               . #x53E3)   ; 口
-       )
-       ((ucs               . #x5196)   ; 冖
-       ))
-      (=big5-cdp         . #x8C4D)     ; ������
+     ((=big5-cdp         . #x8C4D)     ; ������
       )
      ((ucs               . #x4E9E)     ; 亞
       ))

diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el
index 993bfdb..5fcf067 100644 (file)
--- a/lisp/utf-2000/Ideograph-R037-Big.el
+++ b/lisp/utf-2000/Ideograph-R037-Big.el
@@ -2575,10 +2575,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((ideograph-gt-pj-9  . #x4D4C)    ; ������
+     ((name*             . "ideographic component person as roof")
       (=big5-cdp         . #x8B5D)     ; ������
-      (=gt-k             . 00057)      ; ������
-      (=jef-china3       . #x71FA)     ; �����
       )
      ((=big5-cdp         . #x857C)     ; ������
       ))

diff --git a/lisp/utf-2000/Ideograph-R050-Turban.el b/lisp/utf-2000/Ideograph-R050-Turban.el
index 2177667..353c6cd 100644 (file)
--- a/lisp/utf-2000/Ideograph-R050-Turban.el
+++ b/lisp/utf-2000/Ideograph-R050-Turban.el
@@ -585,18 +585,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (ucs                . #x2FF1)   ; ⿱
-       )
-       ((ideograph-gt-pj-9  . #x4D4C)  ; ������
-       (=big5-cdp          . #x8B5D)   ; ������
-       (=gt-k              . 00057)    ; ������
-       (=jef-china3        . #x71FA)   ; �����
-       )
-       ((ucs               . #x4E00)   ; 一
-       ))
-      (=big5-cdp         . #x8AFC)     ; ������
+     ((=big5-cdp         . #x8AFC)     ; ������
       )
      ((ucs               . #x5E00)     ; 帀
       ))

diff --git a/lisp/utf-2000/Ideograph-R059-Bristle.el b/lisp/utf-2000/Ideograph-R059-Bristle.el
index 849cf5e..5d1ee74 100644 (file)
--- a/lisp/utf-2000/Ideograph-R059-Bristle.el
+++ b/lisp/utf-2000/Ideograph-R059-Bristle.el
@@ -57,10 +57,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((ideograph-gt-pj-9  . #x4D4C)    ; ������
+     ((name*             . "ideographic component person as roof")
       (=big5-cdp         . #x8B5D)     ; ������
-      (=gt-k             . 00057)      ; ������
-      (=jef-china3       . #x71FA)     ; �����
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")

diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el
index 486c91d..d5631ee 100644 (file)
--- a/lisp/utf-2000/Ideograph-R061-Heart.el
+++ b/lisp/utf-2000/Ideograph-R061-Heart.el
@@ -2019,18 +2019,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (ucs                . #x2FF1)   ; ⿱
-       )
-       ((ideograph-gt-pj-9  . #x4D4C)  ; ������
-       (=big5-cdp          . #x8B5D)   ; ������
-       (=gt-k              . 00057)    ; ������
-       (=jef-china3        . #x71FA)   ; �����
-       )
-       ((ucs               . #x4E00)   ; 一
-       ))
-      (=big5-cdp         . #x8AFC)     ; ������
+     ((=big5-cdp         . #x8AFC)     ; ������
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2560,18 +2549,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs               . #x2FF1)     ; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (ucs                . #x2FF1)   ; ⿱
-       )
-       ((ideograph-gt-pj-9  . #x4D4C)  ; ������
-       (=big5-cdp          . #x8B5D)   ; ������
-       (=gt-k              . 00057)    ; ������
-       (=jef-china3        . #x71FA)   ; �����
-       )
-       ((ucs               . #x4E00)   ; 一
-       ))
-      (=big5-cdp         . #x8AFC)     ; ������
+     ((=big5-cdp         . #x8AFC)     ; ������
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")

diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index 5b78eb5..ed377e8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R062-Halberd.el
+++ b/lisp/utf-2000/Ideograph-R062-Halberd.el
@@ -1089,10 +1089,8 @@
        ((ucs               . #x6210)   ; 成
        ))
       )
-     ((ideograph-gt-pj-9  . #x4D4C)    ; ������
+     ((name*             . "ideographic component person as roof")
       (=big5-cdp         . #x8B5D)     ; ������
-      (=gt-k             . 00057)      ; ������
-      (=jef-china3       . #x71FA)     ; �����
       ))
     (chinese-cns11643-5                . #x3F46)       ; �����
     (ideograph-daikanwa                . 11626)        ; �����