X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R020-Wrap.el;h=82e08bdbea99d6383173cb9840de79249cdc754f;hb=52fb56ff79ba7ea2e9eb336e8e4f078556972a96;hp=abe6c42de17380e0dc4c9dd56448be5be9a2581a;hpb=e1be9b4fa95fd59e1d3e606ed133bdbce3292097;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el
index abe6c42..82e08bd 100644
--- a/lisp/utf-2000/Ideograph-R020-Wrap.el
+++ b/lisp/utf-2000/Ideograph-R020-Wrap.el
@@ -2,91 +2,88 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 254)
-    (hanyu-dazidian-char . 13)
+    (hanyu-dazidian	1 254 13)
     (shinjigen-1	. 761)
     (shinjigen-2	. 761)
-    (japanese-jisx0208-1978	. #x5231)	; ø»ƒ„Ž
-    (chinese-gb2312		. #x5968)	; ø»…™›
-    (japanese-jisx0208		. #x5231)	; ø»‡˜–
-    (chinese-isoir165		. #x5968)	; ø»Ž«
-    (japanese-jisx0208-1990	. #x5231)	; ø½Š¾Š
-    (ideograph-daikanwa		. 02493)	; ø¸€¦½
-    (chinese-big5-cdp		. #x8B57)	; ý¢€ˆ­—
-    (ucs			. #x52F9)	; 勹
+    (=gb2312		. #x5968)	; ø»…™›
+    (=jis-x0208		. #x5231)	; ø½Š¾Š
+    (=iso-ir165		. #x5968)	; ø»Ž«
+    (=gt-pj-1		. #x5231)	; 勹
+    (ideograph-daikanwa . 02493)	; ø¸€¦½
+    (=big5-cdp		. #x8B57)	; ý¢€ˆ­—
+    (=gt-k		. 00088)	; ý¡„€˜
+    (=ucs		. #x52F9)	; 勹
     ))
 (define-char
-  '((=>ucs		. #x52FA)	; 勺
+  '((=>ucs*		. #x52FA)	; 勺
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((chinese-big5-cdp	  . #x8B57)	; ý¢€ˆ­—
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       ))
     (shinjigen-1	. 763)
     (shinjigen-2	. 763)
-    (korean-ksc5601	. #x6D43)	; ø»ŠŠ–
+    (=ks-x1001		. #x6D43)	; ø»ŠŠ–
     (chinese-cns11643-4 . #x212F)	; ø»— ¶
     (ideograph-daikanwa . 02494)	; ø¸€¦¾
-    (china3-jef		. #x45A1)	; øº„–¡
+    (=big5-cdp		. #xA463)	; ý¢€Š‘£
+    (=jef-china3	. #x45A1)	; øº„–¡
+    (=ucs@ks		. #x52FA)	; 勺
+    (=ucs		. #x2F828)	; 勺
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 254)
-    (hanyu-dazidian-char . 14)
+    (hanyu-dazidian	1 254 14)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x4E36)	; 丶
+     ((=ucs		  . #x4E36)	; 丶
       ))
     (shinjigen-1	. 762)
     (shinjigen-2	. 762)
-    (japanese-jisx0208-1978	. #x3C5B)	; ø»‚¤¤
-    (chinese-gb2312		. #x4957)	; ø»…ª
-    (japanese-jisx0208		. #x3C5B)	; ø»†¸¬
-    (chinese-isoir165		. #x4957)	; ø»©º
-    (chinese-cns11643-1		. #x4444)	; ø»‘¶™
-    (japanese-jisx0208-1990	. #x3C5B)	; ø½Šž 
-    (chinese-big5		. #xA463)	; øºŸ¢º
-    (ideograph-daikanwa		. 02495)	; ø¸€¦¿
-    (ucs			. #x52FA)	; 勺
+    (=gb2312		. #x4957)	; ø»…ª
+    (=jis-x0208		. #x3C5B)	; ø½Šž 
+    (=iso-ir165		. #x4957)	; ø»©º
+    (chinese-cns11643-1 . #x4444)	; ø»‘¶™
+    (=gt-pj-1		. #x3C5B)	; 勺
+    (=big5		. #xA463)	; ý¢€Š‘£
+    (ideograph-daikanwa . 02495)	; ø¸€¦¿
+    (=gt-k		. 00183)	; ý¡„€‚·
+    (=ucs		. #x52FA)	; 勺
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 255)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 255 1)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x4E8C)	; 二
+     ((=ucs		  . #x4E8C)	; 二
       ))
     (shinjigen-1	. 764)
     (shinjigen-2	. 764)
-    (korean-ksc5601		. #x5032)	; ø»‰ŸŸ
-    (chinese-cns11643-1		. #x4524)	; ø»‘·—
-    (japanese-jisx0213-1	. #x2E6A)	; ø»¢§‹
-    (chinese-big5		. #xA4C3)	; øºŸ£¸
-    (ideograph-daikanwa		. 02496)	; ø¸€§€
-    (china3-jef			. #x45A2)	; øº„–¢
-    (ucs			. #x52FB)	; 勻
+    (=ks-x1001		. #x5032)	; ø»‰ŸŸ
+    (chinese-cns11643-1 . #x4524)	; ø»‘·—
+    (=jis-x0213-1-2000	. #x2E6A)	; ø»¢§‹
+    (=big5		. #xA4C3)	; ý¢€Š“ƒ
+    (ideograph-daikanwa . 02496)	; ø¸€§€
+    (=jef-china3	. #x45A2)	; øº„–¢
+    (=ucs		. #x52FB)	; 勻
     ))
 (define-char
   '((=>ucs		. #x5300)	; 匀
@@ -101,184 +98,269 @@
       ))
     (shinjigen-1	. 764)
     (shinjigen-2	. 765)
-    (japanese-jisx0212		. #x337B)	; ø»‹€†
-    (japanese-jisx0213-1	. #x2E6B)	; ø»¢§Œ
-    (ideograph-daikanwa		. 02497)	; ø¸€§
-    (china3-jef			. #x45A3)	; øº„–£
+    (=jis-x0212		. #x337B)	; ø»‹€†
+    (=jis-x0213-1-2000	. #x2E6B)	; ø»¢§Œ
+    (ideograph-daikanwa . 02497)	; ø¸€§
+    (=jef-china3	. #x45A3)	; øº„–£
+    (=ucs@jis		. #x5300)	; ø»‹€†
     ))
 (define-char
   '((morohashi-daikanwa	2497 0 1)
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (chinese-gb2312	. #x5448)	; ø»…‘¥
-    (chinese-isoir165	. #x5448)	; ø»¹µ
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x51AB)	; 冫
+      ))
+    (=gb2312		. #x5448)	; ø»…‘¥
+    (=iso-ir165		. #x5448)	; ø»¹µ
     (chinese-cns11643-3 . #x2156)	; ø»•—™
-    (ucs		. #x5300)	; 匀
+    (=ucs		. #x5300)	; 匀
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 256)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 256 2)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x4E5D)	; 九
+     ((=ucs		  . #x4E5D)	; 九
       ))
     (chinese-cns11643-2 . #x2136)	; ø»“Œµ
-    (chinese-big5	. #xC956)	; øº¡¥š
+    (=big5		. #xC956)	; ý¢€Œ¥–
     (ideograph-daikanwa . 02498)	; ø¸€§‚
-    (ucs		. #x52FC)	; 勼
+    (=ucs		. #x52FC)	; 勼
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x52FD)	; 勽
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x4EBA)	; 人
+      ))
     (chinese-cns11643-3 . #x2155)	; ø»•—˜
     (ideograph-daikanwa . 02499)	; ø¸€§ƒ
-    (ucs		. #x52FD)	; 勽
+    ))
+(define-char
+  '((morohashi-daikanwa	2499 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (hanyu-dazidian	1 256 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x4EBA)	; 人
+      ))
+    (=hanziku-1		. #xDADC)	; ý¢€«œ
+    (=ucs		. #x52FD)	; 勽
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 256)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 256 3)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x53B6)	; 厶
+     ((=ucs		  . #x53B6)	; 厶
       ))
     (shinjigen-1	. 766)
     (shinjigen-2	. 766)
-    (japanese-jisx0208-1978	. #x387B)	; ø»‚ŸŒ
-    (chinese-gb2312		. #x3934)	; ø»„©§
-    (japanese-jisx0208		. #x387B)	; ø»†³”
-    (korean-ksc5601		. #x4E7E)	; ø»‰¯
-    (chinese-isoir165		. #x3934)	; ø»‘·
-    (chinese-cns11643-1		. #x4525)	; ø»‘·˜
-    (japanese-jisx0208-1990	. #x387B)	; ø½Š™ˆ
-    (chinese-big5		. #xA4C4)	; øºŸ£¹
-    (ideograph-daikanwa		. 02500)	; ø¸€§„
-    (ucs			. #x52FE)	; 勾
+    (=gb2312		. #x3934)	; ø»„©§
+    (=jis-x0208		. #x387B)	; ø½Š™ˆ
+    (=ks-x1001		. #x4E7E)	; ø»‰¯
+    (=iso-ir165		. #x3934)	; ø»‘·
+    (chinese-cns11643-1 . #x4525)	; ø»‘·˜
+    (=gt-pj-1		. #x387B)	; 勾
+    (=big5		. #xA4C4)	; ý¢€Š“„
+    (ideograph-daikanwa . 02500)	; ø¸€§„
+    (=gt-k		. 00433)	; ý¡„€†±
+    (=ucs		. #x52FE)	; 勾
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 255)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 255 2)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((chinese-big5-cdp	  . #x89A6)	; ý¢€ˆ¦¦
+     ((=big5-cdp	  . #x89A6)	; ý¢€ˆ¦¦
       ))
     (shinjigen-1	. 767)
     (shinjigen-2	. 767)
-    (japanese-jisx0208-1978	. #x4C5E)	; ø»‚¼‡
-    (chinese-gb2312		. #x4E70)	; ø»…‰™
-    (japanese-jisx0208		. #x4C5E)	; ø»‡
-    (korean-ksc5601		. #x5A28)	; ø»‰®
-    (chinese-isoir165		. #x4E70)	; ø»±©
-    (chinese-cns11643-1		. #x4526)	; ø»‘·™
-    (japanese-jisx0208-1990	. #x4C5E)	; ø½Š¶ƒ
-    (chinese-big5		. #xA4C5)	; øºŸ£º
-    (ideograph-daikanwa		. 02501)	; ø¸€§…
-    (ucs			. #x52FF)	; 勿
+    (=gb2312		. #x4E70)	; ø»…‰™
+    (=jis-x0208		. #x4C5E)	; ø½Š¶ƒ
+    (=ks-x1001		. #x5A28)	; ø»‰®
+    (=iso-ir165		. #x4E70)	; ø»±©
+    (chinese-cns11643-1 . #x4526)	; ø»‘·™
+    (=gt-pj-1		. #x4C5E)	; 勿
+    (=big5		. #xA4C5)	; ý¢€Š“…
+    (ideograph-daikanwa . 02501)	; ø¸€§…
+    (=gt-k		. 00501)	; ý¡„€‡µ
+    (=ucs		. #x52FF)	; 勿
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (comment		. "[= R004:M00129.0]")
+    (->same-ideograph
+     ((ideographic-radical . 4)	; ⼃
+      (ideograph-daikanwa . 00129)	; ø¸€‚
+      ))
+    (ideographic-structure
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (=ucs		  . #x2FFB)	; â¿»
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x4E42)	; 乂
+      ))
     (shinjigen-1	. 769)
     (shinjigen-2	. 769)
-    (japanese-jisx0208-1978	. #x4C68)	; ø»‚¼‘
-    (japanese-jisx0208		. #x4C68)	; ø»‡™
-    (japanese-jisx0208-1990	. #x4C68)	; ø½Š¶
-    (ideograph-daikanwa		. 02502)	; ø¸€§†
-    (ucs			. #x5301)	; 匁
+    (=jis-x0208		. #x4C68)	; ø½Š¶
+    (=gt-pj-1		. #x4C68)	; 匁
+    (ideograph-daikanwa . 02502)	; ø¸€§†
+    (=ucs		. #x5301)	; 匁
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x5315)	; 匕
+      ))
     (shinjigen-1	. 768)
     (shinjigen-2	. 768)
-    (japanese-jisx0208-1978	. #x4677)	; ø»‚³¬
-    (japanese-jisx0208		. #x4677)	; ø»‡‡´
-    (japanese-jisx0208-1990	. #x4677)	; ø½Š­¨
-    (ideograph-daikanwa		. 02503)	; ø¸€§‡
-    (ideograph-cbeta		. 00141)	; ø¸ ‚
-    (ucs			. #x5302)	; 匂
+    (=jis-x0208		. #x4677)	; ø½Š­¨
+    (=gt-pj-1		. #x4677)	; 匂
+    (ideograph-daikanwa . 02503)	; ø¸€§‡
+    (=gt-k		. 00471)	; ý¡„€‡—
+    (=cbeta		. 00141)	; ø¸ ‚
+    (=ucs		. #x5302)	; 匂
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (hanyu-dazidian	1 257 3)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x4EBE)	; 亾
+     ((=ucs		  . #x4EBE)	; 亾
       ))
-    (japanese-jisx0212	. #x337C)	; ø»‹€‡
+    (=jis-x0212		. #x337C)	; ø»‹€‡
     (chinese-cns11643-3 . #x2223)	; ø»•˜„
     (ideograph-daikanwa . 02504)	; ø¸€§ˆ
-    (china3-jef		. #x45A4)	; øº„–¤
-    (ideograph-cbeta	. 00456)	; ø¸ ‡ˆ
-    (chinese-big5-cdp	. #x8CA2)	; ý¢€ˆ²¢
-    (ucs		. #x5303)	; 匃
+    (=big5-cdp		. #x8CA2)	; ý¢€ˆ²¢
+    (=cbeta		. 00456)	; ø¸ ‡ˆ
+    (=jef-china3	. #x45A4)	; øº„–¤
+    (=ucs		. #x5303)	; 匃
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x5304)	; 匄
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (chinese-cns11643-3 . #x2222)	; ø»•˜ƒ
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((ideograph-daikanwa . 00287)	; ø¸€„Ÿ
+      ))
     (ideograph-daikanwa . 02505)	; ø¸€§‰
-    (ucs		. #x5304)	; 匄
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x5304)	; 匄
+    (morohashi-daikanwa	2505 0 1)
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 257)
-    (hanyu-dazidian-char . 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+      (=ucs		  . #x2FF4)	; â¿´
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x5DF3)	; å·³
+     ((chinese-cns11643-1 . #x4441)	; ø»‘¶–
+      ))
+    (chinese-cns11643-3 . #x2222)	; ø»•˜ƒ
+    ))
+(define-char
+  '((morohashi-daikanwa	2505 0 2)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (hanyu-dazidian	1 257 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x4EA1)	; 亡
+      ))
+    (=hanziku-1		. #xDB41)	; ý¢€­
+    (=ucs		. #x5304)	; 匄
+    ))
+(define-char
+  '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (hanyu-dazidian	1 257 6)
+    (ideographic-structure
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (=ucs		  . #x2FFB)	; â¿»
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x5DF3)	; å·³
       ))
     (shinjigen-1	. 776)
     (shinjigen-2	. 776)
-    (chinese-gb2312	. #x307C)	; ø»„¡
-    (korean-ksc5601	. #x7850)	; ø»Šš­
-    (chinese-isoir165	. #x307C)	; ø»…±
+    (=gb2312		. #x307C)	; ø»„¡
+    (=ks-x1001		. #x7850)	; ø»Šš­
+    (=iso-ir165		. #x307C)	; ø»…±
     (chinese-cns11643-1 . #x457D)	; ø»‘¸°
-    (chinese-big5	. #xA55D)	; øºŸ¥‘
+    (=big5		. #xA55D)	; ý¢€Š•
     (ideograph-daikanwa . 02506)	; ø¸€§Š
-    (china3-jef		. #x45A5)	; øº„–¥
-    (ucs		. #x5305)	; 包
+    (=jef-china3	. #x45A5)	; øº„–¥
+    (=ucs		. #x5305)	; 包
     ))
 (define-char
   '((=>ucs		. #x5305)	; 包
@@ -287,22 +369,21 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
-		 (ucs		     . #x2FFB)	; â¿»
-		 )
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (=ucs		  . #x2FFB)	; â¿»
       )
-     ((chinese-big5-cdp	  . #x8B57)	; ý¢€ˆ­—
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x5DF1)	; å·±
+     ((=ucs		  . #x5DF1)	; å·±
       ))
     (shinjigen-1	. 775)
     (shinjigen-2	. 775)
-    (japanese-jisx0208-1978	. #x4A71)	; ø»‚¹ž
-    (japanese-jisx0208		. #x4A71)	; ø»‡¦
-    (chinese-cns11643-6		. #x2246)	; ø»›¶³
-    (japanese-jisx0208-1990	. #x4A71)	; ø½Š³š
-    (mojikyo			. 050113)	; ý €Œ
+    (=jis-x0208		. #x4A71)	; ø½Š³š
+    (chinese-cns11643-6 . #x2246)	; ø»›¶³
+    (=gt-pj-1		. #x4A71)	; ø½Š³š
+    (=gt-k		. 01001)	; ý¡„€©
+    (=ucs@jis		. #x5305)	; ø½Š³š
+    (mojikyo		. 050113)	; ý €Œ
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -310,6 +391,7 @@
     (total-strokes	 . 5)
     (chinese-cns11643-6 . #x2247)	; ø»›¶´
     (ideograph-daikanwa . 02507)	; ø¸€§‹
+    (=ucs		. #x208CD)	; 𠣍
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -317,23 +399,27 @@
     (total-strokes	 . 5)
     (chinese-cns11643-6 . #x2248)	; ø»›¶µ
     (ideograph-daikanwa . 02508)	; ø¸€§Œ
+    (=ucs		. #x208CE)	; 𠣎
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (ideograph-daikanwa . 02509)	; ø¸€§
-    (ideograph-cbeta	. 02269)	; ø¸ £
+    (=cbeta		. 02269)	; ø¸ £
+    (=ucs		. #x208CF)	; 𠣏
     ))
 (define-char
-  '((morohashi-daikanwa	2509 0 1)
+  '((=>ucs		. #x208CF)	; 𠣏
+    (morohashi-daikanwa	2509 0 1)
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
     (chinese-cns11643-5 . #x2235)	; ø»™¬ž
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x208CC)	; 𠣌
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (ideograph-daikanwa . 02510)	; ø¸€§Ž
@@ -351,59 +437,58 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
     (chinese-cns11643-5 . #x213D)	; ø»™«ˆ
+    (=ucs		. #x208CC)	; 𠣌
     ))
 (define-char
-  '((=>ucs		. #x5306)	; 匆
+  '((=>ucs*		. #x5306)	; 匆
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (->ideographic-variants
-     (:sources	(shinjigen-1)
-      :char	((shinjigen-1	     . 772)
-		 (japanese-jisx0208-1990     . #x5232)	; ø½Š¾‹
+     (:char	((shinjigen-1	     . 772)
+		 (=ucs		     . #x5306)	; 匆
 		 )
-      ))
+      :sources	(shinjigen-1)))
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (=ucs		  . #x2FFB)	; â¿»
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((chinese-big5-cdp	  . #x89D5)	; ý¢€ˆ§•
+     ((=big5-cdp	  . #x89D5)	; ý¢€ˆ§•
       ))
     (shinjigen-1	. 774)
     (shinjigen-2	. 774)
     (chinese-cns11643-3 . #x2225)	; ø»•˜†
     (ideograph-daikanwa . 02511)	; ø¸€§
     (mojikyo		. 002511)	; ý €€§
+    (=ucs		. #x2F82A)	; 匆
     ))
 (define-char
   '((morohashi-daikanwa	2511 0 2)
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 257)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 257 2)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((chinese-big5-cdp	  . #x89D5)	; ý¢€ˆ§•
+     ((=big5-cdp	  . #x89D5)	; ý¢€ˆ§•
       ))
     (shinjigen-1	. 772)
     (shinjigen-2	. 772)
-    (japanese-jisx0208-1978	. #x5232)	; ø»ƒ„
-    (chinese-gb2312		. #x3452)	; ø»„¢¯
-    (japanese-jisx0208		. #x5232)	; ø»‡˜—
-    (chinese-isoir165		. #x3452)	; ø»Š¿
-    (chinese-cns11643-1		. #x457E)	; ø»‘¸±
-    (japanese-jisx0208-1990	. #x5232)	; ø½Š¾‹
-    (chinese-big5		. #xA55E)	; øºŸ¥’
-    (mojikyo			. 072447)	; ý €‘«¿
-    (ucs			. #x5306)	; 匆
+    (=gb2312		. #x3452)	; ø»„¢¯
+    (=jis-x0208		. #x5232)	; ø½Š¾‹
+    (=iso-ir165		. #x3452)	; ø»Š¿
+    (chinese-cns11643-1 . #x457E)	; ø»‘¸±
+    (=gt-pj-1		. #x5232)	; 匆
+    (=big5		. #xA55E)	; ý¢€Š•ž
+    (=gt-k		. 01034)	; ý¡„€Š
+    (mojikyo		. 072447)	; ý €‘«¿
+    (=ucs		. #x5306)	; 匆
     ))
 (define-char
   '((=>ucs		. #x5307)	; 匇
@@ -415,8 +500,9 @@
     (->ideographic-variants
      ((ideograph-daikanwa . 02511)	; ø¸€§
       ))
-    (japanese-jisx0213-1	. #x2E6C)	; ø»¢§
-    (ideograph-cbeta		. 05526)	; ø¸¡––
+    (=jis-x0213-1-2000	. #x2E6C)	; ø»¢§
+    (=cbeta		. 05526)	; ø¸¡––
+    (=ucs@jis		. #x5307)	; ø»¢§
     ))
 (define-char
   '((morohashi-daikanwa	2511 0 8)
@@ -426,47 +512,55 @@
     (->ideographic-variants
      ((ideograph-daikanwa . 02511)	; ø¸€§
       ))
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x5915)	; 夕
+      ))
     (chinese-cns11643-3 . #x2224)	; ø»•˜…
-    (china3-jef		. #x45A8)	; øº„–¨
+    (=jef-china3	. #x45A8)	; øº„–¨
     (mojikyo		. 054897)	; ý €™±
-    (ucs		. #x5307)	; 匇
+    (=ucs		. #x5307)	; 匇
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 258)
-    (hanyu-dazidian-char . 5)
+    (hanyu-dazidian	1 258 5)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x51F6)	; 凶
+     ((=ucs		  . #x51F6)	; 凶
       ))
     (shinjigen-1	. 777)
     (shinjigen-2	. 777)
-    (japanese-jisx0208-1978	. #x5233)	; ø»ƒ„
-    (chinese-gb2312		. #x5059)	; ø»…‹¾
-    (japanese-jisx0208		. #x5233)	; ø»‡˜˜
-    (korean-ksc5601		. #x7D56)	; ø»Š¢‰
-    (chinese-isoir165		. #x5059)	; ø»´Ž
-    (chinese-cns11643-1		. #x474A)	; ø»‘º¹
-    (japanese-jisx0208-1990	. #x5233)	; ø½Š¾Œ
-    (chinese-big5		. #xA649)	; øºŸ§š
-    (ideograph-daikanwa		. 02512)	; ø¸€§
-    (ucs			. #x5308)	; 匈
+    (=gb2312		. #x5059)	; ø»…‹¾
+    (=jis-x0208		. #x5233)	; ø½Š¾Œ
+    (=ks-x1001		. #x7D56)	; ø»Š¢‰
+    (=iso-ir165		. #x5059)	; ø»´Ž
+    (chinese-cns11643-1 . #x474A)	; ø»‘º¹
+    (=gt-pj-1		. #x5233)	; 匈
+    (=big5		. #xA649)	; ý¢€Š™‰
+    (ideograph-daikanwa . 02512)	; ø¸€§
+    (=gt-k		. 01715)	; ý¡„€š³
+    (=ucs		. #x5308)	; 匈
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
     (ideograph-daikanwa . 02513)	; ø¸€§‘
+    (=ucs		. #x208D1)	; 𠣑
     ))
 (define-char
-  '((morohashi-daikanwa	2513 0 6)
+  '((=>ucs		. #x208D1)	; 𠣑
+    (morohashi-daikanwa	2513 0 6)
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
@@ -478,6 +572,7 @@
     (total-strokes	 . 6)
     (chinese-cns11643-5 . #x2236)	; ø»™¬Ÿ
     (ideograph-daikanwa . 02514)	; ø¸€§’
+    (=ucs		. #x208D2)	; 𠣒
     ))
 (define-char
   '((=>ucs		. #x5309)	; 匉
@@ -485,14 +580,15 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((korean-ksc5601	  . #x7841)	; ø»Ššž
+     ((=ks-x1001	  . #x7841)	; ø»Ššž
       (ideograph-daikanwa . 09167)	; ø¸‚
       ))
+    (=big5		. #xCA71)	; ý¢€Œ©±
     (ideograph-daikanwa . 02515)	; ø¸€§“
     ))
 (define-char
@@ -500,20 +596,17 @@
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 258)
-    (hanyu-dazidian-char . 7)
+    (hanyu-dazidian	1 258 7)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x5E73)	; å¹³
+     ((=ucs		  . #x5E73)	; å¹³
       ))
     (chinese-cns11643-2 . #x2333)	; ø»“®
-    (chinese-big5	. #xCA71)	; øº¡¨’
-    (ucs		. #x5309)	; 匉
+    (=ucs		. #x5309)	; 匉
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -521,9 +614,11 @@
     (total-strokes	 . 7)
     (chinese-cns11643-6 . #x262F)	; ø»›¼”
     (ideograph-daikanwa . 02516)	; ø¸€§”
+    (=ucs		. #x208D4)	; 𠣔
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x208D6)	; 𠣖
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (ideograph-daikanwa . 02517)	; ø¸€§•
@@ -534,6 +629,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (chinese-cns11643-5 . #x2348)	; ø»™®
+    (=ucs		. #x208D6)	; 𠣖
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -541,6 +637,7 @@
     (total-strokes	 . 7)
     (chinese-cns11643-5 . #x2349)	; ø»™®
     (ideograph-daikanwa . 02518)	; ø¸€§–
+    (=ucs		. #x208D7)	; 𠣗
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -549,18 +646,27 @@
     (ideograph-daikanwa . 02519)	; ø¸€§—
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x208D8)	; 𠣘
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-4 . #x2552)	; ø»—§‘
     (ideograph-daikanwa . 02520)	; ø¸€§˜
     ))
 (define-char
+  '((morohashi-daikanwa	2520 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
+    (chinese-cns11643-4 . #x2552)	; ø»—§‘
+    (=ucs		. #x208D8)	; 𠣘
+    ))
+(define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
     (chinese-cns11643-6 . #x2971)	; ø»œ°
     (ideograph-daikanwa . 02521)	; ø¸€§™
+    (=ucs		. #x208D9)	; 𠣙
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -568,29 +674,28 @@
     (total-strokes	 . 8)
     (chinese-cns11643-6 . #x2970)	; ø»œ¯
     (ideograph-daikanwa . 02522)	; ø¸€§š
+    (=ucs		. #x208DA)	; 𠣚
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 259)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 259 1)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x7C73)	; ç±³
+     ((=ucs		  . #x7C73)	; ç±³
       ))
-    (japanese-jisx0212		. #x337D)	; ø»‹€ˆ
-    (chinese-isoir165		. #x2E29)	; ø»¢
-    (japanese-jisx0213-2	. #x234C)	; ø»¤ §
-    (chinese-big5		. #xCBD6)	; øº¡«²
-    (ideograph-daikanwa		. 02523)	; ø¸€§›
-    (china3-jef			. #x45A6)	; øº„–¦
-    (ucs			. #x530A)	; 匊
+    (=jis-x0212		. #x337D)	; ø»‹€ˆ
+    (=iso-ir165		. #x2E29)	; ø»¢
+    (=jis-x0213-2-2000	. #x234C)	; ø»¤ §
+    (=big5		. #xCBD6)	; ý¢€Œ¯–
+    (ideograph-daikanwa . 02523)	; ø¸€§›
+    (=jef-china3	. #x45A6)	; øº„–¦
+    (=ucs		. #x530A)	; 匊
     ))
 (define-char
   '((=>ucs		. #x530A)	; 匊
@@ -599,12 +704,10 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-		 (ucs		     . #x2FF4)	; â¿´
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((chinese-big5-cdp	  . #x8B57)	; ý¢€ˆ­—
+     ((=ucs		  . #x52F9)	; 勹
       )
      ((chinese-cns11643-1 . #x484D)	; ø»‘¼š
       ))
@@ -614,37 +717,45 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 258)
-    (hanyu-dazidian-char . 13)
+    (hanyu-dazidian	1 258 13)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x7F36)	; 缶
+     ((=ucs		  . #x7F36)	; 缶
       ))
     (shinjigen-1	. 6226)
     (shinjigen-2	. 6226)
-    (japanese-jisx0212		. #x337E)	; ø»‹€‰
-    (chinese-cns11643-2		. #x2557)	; ø»““Ž
-    (japanese-jisx0213-2	. #x234D)	; ø»¤ ¨
-    (chinese-big5		. #xCBD7)	; øº¡«³
-    (ideograph-daikanwa		. 02524)	; ø¸€§œ
-    (china3-jef			. #x5FE5)	; øº…¿¥
-    (ucs			. #x530B)	; 匋
+    (=jis-x0212		. #x337E)	; ø»‹€‰
+    (chinese-cns11643-2 . #x2557)	; ø»““Ž
+    (=jis-x0213-2-2000	. #x234D)	; ø»¤ ¨
+    (=big5		. #xCBD7)	; ý¢€Œ¯—
+    (ideograph-daikanwa . 02524)	; ø¸€§œ
+    (=jef-china3	. #x5FE5)	; øº…¿¥
+    (=ucs		. #x530B)	; 匋
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (japanese-jisx0212	. #x3421)	; ø»‹€Š
+    (hanyu-dazidian	1 258 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x5408)	; 合
+      ))
+    (=jis-x0212		. #x3421)	; ø»‹€Š
     (chinese-cns11643-4 . #x2551)	; ø»—§
     (ideograph-daikanwa . 02525)	; ø¸€§
-    (china3-jef		. #x45A7)	; øº„–§
-    (ideograph-cbeta	. 05245)	; ø¸¡‘½
-    (ucs		. #x530C)	; 匌
+    (=hanziku-1		. #xDB6B)	; ý¢€­«
+    (=cbeta		. 05245)	; ø¸¡‘½
+    (=jef-china3	. #x45A7)	; øº„–§
+    (=ucs		. #x530C)	; 匌
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -653,41 +764,48 @@
     (chinese-cns11643-6 . #x2F2A)	; ø»œ‰
     (ideograph-daikanwa . 02526)	; ø¸€§ž
     (mojikyo		. 038180)	; ý €‰”¤
+    (=ucs		. #x208DE)	; 𠣞
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 259)
-    (hanyu-dazidian-char . 4)
+    (hanyu-dazidian	1 259 4)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x752B)	; 甫
+     ((=ucs		  . #x752B)	; 甫
       ))
     (shinjigen-1	. 780)
     (shinjigen-2	. 780)
-    (japanese-jisx0208-1978	. #x5235)	; ø»ƒ„’
-    (chinese-gb2312		. #x5969)	; ø»…™œ
-    (japanese-jisx0208		. #x5235)	; ø»‡˜š
-    (korean-ksc5601		. #x7851)	; ø»Šš®
-    (chinese-isoir165		. #x5969)	; ø»Ž¬
-    (chinese-cns11643-1		. #x5031)	; ø»’‡®
-    (japanese-jisx0208-1990	. #x5235)	; ø½Š¾Ž
-    (chinese-big5		. #xAB6D)	; øºŸ´
-    (ideograph-daikanwa		. 02527)	; ø¸€§Ÿ
-    (ucs			. #x530D)	; 匍
+    (=gb2312		. #x5969)	; ø»…™œ
+    (=jis-x0208		. #x5235)	; ø½Š¾Ž
+    (=ks-x1001		. #x7851)	; ø»Šš®
+    (=iso-ir165		. #x5969)	; ø»Ž¬
+    (chinese-cns11643-1 . #x5031)	; ø»’‡®
+    (=gt-pj-1		. #x5235)	; 匍
+    (=big5		. #xAB6D)	; ý¢€Š­­
+    (ideograph-daikanwa . 02527)	; ø¸€§Ÿ
+    (=gt-k		. 05215)	; ý¡„‘Ÿ
+    (=ucs		. #x530D)	; 匍
+    ))
+(define-char
+  '((=>ucs		. #x208DF)	; 𠣟
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideograph-daikanwa . 02528)	; ø¸€§ 
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((morohashi-daikanwa	2528 0 0)
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (chinese-cns11643-4 . #x284C)	; ø»—«¥
-    (ideograph-daikanwa . 02528)	; ø¸€§ 
+    (=ucs		. #x208DF)	; 𠣟
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -695,6 +813,7 @@
     (total-strokes	 . 9)
     (chinese-cns11643-6 . #x2F2B)	; ø»œ‰ž
     (ideograph-daikanwa . 02529)	; ø¸€§¡
+    (=ucs		. #x208E0)	; ð £ 
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -702,6 +821,7 @@
     (total-strokes	 . 9)
     (chinese-cns11643-6 . #x2F2C)	; ø»œ‰Ÿ
     (ideograph-daikanwa . 02530)	; ø¸€§¢
+    (=ucs		. #x208E1)	; 𠣡
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -709,60 +829,78 @@
     (total-strokes	 . 9)
     (chinese-cns11643-6 . #x2F29)	; ø»œ‰œ
     (ideograph-daikanwa . 02531)	; ø¸€§£
+    (=ucs		. #x208E3)	; ð ££
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 259)
-    (hanyu-dazidian-char . 11)
+    (hanyu-dazidian	1 259 11)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x5944)	; 奄
+     ((=ucs		  . #x5944)	; 奄
       ))
     (chinese-cns11643-2 . #x2E31)	; ø»“Ÿ¶
-    (chinese-big5	. #xD0EE)	; øº¡¸›
+    (=big5		. #xD0EE)	; ý¢€ƒ®
     (ideograph-daikanwa . 02532)	; ø¸€§¤
-    (ucs		. #x530E)	; 匎
+    (=ucs		. #x530E)	; 匎
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (ideograph-daikanwa . 02533)	; ø¸€§¥
+    (=ucs		. #x208E4)	; 𠣤
     ))
 (define-char
-  '((morohashi-daikanwa	2533 0 0)
+  '((=>ucs		. #x208E4)	; 𠣤
+    (morohashi-daikanwa	2533 0 0)
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (chinese-cns11643-4 . #x2B76)	; ø»—°©
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x208E5)	; ð £¥
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x355C)	; ø»œ“ƒ
     (ideograph-daikanwa . 02534)	; ø¸€§¦
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((morohashi-daikanwa	2534 0 1)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (chinese-cns11643-6 . #x355C)	; ø»œ“ƒ
+    (=ucs		. #x208E5)	; ð £¥
+    ))
+(define-char
+  '((=>ucs		. #x208E6)	; 𠣦
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x355B)	; ø»œ“‚
     (ideograph-daikanwa . 02535)	; ø¸€§§
     ))
 (define-char
+  '((morohashi-daikanwa	2535 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (chinese-cns11643-6 . #x355B)	; ø»œ“‚
+    (=ucs		. #x208E6)	; 𠣦
+    ))
+(define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (chinese-cns11643-6 . #x355E)	; ø»œ“…
     (ideograph-daikanwa . 02536)	; ø¸€§¨
+    (=ucs		. #x208E7)	; 𠣧
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -770,6 +908,7 @@
     (total-strokes	 . 10)
     (chinese-cns11643-6 . #x355F)	; ø»œ“†
     (ideograph-daikanwa . 02537)	; ø¸€§©
+    (=ucs		. #x208E8)	; 𠣨
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -777,6 +916,7 @@
     (total-strokes	 . 10)
     (chinese-cns11643-6 . #x355A)	; ø»œ“
     (ideograph-daikanwa . 02538)	; ø¸€§ª
+    (=ucs		. #x208E9)	; 𠣩
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -784,6 +924,7 @@
     (total-strokes	 . 10)
     (chinese-cns11643-6 . #x355D)	; ø»œ“„
     (ideograph-daikanwa . 02539)	; ø¸€§«
+    (=ucs		. #x208EA)	; 𠣪
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -791,6 +932,7 @@
     (total-strokes	 . 10)
     (chinese-cns11643-5 . #x2C2F)	; ø»™»„
     (ideograph-daikanwa . 02540)	; ø¸€§¬
+    (=ucs		. #x208EB)	; 𠣫
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -798,6 +940,7 @@
     (total-strokes	 . 11)
     (chinese-cns11643-4 . #x305D)	; ø»—·¦
     (ideograph-daikanwa . 02541)	; ø¸€§­
+    (=ucs		. #x208EE)	; ð £®
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -805,73 +948,71 @@
     (total-strokes	 . 11)
     (chinese-cns11643-6 . #x3D52)	; ø»œž©
     (ideograph-daikanwa . 02542)	; ø¸€§®
+    (=ucs		. #x208EF)	; 𠣯
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x208F0)	; ð £°
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (ideograph-daikanwa . 02543)	; ø¸€§¯
     ))
 (define-char
-  '((morohashi-daikanwa	2543 0 2)
+  '((morohashi-daikanwa	2543 0 5)
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (chinese-cns11643-5 . #x2C2E)	; ø»™»ƒ
+    (=ucs		. #x208F0)	; ð £°
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 542)
-    (hanyu-dazidian-char . 4)
+    (hanyu-dazidian	1 542 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (ucs		  . #x2FF0)	; â¿°
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ucs		  . #x5938)	; 夸
+     ((=ucs		  . #x5938)	; 夸
       )
-     ((ucs		  . #x5305)	; 包
+     ((=ucs		  . #x5305)	; 包
       ))
     (shinjigen-1	. 781)
     (shinjigen-2	. 781)
-    (japanese-jisx0208-1978	. #x5237)	; ø»ƒ„”
-    (chinese-gb2312		. #x5E4B)	; ø»… ”
-    (japanese-jisx0208		. #x5237)	; ø»‡˜œ
-    (korean-ksc5601		. #x7852)	; ø»Šš¯
-    (chinese-isoir165		. #x5E4B)	; ø»Žˆ¤
-    (chinese-cns11643-1		. #x5931)	; ø»’”¼
-    (japanese-jisx0208-1990	. #x5237)	; ø½Š¾
-    (chinese-big5		. #xB0CC)	; øº 
-    (ideograph-daikanwa		. 02544)	; ø¸€§°
-    (ucs			. #x530F)	; 匏
+    (=gb2312		. #x5E4B)	; ø»… ”
+    (=jis-x0208		. #x5237)	; ø½Š¾
+    (=ks-x1001		. #x7852)	; ø»Šš¯
+    (=iso-ir165		. #x5E4B)	; ø»Žˆ¤
+    (chinese-cns11643-1 . #x5931)	; ø»’”¼
+    (=gt-pj-1		. #x5237)	; 匏
+    (=big5		. #xB0CC)	; ý¢€‹ƒŒ
+    (ideograph-daikanwa . 02544)	; ø¸€§°
+    (=ucs		. #x530F)	; 匏
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 260)
-    (hanyu-dazidian-char . 5)
+    (hanyu-dazidian	1 260 5)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x7550)	; 畐
+     ((=ucs		  . #x7550)	; 畐
       ))
-    (japanese-jisx0208-1978	. #x5236)	; ø»ƒ„“
-    (chinese-gb2312		. #x596B)	; ø»…™ž
-    (japanese-jisx0208		. #x5236)	; ø»‡˜›
-    (korean-ksc5601		. #x5C53)	; ø»‰±¨
-    (chinese-isoir165		. #x596B)	; ø»Ž®
-    (chinese-cns11643-1		. #x5930)	; ø»’”»
-    (japanese-jisx0208-1990	. #x5236)	; ø½Š¾
-    (chinese-big5		. #xB0CB)	; øº œ
-    (ideograph-daikanwa		. 02545)	; ø¸€§±
-    (ucs			. #x5310)	; 匐
+    (=gb2312		. #x596B)	; ø»…™ž
+    (=jis-x0208		. #x5236)	; ø½Š¾
+    (=ks-x1001		. #x5C53)	; ø»‰±¨
+    (=iso-ir165		. #x596B)	; ø»Ž®
+    (chinese-cns11643-1 . #x5930)	; ø»’”»
+    (=gt-pj-1		. #x5236)	; 匐
+    (=big5		. #xB0CB)	; ý¢€‹ƒ‹
+    (ideograph-daikanwa . 02545)	; ø¸€§±
+    (=gt-k		. 07909)	; ý¡„»¥
+    (=ucs		. #x5310)	; 匐
     ))
 (define-char
   '((=>ucs		. #x3528)	; 㔨
@@ -886,7 +1027,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (chinese-cns11643-4 . #x305C)	; ø»—·¥
-    (ucs		. #x3528)	; 㔨
+    (=ucs		. #x3528)	; 㔨
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -894,41 +1035,49 @@
     (total-strokes	 . 11)
     (chinese-cns11643-5 . #x312E)	; ø»š‚™
     (ideograph-daikanwa . 02547)	; ø¸€§³
+    (=ucs		. #x208F1)	; ð £±
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x208F4)	; ð £´
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 . #x3D53)	; ø»œžª
     (ideograph-daikanwa . 02548)	; ø¸€§´
     ))
 (define-char
+  '((morohashi-daikanwa	2548 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (chinese-cns11643-6 . #x3D53)	; ø»œžª
+    (=ucs		. #x208F4)	; ð £´
+    ))
+(define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (chinese-cns11643-5 . #x312F)	; ø»š‚š
     (mojikyo		. 085281)	; ý €”´¡
+    (=ucs		. #x208F3)	; ð £³
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 260)
-    (hanyu-dazidian-char . 14)
+    (hanyu-dazidian	1 260 14)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x8EAC)	; 躬
+     ((=ucs		  . #x8EAC)	; 躬
       ))
-    (japanese-jisx0212	. #x3422)	; ø»‹€‹
+    (=jis-x0212		. #x3422)	; ø»‹€‹
     (chinese-cns11643-2 . #x3A47)	; ø»“±´
-    (chinese-big5	. #xD863)	; øº¢Šš
+    (=big5		. #xD863)	; ý¢€¡£
     (ideograph-daikanwa . 02549)	; ø¸€§µ
-    (ucs		. #x5311)	; 匑
+    (=ucs		. #x5311)	; 匑
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -936,7 +1085,7 @@
     (total-strokes	 . 12)
     (chinese-cns11643-4 . #x364D)	; ø»˜€Š
     (ideograph-daikanwa . 02550)	; ø¸€§¶
-    (ucs		. #x3529)	; 㔩
+    (=ucs		. #x3529)	; 㔩
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -944,25 +1093,22 @@
     (total-strokes	 . 12)
     (chinese-cns11643-4 . #x364E)	; ø»˜€‹
     (ideograph-daikanwa . 02551)	; ø¸€§·
+    (=ucs		. #x208F5)	; ð £µ
     ))
 (define-char
   '((=>ucs		. #x5312)	; 匒
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 260)
-    (hanyu-dazidian-char . 12)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x8345)	; 荅
+     ((=ucs		  . #x8345)	; 荅
       ))
     (chinese-cns11643-2 . #x3A46)	; ø»“±³
-    (chinese-big5	. #xD862)	; øº¢Š™
     (ideograph-daikanwa . 02552)	; ø¸€§¸
     ))
 (define-char
@@ -970,33 +1116,44 @@
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (hanyu-dazidian	1 260 12)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
       )
-     ((ucs		  . #x52F9)	; 勹
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((ucs		  . #x8345)	; 荅
+     ((=ucs		  . #x8345)	; 荅
       ))
-    (ucs		. #x5312)	; 匒
+    (=big5		. #xD862)	; ý¢€¡¢
+    (=ucs		. #x5312)	; 匒
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x208F8)	; 𠣸
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5073)	; ø»œ»„
     (ideograph-daikanwa . 02553)	; ø¸€§¹
     ))
 (define-char
+  '((morohashi-daikanwa	2553 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (chinese-cns11643-6 . #x5073)	; ø»œ»„
+    (=ucs		. #x208F8)	; 𠣸
+    ))
+(define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (chinese-cns11643-5 . #x3D78)	; ø»š•‹
     (ideograph-daikanwa . 02554)	; ø¸€§º
-    (ucs		. #x352A)	; 㔪
+    (=ucs		. #x352A)	; 㔪
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x208F9)	; ð £¹
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (ideograph-daikanwa . 02555)	; ø¸€§»
@@ -1007,66 +1164,167 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (chinese-cns11643-4 . #x305B)	; ø»—·¤
+    (=ucs		. #x208F9)	; ð £¹
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x5313)	; 匓
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (japanese-jisx0212	. #x3423)	; ø»‹€Œ
-    (chinese-cns11643-6 . #x5074)	; ø»œ»…
+    (=jis-x0212		. #x3423)	; ø»‹€Œ
     (ideograph-daikanwa . 02556)	; ø¸€§¼
-    (ucs		. #x5313)	; 匓
+    (=ucs@jis		. #x5313)	; ø»‹€Œ
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x5313)	; 匓
+    (morohashi-daikanwa	2556 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (chinese-cns11643-6 . #x5074)	; ø»œ»…
+    ))
+(define-char
+  '((=>ucs		. #x5313)	; 匓
+    (morohashi-daikanwa	2556 0 1)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (hanyu-dazidian	1 260 17)
+    (=hanziku-1		. #xDBCF)	; ý¢€¯
+    ))
+(define-char
+  '((morohashi-daikanwa	2556 0 5)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=big5-cdp	  . #x8AD4)	; ý¢€ˆ«”
+      ))
+    (=ucs		. #x5313)	; 匓
+    ))
+(define-char
+  '((=>ucs		. #x208FA)	; 𠣺
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (chinese-cns11643-5 . #x3D79)	; ø»š•Œ
     (ideograph-daikanwa . 02557)	; ø¸€§½
     ))
 (define-char
+  '((morohashi-daikanwa	2557 0 1)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (chinese-cns11643-5 . #x3D79)	; ø»š•Œ
+    (=ucs		. #x208FA)	; 𠣺
+    ))
+(define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
     (chinese-cns11643-6 . #x5B2F)	; ø»ŠŠ
     (ideograph-daikanwa . 02558)	; ø¸€§¾
+    (=ucs		. #x208FD)	; ð £½
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x208FE)	; ð £¾
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-cns11643-4 . #x4247)	; ø»˜‘¬
     (ideograph-daikanwa . 02559)	; ø¸€§¿
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((morohashi-daikanwa	2559 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (chinese-cns11643-4 . #x4247)	; ø»˜‘¬
+    (=ucs		. #x208FE)	; ð £¾
+    ))
+(define-char
+  '((=>ucs		. #x208FF)	; 𠣿
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-cns11643-5 . #x446A)	; ø»šŸ
     (ideograph-daikanwa . 02560)	; ø¸€¨€
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((morohashi-daikanwa	2560 0 1)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (chinese-cns11643-5 . #x446A)	; ø»šŸ
+    (=ucs		. #x208FF)	; 𠣿
+    ))
+(define-char
+  '((=>ucs		. #x20900)	; 𠤀
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-cns11643-5 . #x446B)	; ø»šŸ
     (ideograph-daikanwa . 02561)	; ø¸€¨
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((morohashi-daikanwa	2561 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (chinese-cns11643-5 . #x446B)	; ø»šŸ
+    (=ucs		. #x20900)	; 𠤀
+    ))
+(define-char
+  '((=>ucs		. #x20904)	; 𠤄
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
-    (chinese-cns11643-4 . #x4F65)	; ø»˜¥
     (ideograph-daikanwa . 02562)	; ø¸€¨‚
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((morohashi-daikanwa	2562 0 0)
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 14)
-    (kangxi-strokes	 . 13)
     (total-strokes	 . 16)
+    (chinese-cns11643-4 . #x4F65)	; ø»˜¥
+    (=ucs		. #x20904)	; 𠤄
+    ))
+(define-char
+  '((=>ucs		. #x5314)	; 匔
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 14)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=jis-x0212	  . #x6050)	; ø»Œ¡
+      (chinese-cns11643-3 . #x497D)	; ø»–’°
+      (=jis-x0213-2-2000  . #x7955)	; ø»¦Ÿ„
+      (ideograph-daikanwa . 38089)	; ø¸‰“‰
+      ))
     (chinese-cns11643-3 . #x5038)	; ø»–›½
     (ideograph-daikanwa . 02563)	; ø¸€¨ƒ
-    (ucs		. #x5314)	; 匔
+    ))
+(define-char
+  '((morohashi-daikanwa	2563 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 13)
+    (total-strokes	 . 15)
+    (hanyu-dazidian	1 261 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x8EB3)	; 躳
+      ))
+    (=hanziku-1		. #xDBE4)	; ý¢€¯¤
+    (=ucs		. #x5314)	; 匔
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -1074,20 +1332,30 @@
     (total-strokes	 . 16)
     (chinese-cns11643-7 . #x2C50)	; ø»ž­
     (ideograph-daikanwa . 02564)	; ø¸€¨„
+    (=ucs		. #x20905)	; 𠤅
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x20907)	; 𠤇
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
-    (chinese-cns11643-7 . #x2C51)	; ø»ž®
     (ideograph-daikanwa . 02565)	; ø¸€¨…
     ))
 (define-char
+  '((morohashi-daikanwa	2565 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 14)
+    (total-strokes	 . 16)
+    (chinese-cns11643-7 . #x2C51)	; ø»ž®
+    (=ucs		. #x20907)	; 𠤇
+    ))
+(define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
     (chinese-cns11643-7 . #x3723)	; ø»žŸŠ
     (ideograph-daikanwa . 02566)	; ø¸€¨†
+    (=ucs		. #x20908)	; 𠤈
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -1095,18 +1363,28 @@
     (total-strokes	 . 17)
     (chinese-cns11643-7 . #x3724)	; ø»žŸ‹
     (ideograph-daikanwa . 02567)	; ø¸€¨‡
+    (=ucs		. #x20909)	; 𠤉
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x2090A)	; 𠤊
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (chinese-cns11643-5 . #x5A7E)	; ø»š¿·
     (ideograph-daikanwa . 02568)	; ø¸€¨ˆ
     ))
 (define-char
+  '((morohashi-daikanwa	2568 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (chinese-cns11643-5 . #x5A7E)	; ø»š¿·
+    (=ucs		. #x2090A)	; 𠤊
+    ))
+(define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 18)
     (total-strokes	 . 20)
     (chinese-cns11643-7 . #x4D43)	; ø»ž¿¾
     (ideograph-daikanwa . 02569)	; ø¸€¨‰
+    (=ucs		. #x2090B)	; 𠤋
     ))