X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R022-Right-Open-Box.el;h=64276f2bac03b78e7f7247f7f3ee2fcc1f177992;hb=f25aa1d46f1ded748f0ea4bcf875441a538ec14a;hp=3cde6a3f1d377883428eb9d59768cebb82f3022d;hpb=787697e0b76aad1463908de0c6a15c3f6df4bda6;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
index 3cde6a3..64276f2 100644
--- a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
@@ -2,55 +2,70 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (hanyu-dazidian	1 81 3)
     (shinjigen-1	. 786)
     (shinjigen-2	. 786)
-    (japanese-jisx0208-1978	. #x5239)	; ø»ƒ„–
-    (chinese-gb2312		. #x584E)	; ø»…—£
-    (japanese-jisx0208		. #x5239)	; ø»‡˜ž
-    (chinese-isoir165		. #x584E)	; ø»¿³
-    (chinese-cns11643-2		. #x2124)	; ø»“Œ£
-    (japanese-jisx0208-1990	. #x5239)	; ø½Š¾’
-    (chinese-big5		. #xC943)	; øº¡¥‡
-    (ideograph-daikanwa		. 02595)	; ø¸€¨£
-    (ucs			. #x531A)	; 匚
+    (=gb2312		. #x584E)	; ø»…—£
+    (=jis-x0208		. #x5239)	; ø½Š¾’
+    (=iso-ir165		. #x584E)	; ø»¿³
+    (=cns11643-2	. #x2124)	; ø»“Œ£
+    (=gt-pj-1		. #x5239)	; 匚
+    (=big5		. #xC943)	; ý¢€Œ¥ƒ
+    (ideograph-daikanwa . 02595)	; ø¸€¨£
+    (=gt-k		. 00097)	; ý¡„€¡
+    (=ucs		. #x531A)	; 匚
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (hanyu-dazidian	1 50 2)
     (ideograph-daikanwa . 02596)	; ø¸€¨¤
+    (=big5-cdp		. #x87D4)	; ý¢€ˆŸ”
+    (=ucs		. #x2092C)	; 𠤬
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (japanese-jisx0212	. #x3425)	; ø»‹€Ž
-    (chinese-cns11643-4 . #x2165)	; ø»—¡¬
+    (hanyu-dazidian	1 82 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x4E45)	; 久
+      ))
+    (=jis-x0212		. #x3425)	; ø»‹€Ž
+    (=cns11643-4	. #x2165)	; ø»—¡¬
     (ideograph-daikanwa . 02597)	; ø¸€¨¥
-    (ucs		. #x531B)	; 匛
+    (=hanziku-1		. #xB4D6)	; ý¢€›“–
+    (=jef-china3	. #x45B0)	; øº„–°
+    (=ucs		. #x531B)	; 匛
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (hanyu-dazidian	1 82 6)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x4E5F)	; 也
+     ((=ucs		  . #x4E5F)	; 也
       ))
     (shinjigen-1	. 787)
     (shinjigen-2	. 787)
-    (japanese-jisx0212		. #x3426)	; ø»‹€
-    (chinese-isoir165		. #x7A28)	; ø»Ž±‰
-    (japanese-jisx0213-1	. #x2E6D)	; ø»¢§Ž
-    (chinese-big5		. #xC96C)	; øº¡¥°
-    (ideograph-daikanwa		. 02598)	; ø¸€¨¦
-    (ucs			. #x531C)	; 匜
+    (=jis-x0212		. #x3426)	; ø»‹€
+    (=iso-ir165		. #x7A28)	; ø»Ž±‰
+    (=jis-x0213-1-2000	. #x2E6D)	; ø»¢§Ž
+    (=big5		. #xC96C)	; ý¢€Œ¥¬
+    (ideograph-daikanwa . 02598)	; ø¸€¨¦
+    (=jef-china3	. #x45B1)	; øº„–±
+    (=ucs		. #x531C)	; 匜
     ))
 (define-char
   '((=>ucs		. #x531C)	; 匜
@@ -59,16 +74,14 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((chinese-cns11643-1 . #x443E)	; ø»‘¶“
+     ((=cns11643-1	  . #x443E)	; ø»‘¶“
       ))
-    (chinese-cns11643-2 . #x214D)	; ø»“Œ
+    (=cns11643-2	. #x214D)	; ø»“Œ
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -78,75 +91,97 @@
      (:sources	(shinjigen-1)
       :char	((ideographic-radical . 50)	; â¼±
 		 (shinjigen-1	     . 2079)
-		 (ucs		     . #x5E00)	; 帀
+		 (=ucs		     . #x5E00)	; 帀
 		 )
       ))
+    (hanyu-dazidian	1 82 4)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x5DFE)	; å·¾
+     ((=ucs		  . #x5DFE)	; å·¾
       ))
     (shinjigen-1	. 2080)
     (shinjigen-2	. 2080)
-    (japanese-jisx0208-1978	. #x4159)	; ø»‚«¸
-    (chinese-gb2312		. #x5451)	; ø»…‘®
-    (japanese-jisx0208		. #x4159)	; ø»‡€€
-    (chinese-isoir165		. #x5451)	; ø»¹¾
-    (chinese-cns11643-1		. #x4622)	; ø»‘¸³
-    (japanese-jisx0208-1990	. #x4159)	; ø½Š¥´
-    (chinese-big5		. #xA560)	; øºŸ¥”
-    (ideograph-daikanwa		. 02599)	; ø¸€¨§
-    (ucs			. #x531D)	; 匝
+    (=gb2312		. #x5451)	; ø»…‘®
+    (=jis-x0208		. #x4159)	; ø½Š¥´
+    (=iso-ir165		. #x5451)	; ø»¹¾
+    (=cns11643-1	. #x4622)	; ø»‘¸³
+    (=gt-pj-1		. #x4159)	; 匝
+    (=big5		. #xA560)	; ý¢€Š• 
+    (ideograph-daikanwa . 02599)	; ø¸€¨§
+    (=gt-k		. 00969)	; ý¡„€‰
+    (=ucs		. #x531D)	; 匝
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (japanese-jisx0212	. #x3427)	; ø»‹€
-    (chinese-cns11643-3 . #x2226)	; ø»•˜‡
+    (hanyu-dazidian	1 82 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x5DE5)	; å·¥
+      ))
+    (=jis-x0212		. #x3427)	; ø»‹€
+    (=cns11643-3	. #x2226)	; ø»•˜‡
     (ideograph-daikanwa . 02600)	; ø¸€¨¨
-    (ucs		. #x531E)	; 匞
+    (=hanziku-1		. #xB4D3)	; ý¢€›““
+    (=jef-china3	. #x45B2)	; øº„–²
+    (=ucs		. #x531E)	; 匞
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-5 . #x2237)	; ø»™¬ 
+    (=cns11643-5	. #x2237)	; ø»™¬ 
     (ideograph-daikanwa . 02601)	; ø¸€¨©
+    (=ucs		. #x2092E)	; 𠤮
+    ))
+(define-char
+  '((=>ucs		. #x2092E)	; 𠤮
+    (morohashi-daikanwa	2601 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (hanyu-dazidian	1 84 1)
+    (=hanziku-1		. #xB553)	; ý¢€›•“
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 . #x236E)	; ø»›¸¹
+    (hanyu-dazidian	1 83 3)
+    (=cns11643-6	. #x236E)	; ø»›¸¹
     (ideograph-daikanwa . 02602)	; ø¸€¨ª
+    (=hanziku-1		. #xB4F4)	; ý¢€›“´
+    (=ucs		. #x2092F)	; 𠤯
     ))
 (define-char
   '((=>ucs		. #x531F)	; 匟
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 84 6)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((japanese-jisx0208-1978	  . #x5036)	; ø»ƒ—
-      (japanese-jisx0208	  . #x5036)	; ø»‡•Ÿ
-      (korean-ksc5601		  . #x7971)	; ø»Šœ¬
-      (ideograph-daikanwa	  . 00288)	; ø¸€„ 
+     ((=jis-x0208	  . #x5036)	; ø½Š»“
+      (=ks-x1001	  . #x7971)	; ø»Šœ¬
+      (ideograph-daikanwa . 00288)	; ø¸€„ 
       ))
-    (japanese-jisx0212	. #x3428)	; ø»‹€‘
-    (chinese-big5	. #xC9C2)	; øº¡¦¤
+    (=jis-x0212		. #x3428)	; ø»‹€‘
+    (=big5		. #xC9C2)	; ý¢€Œ§‚
     (ideograph-daikanwa . 02603)	; ø¸€¨«
+    (=ucs@jis		. #x531F)	; ø»‹€‘
     ))
 (define-char
   '((morohashi-daikanwa	2603 0 0)
@@ -154,144 +189,158 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x4EA2)	; 亢
+     ((=ucs		  . #x4EA2)	; 亢
       ))
-    (chinese-cns11643-2 . #x2222)	; ø»“¿
-    (ucs		. #x531F)	; 匟
+    (=cns11643-2	. #x2222)	; ø»“¿
+    (=ucs		. #x531F)	; 匟
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
     (ideograph-daikanwa . 02604)	; ø¸€¨¬
+    (=ucs		. #x20930)	; ð ¤°
     ))
 (define-char
-  '((morohashi-daikanwa	2604 0 0)
+  '((=>ucs		. #x20930)	; ð ¤°
+    (morohashi-daikanwa	2604 0 0)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-4 . #x2243)	; ø»—¢¨
+    (hanyu-dazidian	1 84 2)
+    (=cns11643-4	. #x2243)	; ø»—¢¨
+    (=hanziku-1		. #xB554)	; ý¢€›•”
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 83 5)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x65A4)	; 斤
+     ((=ucs		  . #x65A4)	; 斤
       ))
     (shinjigen-1	. 789)
     (shinjigen-2	. 789)
-    (japanese-jisx0208-1978	. #x3E22)	; ø»‚¦§
-    (chinese-gb2312		. #x3D33)	; ø»„¯ž
-    (japanese-jisx0208		. #x3E22)	; ø»†º¯
-    (korean-ksc5601		. #x6D5D)	; ø»ŠŠ°
-    (chinese-isoir165		. #x3D33)	; ø»—®
-    (chinese-cns11643-1		. #x474C)	; ø»‘º»
-    (japanese-jisx0208-1990	. #x3E22)	; ø½Š £
-    (chinese-big5		. #xA64B)	; øºŸ§œ
-    (ideograph-daikanwa		. 02605)	; ø¸€¨­
-    (ucs			. #x5320)	; 匠
+    (=gb2312		. #x3D33)	; ø»„¯ž
+    (=jis-x0208		. #x3E22)	; ø½Š £
+    (=ks-x1001		. #x6D5D)	; ø»ŠŠ°
+    (=iso-ir165		. #x3D33)	; ø»—®
+    (=cns11643-1	. #x474C)	; ø»‘º»
+    (=gt-pj-1		. #x3E22)	; 匠
+    (=big5		. #xA64B)	; ý¢€Š™‹
+    (ideograph-daikanwa . 02605)	; ø¸€¨­
+    (=gt-k		. 01643)	; ý¡„€™«
+    (=ucs		. #x5320)	; 匠
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 83 1)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x738B)	; 王
+     ((=ucs		  . #x738B)	; 王
       ))
     (shinjigen-1	. 788)
     (shinjigen-2	. 788)
-    (japanese-jisx0208-1978	. #x3629)	; ø»‚š¾
-    (chinese-gb2312		. #x3F6F)	; ø»„³–
-    (japanese-jisx0208		. #x3629)	; ø»†¯†
-    (korean-ksc5601		. #x4E44)	; ø»‰œµ
-    (chinese-isoir165		. #x3F6F)	; ø»›¦
-    (chinese-cns11643-1		. #x474B)	; ø»‘ºº
-    (japanese-jisx0208-1990	. #x3629)	; ø½Š”º
-    (chinese-big5		. #xA64A)	; øºŸ§›
-    (ideograph-daikanwa		. 02606)	; ø¸€¨®
-    (ucs			. #x5321)	; 匡
+    (=gb2312		. #x3F6F)	; ø»„³–
+    (=jis-x0208		. #x3629)	; ø½Š”º
+    (=ks-x1001		. #x4E44)	; ø»‰œµ
+    (=iso-ir165		. #x3F6F)	; ø»›¦
+    (=cns11643-1	. #x474B)	; ø»‘ºº
+    (=gt-pj-1		. #x3629)	; 匡
+    (=big5		. #xA64A)	; ý¢€Š™Š
+    (ideograph-daikanwa . 02606)	; ø¸€¨®
+    (=gt-k		. 01592)	; ý¡„€˜¸
+    (=ucs		. #x5321)	; 匡
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 . #x236D)	; ø»›¸¸
+    (=cns11643-6	. #x236D)	; ø»›¸¸
     (ideograph-daikanwa . 02607)	; ø¸€¨¯
+    (mojikyo		. 002607)	; ý €€¨¯
+    (=ucs		. #x20931)	; 𠤱
+    ))
+(define-char
+  '((=>ucs		. #x20931)	; 𠤱
+    (morohashi-daikanwa	2607 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (hanyu-dazidian	1 83 2)
+    (=hanziku-1		. #xB4F3)	; ý¢€›“³
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 84 5)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x52FF)	; 勿
+     ((=ucs		  . #x52FF)	; 勿
       ))
-    (chinese-cns11643-2 . #x2221)	; ø»“¾
-    (chinese-big5	. #xC9C1)	; øº¡¦£
+    (=cns11643-2	. #x2221)	; ø»“¾
+    (=big5		. #xC9C1)	; ý¢€Œ§
     (ideograph-daikanwa . 02608)	; ø¸€¨°
-    (ucs		. #x5322)	; 匢
+    (=ucs		. #x5322)	; 匢
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (chinese-cns11643-6 . #x2634)	; ø»›¼™
+    (hanyu-dazidian	1 84 8)
+    (=cns11643-6	. #x2634)	; ø»›¼™
     (ideograph-daikanwa . 02609)	; ø¸€¨±
+    (=hanziku-1		. #xB55A)	; ý¢€›•š
+    (=jef-china3	. #x8FB6)	; øºˆ¾¶
+    (mojikyo		. 002609)	; ý €€¨±
+    (=ucs		. #x20933)	; 𠤳
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (hanyu-dazidian	1 84 11)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x7532)	; 甲
+     ((=ucs		  . #x7532)	; 甲
       ))
     (shinjigen-1	. 790)
     (shinjigen-2	. 790)
-    (japanese-jisx0208-1978	. #x523A)	; ø»ƒ„—
-    (chinese-gb2312		. #x4F3B)	; ø»…Š‚
-    (japanese-jisx0208		. #x523A)	; ø»‡˜Ÿ
-    (korean-ksc5601		. #x4B21)	; ø»‰—¸
-    (chinese-isoir165		. #x4F3B)	; ø»²’
-    (chinese-cns11643-1		. #x493A)	; ø»‘½¥
-    (japanese-jisx0208-1990	. #x523A)	; ø½Š¾“
-    (chinese-big5		. #xA758)	; øºŸª†
-    (ideograph-daikanwa		. 02610)	; ø¸€¨²
-    (ucs			. #x5323)	; 匣
+    (=gb2312		. #x4F3B)	; ø»…Š‚
+    (=jis-x0208		. #x523A)	; ø½Š¾“
+    (=ks-x1001		. #x4B21)	; ø»‰—¸
+    (=iso-ir165		. #x4F3B)	; ø»²’
+    (=cns11643-1	. #x493A)	; ø»‘½¥
+    (=gt-pj-1		. #x523A)	; 匣
+    (=big5		. #xA758)	; ý¢€Š˜
+    (ideograph-daikanwa . 02610)	; ø¸€¨²
+    (=gt-k		. 02687)	; ý¡„€©¿
+    (=ucs		. #x5323)	; 匣
     ))
 (define-char
   '((=>ucs		. #x352F)	; 㔯
@@ -305,102 +354,164 @@
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (chinese-cns11643-4 . #x234B)	; ø»—¤Ž
-    (ucs		. #x352F)	; 㔯
+    (=cns11643-4	. #x234B)	; ø»—¤Ž
+    (=ucs		. #x352F)	; 㔯
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (chinese-cns11643-4 . #x234A)	; ø»—¤
+    (hanyu-dazidian	1 85 1)
+    (=cns11643-4	. #x234A)	; ø»—¤
     (ideograph-daikanwa . 02612)	; ø¸€¨´
+    (=hanziku-1		. #xB573)	; ý¢€›•³
+    (=ucs		. #x20934)	; ð ¤´
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (chinese-cns11643-5		. #x234B)	; ø»™®’
-    (japanese-jisx0213-2	. #x234E)	; ø»¤ ©
-    (ideograph-daikanwa		. 02613)	; ø¸€¨µ
-    (ucs			. #x5324)	; 匤
+    (hanyu-dazidian	1 84 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x7389)	; 玉
+      ))
+    (=cns11643-5	. #x234B)	; ø»™®’
+    (=jis-x0213-2-2000	. #x234E)	; ø»¤ ©
+    (ideograph-daikanwa . 02613)	; ø¸€¨µ
+    (=hanziku-1		. #xB559)	; ý¢€›•™
+    (=jef-china3	. #x45B3)	; øº„–³
+    (=ucs		. #x5324)	; 匤
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (japanese-jisx0212	. #x3429)	; ø»‹€’
-    (chinese-cns11643-3 . #x2465)	; ø»•œ‚
+    (hanyu-dazidian	1 85 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x5F01)	; 弁
+      ))
+    (=jis-x0212		. #x3429)	; ø»‹€’
+    (=cns11643-3	. #x2465)	; ø»•œ‚
     (ideograph-daikanwa . 02614)	; ø¸€¨¶
-    (ucs		. #x5325)	; 匥
+    (=hanziku-1		. #xB57B)	; ý¢€›•»
+    (=jef-china3	. #x45B4)	; øº„–´
+    (=ucs		. #x5325)	; 匥
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (chinese-cns11643-6 . #x2635)	; ø»›¼š
+    (hanyu-dazidian	1 85 2)
+    (=cns11643-6	. #x2635)	; ø»›¼š
     (ideograph-daikanwa . 02615)	; ø¸€¨·
+    (=hanziku-1		. #xB574)	; ý¢€›•´
+    (=ucs		. #x20935)	; 𠤵
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2973)	; ø»œ²
+    (hanyu-dazidian	1 85 11)
+    (=cns11643-6	. #x2973)	; ø»œ²
     (ideograph-daikanwa . 02616)	; ø¸€¨¸
+    (=hanziku-1		. #xB57D)	; ý¢€›•½
+    (=ucs		. #x20938)	; 𠤸
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (hanyu-dazidian	1 85 13)
     (ideograph-daikanwa . 02617)	; ø¸€¨¹
+    (=hanziku-1		. #xB5A1)	; ý¢€›–¡
+    (=ucs		. #x20939)	; 𠤹
     ))
 (define-char
-  '((morohashi-daikanwa	2617 0 0)
+  '((=>ucs		. #x20939)	; 𠤹
+    (morohashi-daikanwa	2617 0 0)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-5 . #x253E)	; ø»™±
+    (=cns11643-5	. #x253E)	; ø»™±
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-5 . #x253F)	; ø»™±‚
+    (hanyu-dazidian	1 85 12)
+    (=cns11643-5	. #x253F)	; ø»™±‚
     (ideograph-daikanwa . 02618)	; ø¸€¨º
+    (=hanziku-1		. #xB57E)	; ý¢€›•¾
+    (=ucs		. #x2093A)	; 𠤺
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
-    (ideographic-strokes . 6)
+  '((morohashi-daikanwa	2683 0 0)
+    (ideographic-	(:radical	22 ; ⼕
+			 :strokes	6)
+			(:radical	23 ; ⼖
+			 :strokes	6))
     (total-strokes	 . 8)
-    (chinese-gb2312	. #x5850)	; ø»…—¥
-    (chinese-isoir165	. #x5850)	; ø»¿µ
-    (ucs		. #x5326)	; 匦
+    (->same-ideograph
+     ((ideograph-daikanwa . 02683)	; ø¸€©»
+      ))
+    (hanyu-dazidian	1 85 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x5408)	; 合
+      ))
+    (=cns11643-2	. #x2558)	; ø»““
+    (=big5		. #xCBD8)	; ý¢€Œ¯˜
+    (=jef-china3	. #x45B6)	; øº„–¶
+    (=ucs		. #x533C)	; 匼
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (->same-ideograph
-     ((ideograph-daikanwa . 02683)	; ø¸€©»
-      ))
+    (hanyu-dazidian	1 85 10)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x5408)	; 合
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x8F66)	; 车
+	)
+       ((=ucs		    . #x4E5D)	; 九
+	))
       ))
-    (chinese-cns11643-2 . #x2558)	; ø»““
-    (ucs		. #x533C)	; 匼
+    (=gb2312		. #x5850)	; ø»…—¥
+    (=iso-ir165		. #x5850)	; ø»¿µ
+    (=hanziku-1		. #xB57C)	; ý¢€›•¼
+    (=ucs		. #x5326)	; 匦
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-4 . #x284F)	; ø»—«¨
+    (hanyu-dazidian	1 86 4)
+    (=cns11643-4	. #x284F)	; ø»—«¨
     (ideograph-daikanwa . 02619)	; ø¸€¨»
+    (=hanziku-1		. #xB5B8)	; ý¢€›–¸
+    (=ucs		. #x2093C)	; 𠤼
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -412,87 +523,186 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (japanese-jisx0212	. #x342A)	; ø»‹€“
-    (chinese-cns11643-3 . #x2B49)	; ø»•¥¸
+    (hanyu-dazidian	1 85 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x593E)	; 夾
+      ))
+    (=jis-x0212		. #x342A)	; ø»‹€“
+    (=cns11643-3	. #x2B49)	; ø»•¥¸
     (ideograph-daikanwa . 02621)	; ø¸€¨½
-    (ucs		. #x5327)	; 匧
+    (=hanziku-1		. #xB5A6)	; ý¢€›–¦
+    (=jef-china3	. #x45B7)	; øº„–·
+    (=ucs		. #x5327)	; 匧
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x2F34)	; ø»œ‰§
+    (=cns11643-6	. #x2F34)	; ø»œ‰§
     (ideograph-daikanwa . 02622)	; ø¸€¨¾
+    (=ucs		. #x2093E)	; 𠤾
+    ))
+(define-char
+  '((=>ucs		. #x2093E)	; 𠤾
+    (morohashi-daikanwa	2622 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 86 1)
+    (=hanziku-1		. #xB5B5)	; ý¢€›–µ
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-5 . #x2833)	; ø»™µ
+    (=cns11643-5	. #x2833)	; ø»™µ
     (ideograph-daikanwa . 02623)	; ø¸€¨¿
+    (=ucs		. #x2093F)	; 𠤿
+    ))
+(define-char
+  '((=>ucs		. #x2093F)	; 𠤿
+    (morohashi-daikanwa	2623 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 86 7)
+    (=hanziku-1		. #xB5BB)	; ý¢€›–»
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (japanese-jisx0212	. #x342B)	; ø»‹€”
-    (chinese-cns11643-4 . #x284E)	; ø»—«§
+    (hanyu-dazidian	1 86 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x58EF)	; 壯
+      ))
+    (=jis-x0212		. #x342B)	; ø»‹€”
+    (=cns11643-4	. #x284E)	; ø»—«§
     (ideograph-daikanwa . 02624)	; ø¸€©€
-    (ucs		. #x5328)	; 匨
+    (=hanziku-1		. #xB5BE)	; ý¢€›–¾
+    (=jef-china3	. #x45B8)	; øº„–¸
+    (=ucs		. #x5328)	; 匨
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x2F33)	; ø»œ‰¦
+    (hanyu-dazidian	1 85 17)
+    (=cns11643-6	. #x2F33)	; ø»œ‰¦
     (ideograph-daikanwa . 02625)	; ø¸€©
+    (=hanziku-1		. #xB5A5)	; ý¢€›–¥
+    (=ucs		. #x20940)	; 𠥀
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (japanese-jisx0212	. #x342C)	; ø»‹€•
-    (chinese-cns11643-4 . #x2850)	; ø»—«©
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x5C6E)	; å±®
+	)
+       ((=ucs		    . #x738B)	; 王
+	))
+      ))
+    (=jis-x0212		. #x342C)	; ø»‹€•
+    (=cns11643-4	. #x2850)	; ø»—«©
     (ideograph-daikanwa . 02626)	; ø¸€©‚
-    (ucs		. #x5329)	; 匩
+    (=jef-china3	. #x45B9)	; øº„–¹
+    (mojikyo		. 002626)	; ý €€©‚
+    (=ucs		. #x5329)	; 匩
+    ))
+(define-char
+  '((morohashi-daikanwa	2626 0 2)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 86 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x5C71)	; å±±
+	)
+       ((=ucs		    . #x738B)	; 王
+	))
+      ))
+    (=hanziku-1		. #xB5B6)	; ý¢€›–¶
+    (=ucs		. #x20946)	; 𠥆
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-5 . #x2832)	; ø»™µ
+    (hanyu-dazidian	1 86 5)
+    (=cns11643-5	. #x2832)	; ø»™µ
     (ideograph-daikanwa . 02627)	; ø¸€©ƒ
+    (=hanziku-1		. #xB5B9)	; ý¢€›–¹
+    (=ucs		. #x20941)	; 𠥁
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x20942)	; 𠥂
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x2F32)	; ø»œ‰¥
+    (=cns11643-6	. #x2F32)	; ø»œ‰¥
     (ideograph-daikanwa . 02628)	; ø¸€©„
+    (mojikyo		. 002628)	; ý €€©„
+    ))
+(define-char
+  '((morohashi-daikanwa	2628 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 85 16)
+    (=hanziku-1		. #xB5A4)	; ý¢€›–¤
+    (=ucs		. #x20942)	; 𠥂
     ))
 (define-char
   '((=>ucs		. #x532A)	; 匪
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
+    (hanyu-dazidian	1 87 1)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x975E)	; 非
+     ((=cns11643-1	  . #x4F66)	; ø»’‡…
       ))
     (shinjigen-1	. 791)
     (shinjigen-2	. 791)
-    (japanese-jisx0208-1978	. #x485B)	; ø»‚¶Œ
-    (japanese-jisx0208		. #x485B)	; ø»‡Š”
-    (chinese-cns11643-1		. #x544D)	; ø»’Ž‚
-    (japanese-jisx0208-1990	. #x485B)	; ø½Š°ˆ
-    (chinese-big5		. #xADEA)	; øºŸº¤
-    (ideograph-daikanwa		. 02629)	; ø¸€©…
+    (=jis-x0208		. #x485B)	; ø½Š°ˆ
+    (=cns11643-1	. #x544D)	; ø»’Ž‚
+    (=gt-pj-1		. #x485B)	; ø½Š°ˆ
+    (ideograph-daikanwa . 02629)	; ø¸€©…
+    (=gt-k		. 06536)	; ý¡„¦ˆ
+    (=ucs@jis		. #x532A)	; ø½Š°ˆ
     ))
 (define-char
   '((=>ucs		. #x532A)	; 匪
@@ -501,79 +711,104 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ideograph-daikanwa . 42585)	; ø¸Š™™
+     ((=jis-x0208	  . #x4873)	; ø½Š° 
+      (=ks-x1001	  . #x5E2A)	; ø»‰³»
+      (ideograph-daikanwa . 42585)	; ø¸Š™™
       ))
-    (korean-ksc5601	. #x5D63)	; ø»‰³–
+    (=ks-x1001		. #x5D63)	; ø»‰³–
+    (=big5		. #xADEA)	; ý¢€Š·ª
+    (=ucs@big5		. #x532A)	; ø»‰³–
     ))
 (define-char
-  '((morohashi-daikanwa	2629 0 1)
+  '((morohashi-daikanwa	2629 0 2)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x975E)	; 非
+     ((=ucs		  . #x975E)	; 非
       ))
-    (chinese-gb2312	. #x374B)	; ø»„§‚
-    (chinese-isoir165	. #x374B)	; ø»’
-    (ucs		. #x532A)	; 匪
+    (=gb2312		. #x374B)	; ø»„§‚
+    (=iso-ir165		. #x374B)	; ø»’
+    (=ucs		. #x532A)	; 匪
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-5 . #x2C30)	; ø»™»…
+    (hanyu-dazidian	1 87 3)
+    (=cns11643-5	. #x2C30)	; ø»™»…
     (ideograph-daikanwa . 02630)	; ø¸€©†
+    (=hanziku-1		. #xB5D7)	; ý¢€›——
+    (=ucs		. #x20949)	; 𠥉
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (japanese-jisx0212	. #x342D)	; ø»‹€–
-    (chinese-cns11643-4 . #x2B78)	; ø»—°«
+    (hanyu-dazidian	1 87 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x66F6)	; 曶
+      ))
+    (=jis-x0212		. #x342D)	; ø»‹€–
+    (=cns11643-4	. #x2B78)	; ø»—°«
     (ideograph-daikanwa . 02631)	; ø¸€©‡
-    (ucs		. #x532B)	; 匫
+    (=hanziku-1		. #xB5D9)	; ý¢€›—™
+    (=ucs		. #x532B)	; 匫
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3562)	; ø»œ“‰
+    (hanyu-dazidian	1 86 11)
+    (=cns11643-6	. #x3562)	; ø»œ“‰
     (ideograph-daikanwa . 02632)	; ø¸€©ˆ
+    (=hanziku-1		. #xB5BF)	; ý¢€›–¿
+    (=ucs		. #x2094A)	; 𠥊
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3561)	; ø»œ“ˆ
+    (hanyu-dazidian	1 87 6)
+    (=cns11643-6	. #x3561)	; ø»œ“ˆ
     (ideograph-daikanwa . 02633)	; ø¸€©‰
+    (=hanziku-1		. #xB5DA)	; ý¢€›—š
+    (=ucs		. #x2094B)	; 𠥋
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-5 . #x2C31)	; ø»™»†
+    (hanyu-dazidian	1 87 4)
+    (=cns11643-5	. #x2C31)	; ø»™»†
     (ideograph-daikanwa . 02634)	; ø¸€©Š
+    (=hanziku-1		. #xB5D8)	; ý¢€›—˜
+    (=ucs		. #x2094C)	; 𠥌
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3563)	; ø»œ“Š
+    (hanyu-dazidian	1 89 7)
+    (=cns11643-6	. #x3563)	; ø»œ“Š
     (ideograph-daikanwa . 02635)	; ø¸€©‹
+    (=big5-cdp		. #x88C4)	; ý¢€ˆ£„
+    (=ucs		. #x20953)	; 𠥓
     ))
 (define-char
   '((=>ucs		. #x3531)	; 㔱
@@ -587,104 +822,206 @@
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-4 . #x2B77)	; ø»—°ª
-    (ucs		. #x3531)	; 㔱
+    (=cns11643-4	. #x2B77)	; ø»—°ª
+    (=ucs		. #x3531)	; 㔱
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x532C)	; 匬
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (japanese-jisx0212	. #x342E)	; ø»‹€—
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=jis-x0208	  . #x5141)	; ø½Š¼¼
+      (=ks-x1001	  . #x6A64)	; ø»Š†
+      (ideograph-daikanwa . 01437)	; ø¸€–
+      ))
+    (=jis-x0212		. #x342E)	; ø»‹€—
     (ideograph-daikanwa . 02637)	; ø¸€©
-    (ucs		. #x532C)	; 匬
+    (=ucs@jis		. #x532C)	; ø»‹€—
+    ))
+(define-char
+  '((=>ucs		. #x532C)	; 匬
+    (morohashi-daikanwa	2637 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 88 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=hanziku-1	  . #xC3C3)	; ý¢€œƒ
+      ))
+    (=hanziku-1		. #xB5F6)	; ý¢€›—¶
+    ))
+(define-char
+  '((morohashi-daikanwa	2637 0 2)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x4FDE)	; 俞
+      ))
+    (=ucs		. #x532C)	; 匬
     ))
 (define-char
   '((=>ucs		. #x532C)	; 匬
-    (morohashi-daikanwa	2637 0 2)
+    (morohashi-daikanwa	2637 0 3)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (chinese-cns11643-4 . #x305F)	; ø»—·¨
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=cns11643-1	  . #x4F7E)	; ø»’‡
+      ))
+    (=cns11643-4	. #x305F)	; ø»—·¨
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 . #x3D55)	; ø»œž¬
+    (hanyu-dazidian	1 88 4)
     (ideograph-daikanwa . 02638)	; ø¸€©Ž
+    (=hanziku-1		. #xB5F8)	; ý¢€›—¸
+    (=ucs		. #x2094E)	; 𠥎
+    ))
+(define-char
+  '((=>ucs		. #x2094E)	; 𠥎
+    (morohashi-daikanwa	2638 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (=cns11643-6	. #x3D55)	; ø»œž¬
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (hanyu-dazidian	1 87 8)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x8ECC)	; 軌
+     ((=ucs		  . #x8ECC)	; 軌
       ))
     (shinjigen-1	. 792)
-    (japanese-jisx0212	. #x342F)	; ø»‹€˜
-    (chinese-cns11643-2 . #x3372)	; ø»“¨
-    (chinese-gb12345	. #x5850)	; 匭
-    (chinese-big5	. #xD46F)	; øº¢€²
+    (=jis-x0212		. #x342F)	; ø»‹€˜
+    (=cns11643-2	. #x3372)	; ø»“¨
+    (=gb12345		. #x5850)	; 匭
+    (=big5		. #xD46F)	; ý¢€‘¯
     (ideograph-daikanwa . 02639)	; ø¸€©
-    (ucs		. #x532D)	; 匭
+    (=jef-china3	. #x97D2)	; øº‰Ÿ’
+    (mojikyo		. 002639)	; ý €€©
+    (=ucs		. #x532D)	; 匭
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (chinese-cns11643-4 . #x364F)	; ø»˜€Œ
+    (=cns11643-4	. #x364F)	; ø»˜€Œ
     (ideograph-daikanwa . 02640)	; ø¸€©
+    (=ucs		. #x20950)	; 𠥐
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x20950)	; 𠥐
+    (morohashi-daikanwa	2640 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (hanyu-dazidian	1 89 5)
+    (=hanziku-1		. #xB65A)	; ý¢€›™š
+    ))
+(define-char
+  '((=>ucs		. #x20951)	; 𠥑
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (ideograph-daikanwa . 02641)	; ø¸€©‘
+    (mojikyo		. 002641)	; ý €€©‘
     ))
 (define-char
-  '((morohashi-daikanwa	2641 0 2)
+  '((=>ucs		. #x20951)	; 𠥑
+    (morohashi-daikanwa	2641 0 0)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5075)	; ø»œ»†
+    (=cns11643-6	. #x5075)	; ø»œ»†
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((morohashi-daikanwa	2641 0 1)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (hanyu-dazidian	1 89 2)
+    (=hanziku-1		. #xB657)	; ý¢€›™—
+    (=ucs		. #x20951)	; 𠥑
+    ))
+(define-char
+  '((=>ucs		. #x20952)	; 𠥒
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (ideograph-daikanwa . 02642)	; ø¸€©’
     ))
 (define-char
-  '((morohashi-daikanwa	2642 0 3)
+  '((morohashi-daikanwa	2642 0 2)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4673)	; ø»œ¬˜
+    (hanyu-dazidian	1 89 4)
+    (=cns11643-6	. #x4673)	; ø»œ¬˜
+    (=hanziku-1		. #xB659)	; ý¢€›™™
+    (=ucs		. #x20952)	; 𠥒
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (non-morohashi	2642 9 1)
-    (chinese-cns11643-3 . #x3A25)	; ø»•»–
-    (ucs		. #x3532)	; 㔲
+    (=cns11643-3	. #x3A25)	; ø»•»–
+    (=ucs		. #x3532)	; 㔲
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 10)
-    (kangxi-strokes	 . 9)
     (total-strokes	 . 12)
-    (non-morohashi	2642 9 0)
-    (chinese-gb2312	. #x5851)	; ø»…—¦
-    (chinese-isoir165	. #x5851)	; ø»¿¶
-    (ucs		. #x532E)	; 匮
+    (hanyu-dazidian	1 87 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8C48)	; ý¢€ˆ±ˆ
+	)
+       ((=ucs		    . #x8D1D)	; 贝
+	))
+      ))
+    (=gb2312		. #x5851)	; ø»…—¦
+    (=iso-ir165		. #x5851)	; ø»¿¶
+    (=hanziku-1		. #xB5DD)	; ý¢€›—
+    (=ucs		. #x532E)	; 匮
     ))
 (define-char
   '((=>ucs		. #x3533)	; 㔳
@@ -698,8 +1035,8 @@
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5076)	; ø»œ»‡
-    (ucs		. #x3533)	; 㔳
+    (=cns11643-6	. #x5076)	; ø»œ»‡
+    (=ucs		. #x3533)	; 㔳
     ))
 (define-char
   '((=>ucs		. #x532F)	; 匯
@@ -707,52 +1044,52 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((japanese-jisx0208-1978	  . #x5E4E)	; ø»ƒ–“
-      (japanese-jisx0208	  . #x5E4E)	; ø»‡ª›
-      (korean-ksc5601		  . #x7C67)	; ø»Š ¼
-      (ideograph-daikanwa	  . 17682)	; ø¸„”’
+     ((=jis-x0208	  . #x5E4E)	; ø½‹
+      (=ks-x1001	  . #x7C67)	; ø»Š ¼
+      (ideograph-daikanwa . 17682)	; ø¸„”’
       ))
     (shinjigen-1	. 793)
     (shinjigen-2	. 793)
-    (japanese-jisx0208-1978	. #x523B)	; ø»ƒ„˜
-    (japanese-jisx0208		. #x523B)	; ø»‡˜ 
-    (korean-ksc5601		. #x7C5D)	; ø»Š ²
-    (japanese-jisx0208-1990	. #x523B)	; ø½Š¾”
-    (ideograph-daikanwa		. 02644)	; ø¸€©”
+    (=jis-x0208		. #x523B)	; ø½Š¾”
+    (=ks-x1001		. #x7C5D)	; ø»Š ²
+    (=gt-pj-1		. #x523B)	; ø½Š¾”
+    (=big5		. #xB6D7)	; ý¢€‹›—
+    (ideograph-daikanwa . 02644)	; ø¸€©”
+    (=gt-k		. 10296)	; ý¡„‚ ¸
+    (=ucs@jis		. #x532F)	; ø½Š¾”
     ))
 (define-char
   '((morohashi-daikanwa	2644 0 1)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
+    (hanyu-dazidian	1 89 10)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x6DEE)	; æ·®
+     ((=ucs		  . #x6DEE)	; æ·®
       ))
-    (chinese-cns11643-1 . #x633E)	; ø»’£µ
-    (chinese-gb12345	. #x3B63)	; 匯
-    (chinese-big5	. #xB6D7)	; øº –
-    (ucs		. #x532F)	; 匯
+    (=cns11643-1	. #x633E)	; ø»’£µ
+    (=gb12345		. #x3B63)	; 匯
+    (=ucs		. #x532F)	; 匯
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (chinese-cns11643-5 . #x3D7A)	; ø»š•
+    (hanyu-dazidian	1 89 8)
+    (=cns11643-5	. #x3D7A)	; ø»š•
     (ideograph-daikanwa . 02645)	; ø¸€©•
+    (=hanziku-1		. #xB65D)	; ý¢€›™
+    (=ucs		. #x20956)	; 𠥖
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -761,6 +1098,13 @@
     (ideograph-daikanwa . 02646)	; ø¸€©–
     ))
 (define-char
+  '((=>ucs		. #x3532)	; 㔲
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (mojikyo		. 083453)	; ý €”—½
+    ))
+(define-char
   '((=>ucs		. #x3534)	; 㔴
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
@@ -772,74 +1116,84 @@
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (chinese-cns11643-4 . #x3C3E)	; ø»˜ˆ¯
-    (ucs		. #x3534)	; 㔴
+    (=cns11643-4	. #x3C3E)	; ø»˜ˆ¯
+    (=ucs		. #x3534)	; 㔴
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x20959)	; 𠥙
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
     (ideograph-daikanwa . 02648)	; ø¸€©˜
     ))
 (define-char
+  '((=>ucs		. #x20959)	; 𠥙
+    (morohashi-daikanwa	2648 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 90 2)
+    (=hanziku-1		. #xB677)	; ý¢€›™·
+    (mojikyo		. 002648)	; ý €€©˜
+    ))
+(define-char
   '((morohashi-daikanwa	2648 0 2)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-cns11643-4 . #x4248)	; ø»˜‘­
+    (=cns11643-4	. #x4248)	; ø»˜‘­
+    (=ucs		. #x20959)	; 𠥙
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-cns11643-5 . #x446C)	; ø»šŸ‘
+    (=cns11643-5	. #x446C)	; ø»šŸ‘
     (ideograph-daikanwa . 02649)	; ø¸€©™
-    (ucs		. #x3535)	; 㔵
+    (=ucs		. #x3535)	; 㔵
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
+    (hanyu-dazidian	1 90 1)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x55AE)	; 單
+     ((=ucs		  . #x55AE)	; 單
       ))
-    (japanese-jisx0212	. #x3430)	; ø»‹€™
-    (chinese-cns11643-2 . #x492C)	; ø»”‡›
-    (chinese-big5	. #xE145)	; øº¢ 
+    (=jis-x0212		. #x3430)	; ø»‹€™
+    (=cns11643-2	. #x492C)	; ø»”‡›
+    (=big5		. #xE145)	; ý¢€Ž……
     (ideograph-daikanwa . 02650)	; ø¸€©š
-    (ucs		. #x5330)	; 匰
+    (=ucs		. #x5330)	; 匰
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
+    (hanyu-dazidian	1 89 14)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x8CB4)	; è²´
+     ((=ucs		  . #x8CB4)	; è²´
       ))
     (shinjigen-1	. 795)
     (shinjigen-2	. 795)
-    (japanese-jisx0208-1978	. #x523C)	; ø»ƒ„™
-    (japanese-jisx0208		. #x523C)	; ø»‡˜¡
-    (chinese-cns11643-1		. #x6824)	; ø»’ª±
-    (japanese-jisx0208-1990	. #x523C)	; ø½Š¾•
-    (chinese-gb12345		. #x5851)	; 匱
-    (chinese-big5		. #xB9BC)	; øº —’
-    (ideograph-daikanwa		. 02651)	; ø¸€©›
-    (ucs			. #x5331)	; 匱
+    (=jis-x0208		. #x523C)	; ø½Š¾•
+    (=cns11643-1	. #x6824)	; ø»’ª±
+    (=gb12345		. #x5851)	; 匱
+    (=gt-pj-1		. #x523C)	; 匱
+    (=big5		. #xB9BC)	; ý¢€‹¦¼
+    (ideograph-daikanwa . 02651)	; ø¸€©›
+    (=gt-k		. 11194)	; ý¡„‚®º
+    (=ucs		. #x5331)	; 匱
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -851,188 +1205,332 @@
 		 (ideograph-daikanwa . 02655)	; ø¸€©Ÿ
 		 )
       ))
+    (hanyu-dazidian	1 89 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-      (ucs		  . #x2FF7)	; â¿·
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(ucs		    . #x2FF1)	; ⿱
-	)
-       ((ucs		    . #x5927)	; 大
-	)
-       ((ucs		    . #x54C1)	; 品
-	))
+     ((=ucs		  . #x21657)	; 𡙗
       ))
     (shinjigen-1	. 798)
-    (japanese-jisx0212	. #x3431)	; ø»‹€š
-    (chinese-cns11643-3 . #x4623)	; ø»–Œ¼
+    (=jis-x0212		. #x3431)	; ø»‹€š
+    (=cns11643-3	. #x4623)	; ø»–Œ¼
     (ideograph-daikanwa . 02652)	; ø¸€©œ
-    (ideograph-cbeta	. 02324)	; ø¸ ¤”
-    (ucs		. #x5332)	; 匲
+    (=hanziku-1		. #xB662)	; ý¢€›™¢
+    (=cbeta		. 02324)	; ø¸ ¤”
+    (=jef-china3	. #x45BC)	; øº„–¼
+    (=ucs		. #x5332)	; 匲
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x2095A)	; 𠥚
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5B31)	; ø»ŠŒ
     (ideograph-daikanwa . 02653)	; ø¸€©
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((morohashi-daikanwa	2653 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (=cns11643-6	. #x5B31)	; ø»ŠŒ
+    (=ucs		. #x2095A)	; 𠥚
+    ))
+(define-char
+  '((=>ucs		. #x2095A)	; 𠥚
+    (morohashi-daikanwa	2653 0 1)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 89 12)
+    (=hanziku-1		. #xB661)	; ý¢€›™¡
+    (mojikyo		. 002653)	; ý €€©
+    ))
+(define-char
+  '((=>ucs		. #x2095B)	; 𠥛
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5B30)	; ø»Š‹
     (ideograph-daikanwa . 02654)	; ø¸€©ž
+    (mojikyo		. 002654)	; ý €€©ž
+    ))
+(define-char
+  '((morohashi-daikanwa	2654 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 90 3)
+    (=cns11643-6	. #x5B30)	; ø»Š‹
+    (=hanziku-1		. #xB678)	; ý¢€›™¸
+    (=ucs		. #x2095B)	; 𠥛
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
+    (hanyu-dazidian	1 90 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-      (ucs		  . #x2FF7)	; â¿·
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x50C9)	; 僉
+     ((=ucs		  . #x50C9)	; 僉
       ))
     (shinjigen-1	. 796)
     (shinjigen-2	. 796)
-    (japanese-jisx0208-1978	. #x523D)	; ø»ƒ„š
-    (japanese-jisx0208		. #x523D)	; ø»‡˜¢
-    (chinese-cns11643-3		. #x4B34)	; ø»–”£
-    (japanese-jisx0208-1990	. #x523D)	; ø½Š¾–
-    (ideograph-daikanwa		. 02655)	; ø¸€©Ÿ
-    (ideograph-cbeta		. 00633)	; ø¸ ‰¹
-    (ucs			. #x5333)	; 匳
+    (=jis-x0208		. #x523D)	; ø½Š¾–
+    (=cns11643-3	. #x4B34)	; ø»–”£
+    (=gt-pj-1		. #x523D)	; 匳
+    (ideograph-daikanwa . 02655)	; ø¸€©Ÿ
+    (=hanziku-1		. #xB67D)	; ý¢€›™½
+    (=gt-k		. 11965)	; ý¡„‚º½
+    (=cbeta		. 00633)	; ø¸ ‰¹
+    (=ucs		. #x5333)	; 匳
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (chinese-cns11643-5 . #x4C2C)	; ø»šª
+    (hanyu-dazidian	1 90 6)
     (ideograph-daikanwa . 02656)	; ø¸€© 
+    (=hanziku-1		. #xB67B)	; ý¢€›™»
+    (=ucs		. #x2095C)	; 𠥜
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x2095C)	; 𠥜
+    (morohashi-daikanwa	2656 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 13)
+    (total-strokes	 . 15)
+    (=cns11643-5	. #x4C2C)	; ø»šª
+    ))
+(define-char
+  '((=>ucs		. #x2095D)	; 𠥝
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (chinese-cns11643-5 . #x4C2D)	; ø»šª‚
     (ideograph-daikanwa . 02657)	; ø¸€©¡
     ))
 (define-char
+  '((morohashi-daikanwa	2657 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 13)
+    (total-strokes	 . 15)
+    (hanyu-dazidian	1 90 7)
+    (=cns11643-5	. #x4C2D)	; ø»šª‚
+    (=hanziku-1		. #xB67C)	; ý¢€›™¼
+    (=ucs		. #x2095D)	; 𠥝
+    ))
+(define-char
+  '((=>ucs		. #x2095D)	; 𠥝
+    (morohashi-daikanwa	2657 0 1)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 13)
+    (total-strokes	 . 15)
+    (mojikyo		. 002657)	; ý €€©¡
+    ))
+(define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
+    (hanyu-dazidian	1 90 5)
     (ideograph-daikanwa . 02658)	; ø¸€©¢
+    (=hanziku-1		. #xB67A)	; ý¢€›™º
+    (=ucs		. #x2095E)	; 𠥞
     ))
 (define-char
-  '((morohashi-daikanwa	2658 0 0)
+  '((=>ucs		. #x2095E)	; 𠥞
+    (morohashi-daikanwa	2658 0 0)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (chinese-cns11643-5 . #x4C2E)	; ø»šªƒ
+    (=cns11643-5	. #x4C2E)	; ø»šªƒ
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
+    (hanyu-dazidian	1 90 10)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x7B97)	; 算
+     ((=ucs		  . #x7B97)	; 算
       ))
-    (chinese-cns11643-2 . #x5645)	; ø»”šº
-    (chinese-big5	. #xE8FA)	; øº¢³Ÿ
+    (=cns11643-2	. #x5645)	; ø»”šº
+    (=big5		. #xE8FA)	; ý¢€Ž£º
     (ideograph-daikanwa . 02659)	; ø¸€©£
-    (ucs		. #x5334)	; 匴
+    (=ucs		. #x5334)	; 匴
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
-    (chinese-cns11643-5 . #x5364)	; ø»šµ‹
+    (hanyu-dazidian	1 90 9)
     (ideograph-daikanwa . 02660)	; ø¸€©¤
+    (=hanziku-1		. #xB67E)	; ý¢€›™¾
+    (=ucs		. #x20962)	; ð ¥¢
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x20962)	; ð ¥¢
+    (morohashi-daikanwa	2660 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 14)
+    (total-strokes	 . 16)
+    (=cns11643-5	. #x5364)	; ø»šµ‹
+    ))
+(define-char
+  '((=>ucs		. #x20963)	; ð ¥£
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (chinese-cns11643-7 . #x3725)	; ø»žŸŒ
     (ideograph-daikanwa . 02661)	; ø¸€©¥
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((morohashi-daikanwa	2661 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (hanyu-dazidian	1 90 11)
+    (chinese-cns11643-7 . #x3725)	; ø»žŸŒ
+    (=hanziku-1		. #xB6A2)	; ý¢€›š¢
+    (=ucs		. #x20963)	; ð ¥£
+    ))
+(define-char
+  '((=>ucs		. #x5335)	; 匵
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (hanyu-dazidian	1 90 13)
+    (=jis-x0212		. #x3432)	; ø»‹€›
+    (=jis-x0213-2-2000	. #x234F)	; ø»¤ ª
+    (ideograph-daikanwa . 02662)	; ø¸€©¦
+    (=hanziku-1		. #xB6A4)	; ý¢€›š¤
+    (=cbeta		. 05235)	; ø¸¡‘³
+    (=ucs@jis		. #x5335)	; ø»‹€›
+    (mojikyo		. 002662)	; ý €€©¦
+    ))
+(define-char
+  '((morohashi-daikanwa	2662 0 0)
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-      (ucs		  . #x2FF7)	; â¿·
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x8CE3)	; è³£
+     ((=ucs		  . #x8CE3)	; è³£
       ))
-    (japanese-jisx0212		. #x3432)	; ø»‹€›
-    (chinese-cns11643-3		. #x5444)	; ø»–¢
-    (japanese-jisx0213-2	. #x234F)	; ø»¤ ª
-    (ideograph-daikanwa		. 02662)	; ø¸€©¦
-    (ideograph-cbeta		. 05235)	; ø¸¡‘³
-    (ucs			. #x5335)	; 匵
+    (=cns11643-3	. #x5444)	; ø»–¢
+    (=jef-china3	. #x45BD)	; øº„–½
+    (=ucs		. #x5335)	; 匵
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 16)
     (total-strokes	 . 18)
+    (hanyu-dazidian	1 91 5)
     (chinese-cns11643-7 . #x3F23)	; ø»žªº
     (ideograph-daikanwa . 02663)	; ø¸€©§
+    (=hanziku-1		. #xB6BC)	; ý¢€›š¼
+    (=ucs		. #x20969)	; 𠥩
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x20966)	; 𠥦
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 18)
     (total-strokes	 . 20)
+    (hanyu-dazidian	1 91 2)
     (ideograph-daikanwa . 02664)	; ø¸€©¨
+    (=hanziku-1		. #xB6B9)	; ý¢€›š¹
     ))
 (define-char
   '((morohashi-daikanwa	2664 0 2)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 17)
     (total-strokes	 . 19)
-    (chinese-cns11643-4 . #x5F4B)	; ø»˜¼–
+    (=ucs		. #x20966)	; 𠥦
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x20966)	; 𠥦
+    (morohashi-daikanwa	2664 0 3)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 17)
+    (total-strokes	 . 19)
+    (=cns11643-4	. #x5F4B)	; ø»˜¼–
+    ))
+(define-char
+  '((=>ucs		. #x5336)	; 匶
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 18)
-    (kangxi-strokes	 . 17)
     (total-strokes	 . 20)
-    (chinese-cns11643-3 . #x5C34)	; ø»–­¡
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((ideograph-daikanwa . 30249)	; ø¸‡˜©
+      ))
     (ideograph-daikanwa . 02665)	; ø¸€©©
-    (ucs		. #x5336)	; 匶
+    ))
+(define-char
+  '((=>ucs		. #x5336)	; 匶
+    (morohashi-daikanwa	2665 0 1)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 18)
+    (total-strokes	 . 20)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=cns11643-1	  . #x772E)	; ø»“€½
+      ))
+    (=cns11643-3	. #x5C34)	; ø»–­¡
+    ))
+(define-char
+  '((morohashi-daikanwa	2665 0 3)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 17)
+    (total-strokes	 . 19)
+    (hanyu-dazidian	1 91 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x820A)	; 舊
+      ))
+    (=hanziku-1		. #xB6B8)	; ý¢€›š¸
+    (=ucs		. #x5336)	; 匶
     ))
 (define-char
   '((=>ucs		. #x5337)	; 匷
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 18)
     (total-strokes	 . 20)
+    (hanyu-dazidian	1 91 3)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x77BF)	; 瞿
+     ((=jis-x0208	  . #x625A)	; ø½‹–“
+      (=ks-x1001	  . #x4F3A)	; ø»‰ž‰
+      (ideograph-daikanwa . 23747)	; ø¸…³ƒ
       ))
-    (chinese-big5	. #xF3FD)	; øº£Ž¡
+    (=big5		. #xF3FD)	; ý¢€½
     (ideograph-daikanwa . 02666)	; ø¸€©ª
     ))
 (define-char
@@ -1041,17 +1539,15 @@
     (ideographic-strokes . 18)
     (total-strokes	 . 20)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-		 (ucs		     . #x2FF7)	; â¿·
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((ucs		  . #x77BF)	; 瞿
+     ((=ucs		  . #x77BF)	; 瞿
       ))
-    (chinese-cns11643-2 . #x686A)	; ø»”µ»
-    (ucs		. #x5337)	; 匷
+    (=cns11643-2	. #x686A)	; ø»”µ»
+    (=ucs		. #x5337)	; 匷
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -1060,37 +1556,137 @@
     (ideograph-daikanwa . 02667)	; ø¸€©«
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x2096A)	; 𠥪
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 18)
     (total-strokes	 . 20)
+    (hanyu-dazidian	1 91 7)
     (ideograph-daikanwa . 02668)	; ø¸€©¬
+    (=hanziku-1		. #xB6BE)	; ý¢€›š¾
     ))
 (define-char
-  '((morohashi-daikanwa	2668 0 1)
+  '((morohashi-daikanwa	2668 0 2)
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 18)
     (total-strokes	 . 20)
     (chinese-cns11643-7 . #x4D44)	; ø»ž¿¿
+    (=ucs		. #x2096A)	; 𠥪
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x2096B)	; 𠥫
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 23)
     (total-strokes	 . 25)
-    (chinese-cns11643-7 . #x6069)	; ø»Ÿœž
     (ideograph-daikanwa . 02669)	; ø¸€©­
+    (mojikyo		. 002669)	; ý €€©­
+    ))
+(define-char
+  '((morohashi-daikanwa	2669 0 0)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 23)
+    (total-strokes	 . 25)
+    (hanyu-dazidian	1 91 8)
+    (chinese-cns11643-7 . #x6069)	; ø»Ÿœž
+    (=hanziku-1		. #xB6BF)	; ý¢€›š¿
+    (=ucs		. #x2096B)	; 𠥫
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 24)
     (total-strokes	 . 26)
-    (chinese-cns11643-4 . #x6D53)	; ø»™‘‚
+    (=cns11643-4	. #x6D53)	; ø»™‘‚
     (ideograph-daikanwa . 02670)	; ø¸€©®
-    (ucs		. #x3536)	; 㔶
+    (=ucs		. #x3536)	; 㔶
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((=>ucs		. #x2096C)	; 𠥬
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 26)
     (total-strokes	 . 28)
-    (chinese-cns11643-7 . #x6443)	; ø»Ÿ¡°
     (ideograph-daikanwa . 02671)	; ø¸€©¯
     ))
+(define-char
+  '((=>ucs		. #x2096C)	; 𠥬
+    (morohashi-daikanwa	2671 0 1)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 26)
+    (total-strokes	 . 28)
+    (hanyu-dazidian	1 91 10)
+    (chinese-cns11643-7 . #x6443)	; ø»Ÿ¡°
+    (=hanziku-1		. #xB6C1)	; ý¢€››
+    ))
+(define-char
+  '((=>ucs		. #x2096C)	; 𠥬
+    (morohashi-daikanwa	2671 0 2)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 26)
+    (total-strokes	 . 28)
+    (mojikyo		. 002671)	; ý €€©¯
+    ))
+(define-char
+  '((morohashi-daikanwa	2671 0 3)
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 26)
+    (total-strokes	 . 28)
+    (=ucs		. #x2096C)	; 𠥬
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	1 84 4)
+    (=hanziku-1		. #xB556)	; ý¢€›•–
+    (=ucs		. #x20932)	; 𠤲
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	1 85 4)
+    (=hanziku-1		. #xB576)	; ý¢€›•¶
+    (=ucs		. #x20937)	; ð ¤·
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	1 85 15)
+    (=hanziku-1		. #xB5A3)	; ý¢€›–£
+    (=ucs		. #x2093B)	; 𠤻
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	1 86 3)
+    (=hanziku-1		. #xB5B7)	; ý¢€›–·
+    (=ucs		. #x2093D)	; 𠤽
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	1 86 8)
+    (=hanziku-1		. #xB5BC)	; ý¢€›–¼
+    (=ucs		. #x20947)	; 𠥇
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	1 86 9)
+    (=hanziku-1		. #xB5BD)	; ý¢€›–½
+    (=ucs		. #x2094D)	; 𠥍
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	8 8 5)
+    (=hanziku-12	. #xEB5C)	; ý¢ƒŽ­œ
+    (=ucs		. #x20955)	; 𠥕
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	1 89 11)
+    (=hanziku-1		. #xB660)	; ý¢€›™ 
+    (=ucs		. #x20958)	; 𠥘
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	1 90 12)
+    (=hanziku-1		. #xB6A3)	; ý¢€›š£
+    (=ucs		. #x20967)	; 𠥧
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (hanyu-dazidian	1 91 4)
+    (=hanziku-1		. #xB6BB)	; ý¢€›š»
+    (=ucs		. #x20968)	; 𠥨
+    ))