- Add some missing `ideographic-structure' properties.

[chise/xemacs-chise.git-] / lisp / utf-2000 / Ideograph-R031-Enclosure.el

diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el
index a9e03c8..3b982be 100644 (file)
--- a/lisp/utf-2000/Ideograph-R031-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el
@@ -2,6 +2,9 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 0)
     (total-strokes      . 3)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 710)
+    (hanyu-dazidian-char . 8)
     (shinjigen-2       . 1298)
     (japanese-jisx0208-1978    . #x5378)       ; �����
     (chinese-gb2312            . #x606D)       ; �����
@@ -31,9 +34,21 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 2)
     (total-strokes      . 5)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 711)
+    (hanyu-dazidian-char . 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
+      )
+     ((ucs               . #x56D7)     ; 囗
+      )
+     ((chinese-big5-cdp          . #x8C78)     ; ������
+      ))
     (japanese-jisx0212 . #x3672)       ; �����
     (chinese-cns11643-4 . #x216F)      ; �����
     (ideograph-daikanwa . 04678)       ; �����
+    (chinese-big5-cdp  . #x8DE5)       ; ������
     (ucs               . #x56D9)       ; 囙
     ))
 (define-char
@@ -74,11 +89,12 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 2)
     (total-strokes      . 5)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 710)
+    (hanyu-dazidian-char . 13)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -99,10 +115,8 @@
     (ideographic-strokes . 2)
     (total-strokes      . 5)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -136,6 +150,9 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 2)
     (total-strokes      . 5)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 710)
+    (hanyu-dazidian-char . 16)
     (chinese-gb2312    . #x4B44)       ; �����
     (chinese-isoir165  . #x4B44)       ; �����
     (chinese-cns11643-1 . #x463E)      ; �����
@@ -149,6 +166,7 @@
     (japanese-jisx0212 . #x3673)       ; �����
     (chinese-cns11643-4 . #x216D)      ; �����
     (ideograph-daikanwa . 04683)       ; �����
+    (china3-jef                . #x47BD)       ; �����
     (ucs               . #x56DC)       ; 囜
     ))
 (define-char
@@ -177,11 +195,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 3)
     (total-strokes      . 6)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 713)
+    (hanyu-dazidian-char . 7)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -193,6 +212,7 @@
     (chinese-cns11643-1 . #x4760)      ; �����
     (chinese-big5      . #xA65F)       ; �����
     (ideograph-daikanwa . 04688)       ; �����
+    (china3-jef                . #x8EBB)       ; �����
     (ucs               . #x56DD)       ; 囝
     ))
 (define-char
@@ -206,11 +226,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 3)
     (total-strokes      . 6)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 712)
+    (hanyu-dazidian-char . 2)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -232,15 +253,16 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 3)
     (total-strokes      . 6)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 713)
+    (hanyu-dazidian-char . 3)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((chinese-big5-cdp          . #x8CC8)     ; ������
       )
-     ((chinese-big5-cdp          . #x8B49)     ; ������
+     ((ucs               . #x3405)     ; 㐅
       ))
     (chinese-gb2312            . #x5836)       ; �����
     (japanese-jisx0212         . #x3675)       ; �����
@@ -269,11 +291,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 3)
     (total-strokes      . 6)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 711)
+    (hanyu-dazidian-char . 9)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -303,7 +326,11 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 3)
     (total-strokes      . 6)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 711)
+    (hanyu-dazidian-char . 7)
     (ideograph-daikanwa . 04695)       ; �����
+    (chinese-big5-cdp  . #x8668)       ; ������
     ))
 (define-char
   '((morohashi-daikanwa        4695 0 8)
@@ -317,11 +344,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 3)
     (total-strokes      . 6)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 713)
+    (hanyu-dazidian-char . 8)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -395,28 +423,31 @@
     (ideographic-strokes . 4)
     (total-strokes      . 7)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
-     ((ideograph-daikanwa . 07828)     ; �����
+     ((japanese-jisx0208-1978    . #x4656)     ; �����
+      (japanese-jisx0208         . #x4656)     ; �����
+      (korean-ksc5601            . #x546A)     ; �����
+      (ideograph-daikanwa        . 07828)      ; �����
       ))
     (japanese-jisx0212 . #x3677)       ; �����
     (ideograph-daikanwa . 04704)       ; �����
+    (china3-jef                . #x47BE)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        4704 0 0)
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 4)
     (total-strokes      . 7)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 714)
+    (hanyu-dazidian-char . 11)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -433,17 +464,19 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 4)
     (total-strokes      . 7)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 715)
+    (hanyu-dazidian-char . 15)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
      ((japanese-jisx0208-1978    . #x5036)     ; �����
       (japanese-jisx0208         . #x5036)     ; �����
       (korean-ksc5601            . #x7971)     ; �����
+      (ideograph-daikanwa        . 00288)      ; �����
       ))
     (japanese-jisx0212 . #x3678)       ; �����
     (chinese-big5      . #xCAA9)       ; �����
@@ -455,10 +488,8 @@
     (ideographic-strokes . 4)
     (total-strokes      . 7)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -489,11 +520,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 4)
     (total-strokes      . 7)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 715)
+    (hanyu-dazidian-char . 12)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56DB)     ; 四
       )
@@ -503,6 +535,7 @@
     (chinese-cns11643-2 . #x2348)      ; �����
     (chinese-big5      . #xCAA8)       ; �����
     (ideograph-daikanwa . 04707)       ; �����
+    (china3-jef                . #x47BF)       ; �����
     (ucs               . #x56E7)       ; 囧
     ))
 (define-char
@@ -529,6 +562,7 @@
     (chinese-gb2312    . #x3451)       ; �����
     (chinese-isoir165  . #x3451)       ; �����
     (ideograph-daikanwa . 04710)       ; �����
+    (china3-jef                . #x8CD8)       ; �����
     (ucs               . #x56F1)       ; 囱
     ))
 (define-char
@@ -543,11 +577,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 4)
     (total-strokes      . 7)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 715)
+    (hanyu-dazidian-char . 13)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -593,6 +628,7 @@
     (chinese-isoir165  . #x5430)       ; �����
     (chinese-cns11643-3 . #x252A)      ; �����
     (ideograph-daikanwa . 04714)       ; �����
+    (china3-jef                . #x47C0)       ; �����
     (ideograph-cbeta   . 04414)        ; �����
     (ucs               . #x56ED)       ; 园
     ))
@@ -601,11 +637,12 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 4)
     (total-strokes      . 7)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 715)
+    (hanyu-dazidian-char . 5)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -628,10 +665,8 @@
     (ideographic-strokes . 4)
     (total-strokes      . 7)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -651,11 +686,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 4)
     (total-strokes      . 7)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 714)
+    (hanyu-dazidian-char . 7)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -824,11 +860,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 4)
     (total-strokes      . 7)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 715)
+    (hanyu-dazidian-char . 6)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((chinese-big5-cdp          . #x8CC8)     ; ������
       )
@@ -881,11 +918,20 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (cns-total-strokes . 9)
-    (chinese-cns11643-6 . #x2F5C)      ; �����
     (ideograph-daikanwa . 04736)       ; �����
     ))
 (define-char
+  '((morohashi-daikanwa        4736 0 0)
+    (ideographic-radical . 31) ; ⼞
+    (ideographic-strokes . 6)
+    (total-strokes      . 9)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 717)
+    (hanyu-dazidian-char . 18)
+    (chinese-cns11643-6 . #x2F5C)      ; �����
+    (chinese-big5-cdp  . #x8870)       ; ������
+    ))
+(define-char
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 5)
     (total-strokes      . 8)
@@ -926,11 +972,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 5)
     (total-strokes      . 8)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 717)
+    (hanyu-dazidian-char . 9)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -942,6 +989,7 @@
     (japanese-jisx0213-2       . #x2458)       ; �����
     (chinese-big5              . #xCBF0)       ; �����
     (ideograph-daikanwa                . 04742)        ; �����
+    (china3-jef                        . #x47C1)       ; �����
     (ucs                       . #x56F7)       ; 囷
     ))
 (define-char
@@ -958,14 +1006,15 @@
     (ideographic-strokes . 5)
     (total-strokes      . 8)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
-     ((ideograph-daikanwa . 00387)     ; �����
+     ((japanese-jisx0208-1978    . #x4E61)     ; �����
+      (japanese-jisx0208         . #x4E61)     ; �����
+      (korean-ksc5601            . #x5635)     ; �����
+      (ideograph-daikanwa        . 00387)      ; �����
       ))
     (shinjigen-2       . 1322)
     (japanese-jisx0208-1978    . #x537A)       ; �����
@@ -980,11 +1029,12 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 5)
     (total-strokes      . 8)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 717)
+    (hanyu-dazidian-char . 11)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -999,10 +1049,8 @@
     (ideographic-strokes . 5)
     (total-strokes      . 8)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1016,11 +1064,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 5)
     (total-strokes      . 8)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 716)
+    (hanyu-dazidian-char . 9)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1049,10 +1098,26 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (chinese-cns11643-6 . #x2A41)      ; �����
     (ideograph-daikanwa . 04747)       ; �����
     ))
 (define-char
+  '((morohashi-daikanwa        4747 0 1)
+    (ideographic-radical . 31) ; ⼞
+    (ideographic-strokes . 5)
+    (total-strokes      . 8)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 717)
+    (hanyu-dazidian-char . 3)
+    (chinese-big5-cdp  . #x876C)       ; ������
+    ))
+(define-char
+  '((morohashi-daikanwa        4747 0 9)
+    (ideographic-radical . 31) ; ⼞
+    (ideographic-strokes . 5)
+    (total-strokes      . 8)
+    (chinese-cns11643-6 . #x2A41)      ; �����
+    ))
+(define-char
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 5)
     (total-strokes      . 8)
@@ -1102,6 +1167,7 @@
     (total-strokes      . 8)
     (chinese-gb2312    . #x4D3C)       ; �����
     (chinese-isoir165  . #x4D3C)       ; �����
+    (china3-jef                . #x81D5)       ; �����
     (ucs               . #x56FE)       ; 图
     ))
 (define-char
@@ -1139,11 +1205,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 6)
     (total-strokes      . 9)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 717)
+    (hanyu-dazidian-char . 20)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1328,10 +1395,8 @@
     (ideographic-strokes . 7)
     (total-strokes      . 10)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1339,17 +1404,19 @@
       ))
     (japanese-jisx0212 . #x3723)       ; �����
     (ideograph-daikanwa . 04772)       ; �����
+    (china3-jef                . #x47C2)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        4772 0 0)
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 7)
     (total-strokes      . 10)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 720)
+    (hanyu-dazidian-char . 1)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1371,11 +1438,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 7)
     (total-strokes      . 10)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 719)
+    (hanyu-dazidian-char . 4)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1385,17 +1453,19 @@
     (chinese-cns11643-2 . #x2E4B)      ; �����
     (chinese-big5      . #xD149)       ; �����
     (ideograph-daikanwa . 04773)       ; �����
+    (china3-jef                . #x47C3)       ; �����
     (ucs               . #x5702)       ; 圂
     ))
 (define-char
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 7)
     (total-strokes      . 10)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 718)
+    (hanyu-dazidian-char . 15)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1417,11 +1487,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 7)
     (total-strokes      . 10)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 719)
+    (hanyu-dazidian-char . 1)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1560,11 +1631,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 8)
     (total-strokes      . 11)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 721)
+    (hanyu-dazidian-char . 5)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1583,14 +1655,15 @@
     (ideographic-strokes . 8)
     (total-strokes      . 11)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
-     ((ideograph-daikanwa . 02860)     ; �����
+     ((japanese-jisx0208-1978    . #x524B)     ; �����
+      (japanese-jisx0208         . #x524B)     ; �����
+      (korean-ksc5601            . #x4F69)     ; �����
+      (ideograph-daikanwa        . 02860)      ; �����
       ))
     (shinjigen-2       . 1330)
     (japanese-jisx0208-1978    . #x5421)       ; �����
@@ -1613,11 +1686,12 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 8)
     (total-strokes      . 11)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 721)
+    (hanyu-dazidian-char . 8)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1661,11 +1735,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 8)
     (total-strokes      . 11)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 720)
+    (hanyu-dazidian-char . 7)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1709,10 +1784,8 @@
     (ideographic-strokes . 8)
     (total-strokes      . 11)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1721,17 +1794,19 @@
     (japanese-jisx0212         . #x3726)       ; �����
     (japanese-jisx0213-1       . #x2F41)       ; �����
     (ideograph-daikanwa                . 04797)        ; �����
+    (china3-jef                        . #x47C4)       ; �����
     ))
 (define-char
   '((morohashi-daikanwa        4797 0 4)
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 8)
     (total-strokes      . 11)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 720)
+    (hanyu-dazidian-char . 6)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1749,10 +1824,8 @@
     (ideographic-strokes . 8)
     (total-strokes      . 11)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1764,11 +1837,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 8)
     (total-strokes      . 11)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 720)
+    (hanyu-dazidian-char . 9)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1822,11 +1896,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 9)
     (total-strokes      . 12)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 722)
+    (hanyu-dazidian-char . 12)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1850,11 +1925,12 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 9)
     (total-strokes      . 12)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 722)
+    (hanyu-dazidian-char . 14)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1875,10 +1951,8 @@
     (ideographic-strokes . 9)
     (total-strokes      . 12)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1894,10 +1968,8 @@
     (ideographic-strokes . 9)
     (total-strokes      . 12)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -1996,6 +2068,7 @@
     (japanese-jisx0212 . #x3728)       ; �����
     (chinese-cns11643-4 . #x3C52)      ; �����
     (ideograph-daikanwa . 04816)       ; �����
+    (china3-jef                . #x47C5)       ; �����
     (ucs               . #x5711)       ; 圑
     ))
 (define-char
@@ -2009,11 +2082,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 10)
     (total-strokes      . 13)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 723)
+    (hanyu-dazidian-char . 4)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -2034,11 +2108,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 10)
     (total-strokes      . 13)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 724)
+    (hanyu-dazidian-char . 7)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -2059,11 +2134,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 10)
     (total-strokes      . 13)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 724)
+    (hanyu-dazidian-char . 1)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -2078,8 +2154,17 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (chinese-cns11643-6 . #x5145)      ; �����
-    (ideograph-daikanwa . 04821)       ; �����
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
+      )
+     ((chinese-big5-cdp          . #x8DDD)     ; ������
+      )
+     ((chinese-cns11643-6 . #x2F5C)    ; �����
+      ))
+    (chinese-cns11643-6                . #x5145)       ; �����
+    (ideograph-daikanwa                . 04821)        ; �����
+    (ideograph-hanziku-1       . #xA9A2)       ; ������
     ))
 (define-char
   '((ideographic-radical . 31) ; ⼞
@@ -2092,8 +2177,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 10)
     (total-strokes      . 13)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 724)
+    (hanyu-dazidian-char . 9)
     (chinese-cns11643-6 . #x5147)      ; �����
     (ideograph-daikanwa . 04823)       ; �����
+    (chinese-big5-cdp  . #x8559)       ; ������
     ))
 (define-char
   '((ideographic-radical . 31) ; ⼞
@@ -2172,11 +2261,12 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 11)
     (total-strokes      . 14)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 725)
+    (hanyu-dazidian-char . 6)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -2198,14 +2288,12 @@
     (ideographic-strokes . 11)
     (total-strokes      . 14)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
-     ((chinese-big5-cdp          . #x8BEB)     ; ������
+     ((ucs               . #x555A)     ; 啚
       ))
     (chinese-gb12345   . #x4D3C)       ; 圖
     (mojikyo           . 059291)       ; ������
@@ -2232,11 +2320,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 11)
     (total-strokes      . 14)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 725)
+    (hanyu-dazidian-char . 2)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -2327,11 +2416,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 12)
     (total-strokes      . 15)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 726)
+    (hanyu-dazidian-char . 10)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -2341,6 +2431,7 @@
     (chinese-cns11643-2 . #x4F70)      ; �����
     (chinese-big5      . #xE549)       ; �����
     (ideograph-daikanwa . 04842)       ; �����
+    (china3-jef                . #x47C6)       ; �����
     (ucs               . #x571A)       ; 圚
     ))
 (define-char
@@ -2404,11 +2495,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 13)
     (total-strokes      . 16)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 726)
+    (hanyu-dazidian-char . 15)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -2418,17 +2510,19 @@
     (chinese-cns11643-2 . #x5652)      ; �����
     (chinese-big5      . #xE948)       ; �����
     (ideograph-daikanwa . 04850)       ; �����
+    (china3-jef                . #x47C7)       ; �����
     (ucs               . #x571B)       ; 圛
     ))
 (define-char
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 13)
     (total-strokes      . 16)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 726)
+    (hanyu-dazidian-char . 16)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -2542,8 +2636,12 @@
   '((ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 18)
     (total-strokes      . 21)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 727)
+    (hanyu-dazidian-char . 13)
     (chinese-cns11643-7 . #x5321)      ; �����
     (ideograph-daikanwa . 04865)       ; �����
+    (chinese-big5-cdp  . #x856D)       ; ������
     ))
 (define-char
   '((ideographic-radical . 31) ; ⼞
@@ -2562,14 +2660,15 @@
     (ideographic-strokes . 23)
     (total-strokes      . 26)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
-     ((ideograph-daikanwa . 15947)     ; �����
+     ((japanese-jisx0208-1978    . #x5D33)     ; �����
+      (japanese-jisx0208         . #x5D33)     ; �����
+      (korean-ksc5601            . #x5532)     ; �����
+      (ideograph-daikanwa        . 15947)      ; �����
       ))
     (mojikyo           . 050134)       ; ������
     ))
@@ -2579,11 +2678,12 @@
     (ideographic-radical . 31) ; ⼞
     (ideographic-strokes . 23)
     (total-strokes      . 26)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 727)
+    (hanyu-dazidian-char . 16)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )
@@ -2598,10 +2698,8 @@
     (ideographic-strokes . 23)
     (total-strokes      . 26)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-                (ucs                . #x2FF4)  ; ⿴
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs               . #x2FF4)     ; ⿴
       )
      ((ucs               . #x56D7)     ; 囗
       )