X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R022-Right-Open-Box.el;h=0078c344bb0da71a77f19093c9cbc31531e4f1d9;hb=e204c30fba45c54ab82bccd877042461d69ccf82;hp=0f8ffb8db21b517f123eb201d0be6e28a016c429;hpb=ec87ac33b8d6e66eb514cf94f1790c4d7faa0208;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 0f8ffb8..0078c34 100644
--- a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
@@ -1,15 +1,26 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((<-denotational@component
+     ((=>ucs@component	  . #x5DE5)	; &A-compU+5DE5;
+      ))
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (=>ucs@component	. #x531A)	; &IWDS1-209;
-    (=>iwds-1		.  0209)	; &IWDS1-209;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=ucs		  . #x200CA)	; 𠃊
+      ))
+    (=>ucs@component	. #x531A)	; &A-compU+531A;
+    (=>iwds-1		.  0209)	; &A-compU+531A;
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component	  . #x531A)	; &IWDS1-209;
-      (=>iwds-1		  .  0209)	; &IWDS1-209;
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
       ))
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 0)
@@ -28,7 +39,12 @@
     (=daikanwa		. 02595)	; &I-M-02595;
     (=shinjigen		.  0786)	; 匚
     (->subsumptive
-     ((==ucs@unicode	  . #x531A)	; &g2-AJ1-04302;
+     ((=decomposition@cid
+       ((=ucs		    . #x531A)	; 匚
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x531A)	; &g2-AJ1-04302;
       (==adobe-japan1-0	  . 04302)	; &g2-AJ1-04302;
       (==gb2312		  . #x584E)	; &g2-AJ1-04302; [56-46]
       (==jis-x0208	  . #x5239)	; &g2-AJ1-04302; [50-25]
@@ -74,6 +90,49 @@
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=>ucs@iwds-1	  . #x4EBA)	; &A-IWDSU+4EBA;
+      (=>iwds-1		  .  14623)	; &A-IWDSU+4EBA;
+      ))
+    (=ucs		. #x2092D)	; ð ¤­
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2092D)	; ð ¤­
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x4EBA)	; 人
+      ))
+    (=ucs@iso		. #x2092D)	; &CB10883;
+    (=cbeta		. 10883)	; &CB10883;
+    (->subsumptive
+     ((==ucs@iso	  . #x2092D)	; &g2-CB10883;
+      (==cbeta		  . 10883)	; &g2-CB10883;
+      (->subsumptive
+       ((===ucs@iso	    . #x2092D)	; &R-U-0002092D;
+	)
+       ((===cbeta	    . 10883)	; &R-CB10883;
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (=ucs		. #x531B)	; 匛
@@ -99,6 +158,7 @@
     (=jis-x0212		. #x3425)	; &I-JSP-3425; [20-05]
     (=cns11643-4	. #x2165)	; &I-C4-2165; [01-69]
     (=daikanwa		. 02597)	; &I-M-02597;
+    (=cbeta		. 12177)	; &I-CB12177;
     (=jef-china3	. #x45B0)	; &I-JC3-45B0;
     (->subsumptive
      ((=decomposition@cid
@@ -125,12 +185,15 @@
        ((===jef-china3	    . #x45B0)	; &R-JC3-45B0;
 	))
       )
-     ((==ucs@unicode	  . #x531B)	; &g2-UU+531B;
+     ((==ucs@unicode	  . #x531B)	; &g2-CB12177;
       (==ucs@JP/hanazono  . nil)
+      (==cbeta		  . 12177)	; &g2-CB12177;
       (->subsumptive
        ((===ucs@unicode	    . #x531B)	; &R-UU+531B;
 	)
        ((=hanziku-1	    . #xB4D6)	; &HZK01-B4D6;
+	)
+       ((===cbeta	    . 12177)	; &R-CB12177;
 	))
       ))
     ))
@@ -210,6 +273,24 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=ucs		. #x531D)	; 匝
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x531D)	; 匝
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
     (hanyu-dazidian	1 82 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -219,8 +300,8 @@
       )
      ((=ucs		  . #x5DFE)	; å·¾
       ))
-    (=ucs		. #x531D)	; 匝
-    (=adobe-japan1-0	. 02779)	; &I-AJ1-02779;
+    (=ucs@unicode	. #x531D)	; &AJ1-02779;
+    (=adobe-japan1-0	. 02779)	; &AJ1-02779;
     (=jis-x0208		. #x4159)	; &I-J90-4159; [33-57]
     (=gb2312		. #x5451)	; &I-G0-5451; [52-49]
     (=cns11643-1	. #x4622)	; &I-C1-4622; [38-02]
@@ -230,7 +311,7 @@
     (=gt-k		. 00969)	; &I-GT-K00969;
     (=gt-pj-1		. #x4159)	; &I-GT-03333; [33-57]
     (=daikanwa		. 02599)	; &I-M-02599;
-    (=shinjigen		.  2080)	; 匝
+    (=shinjigen		.  2080)	; &AJ1-02779;
     (<-same
      ((=ucs		  . #x5E00)	; 帀
       (=daikanwa	  . 08773)	; &I-M-08773;
@@ -245,6 +326,38 @@
       ))
     (<-vulgar*sources
      zengyun shinjigen)
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x531D)	; 匝
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x531D)	; &g2-AJ1-02779;
+      (==adobe-japan1-0	  . 02779)	; &g2-AJ1-02779;
+      (==gb2312		  . #x5451)	; &g2-AJ1-02779; [52-49]
+      (==jis-x0208	  . #x4159)	; &g2-AJ1-02779; [33-57]
+      (==cns11643-1	  . #x4622)	; &g2-AJ1-02779; [38-02]
+      (==jis-x0213-1	  . #x4159)	; &g2-AJ1-02779; [33-57]
+      (==gt		  . 03333)	; &g2-AJ1-02779;
+      (==gt-k		  . 00969)	; &g2-AJ1-02779;
+      (==daikanwa	  . 02599)	; &g2-AJ1-02779;
+      (==shinjigen	  .  2080)	; &g2-AJ1-02779;
+      (->subsumptive
+       ((===daikanwa	    . 02599)	; &R-M-02599;
+	)
+       ((===jis-x0208	    . #x4159)	; &R-J0-4159; [33-57]
+	(===jis-x0213-1	    . #x4159)	; &R-J0-4159; [33-57]
+	)
+       ((===adobe-japan1-0  . 02779)	; &R-AJ1-02779;
+	)
+       ((===cns11643-1	    . #x4622)	; &R-C1-4622; [38-02]
+	)
+       ((===gt		    . 03333)	; &R-GT-03333;
+	(===gt-k	    . 00969)	; &R-GT-03333;
+	)
+       ((===ucs@unicode	    . #x531D)	; &R-UU+531D;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -269,6 +382,18 @@
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 3)
+    (=ucs		. #x2D155)	; 𭅕
+    (=cbeta		. 05084)	; &I-CB05084;
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 3)
+    (=ucs		. #x2D156)	; 𭅖
+    (=cbeta		. 06051)	; &I-CB06051;
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
     (=ucs		. #x2092E)	; 𠤮
@@ -388,9 +513,68 @@
     (=gt-pj-1		. #x3E22)	; &I-GT-03339; [30-02]
     (=daikanwa		. 02605)	; &I-M-02605;
     (=shinjigen		.  0789)	; 匠
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5320)	; 匠
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5320)	; &g2-AJ1-02442;
+      (==adobe-japan1-0	  . 02442)	; &g2-AJ1-02442;
+      (==gb2312		  . #x3D33)	; &g2-AJ1-02442; [29-19]
+      (==ks-x1001	  . #x6D5D)	; &g2-AJ1-02442; [77-61]
+      (==jis-x0208	  . #x3E22)	; &g2-AJ1-02442; [30-02]
+      (==cns11643-1	  . #x474C)	; &g2-AJ1-02442; [39-44]
+      (==jis-x0213-1	  . #x3E22)	; &g2-AJ1-02442; [30-02]
+      (==gt		  . 03339)	; &g2-AJ1-02442;
+      (==gt-k		  . 01643)	; &g2-AJ1-02442;
+      (==daikanwa	  . 02605)	; &g2-AJ1-02442;
+      (==shinjigen	  .  0789)	; &g2-AJ1-02442;
+      (->subsumptive
+       ((===daikanwa	    . 02605)	; &R-M-02605;
+	)
+       ((===jis-x0208	    . #x3E22)	; &R-J0-3E22; [30-02]
+	(===jis-x0213-1	    . #x3E22)	; &R-J0-3E22; [30-02]
+	)
+       ((===adobe-japan1-0  . 02442)	; &R-AJ1-02442;
+	)
+       ((===cns11643-1	    . #x474C)	; &R-C1-474C; [39-44]
+	)
+       ((===gt		    . 03339)	; &R-GT-03339;
+	(===gt-k	    . 01643)	; &R-GT-03339;
+	)
+       ((===ucs@ks	    . #x5320)	; &R-K0-6D5D;
+	(===ks-x1001	    . #x6D5D)	; &R-K0-6D5D; [77-61]
+	)
+       ((===ucs@unicode	    . #x5320)	; &R-UU+5320;
+	))
+      ))
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((<-denotational@component
+     ((=>ucs@iwds-1	  . #x5321)	; &A-IWDSU+5321;
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x738B)	; 王
+      ))
+    (sound@ja/on/go	"kWAu" "WAu")
+    (sound@ja/on/kan	"kIyAu" "WAu")
+    (=ucs		. #x5321)	; 匡
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5321)	; 匡
+      ))
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
     (hanyu-dazidian	1 83 1)
@@ -402,8 +586,8 @@
       )
      ((=ucs		  . #x738B)	; 王
       ))
-    (=ucs		. #x5321)	; 匡
-    (=adobe-japan1-0	. 01697)	; &I-AJ1-01697;
+    (=ucs@unicode	. #x5321)	; &AJ1-01697;
+    (=adobe-japan1-0	. 01697)	; &AJ1-01697;
     (=jis-x0208		. #x3629)	; &I-J90-3629; [22-09]
     (=gb2312		. #x3F6F)	; &I-G0-3F6F; [31-79]
     (=ks-x1001		. #x4E44)	; &I-K0-4E44; [46-36]
@@ -414,9 +598,92 @@
     (=gt-k		. 01592)	; &I-GT-K01592;
     (=gt-pj-1		. #x3629)	; &I-GT-03336; [22-09]
     (=daikanwa		. 02606)	; &I-M-02606;
-    (=shinjigen		.  0788)	; 匡
+    (=shinjigen		.  0788)	; &AJ1-01697;
+    (<-interchangeable
+     ((=ucs		  . #x65B9)	; 方
+      (=daikanwa	  . 13620)	; &I-M-13620;
+      )
+     ((=ucs@unicode	  . #x6789)	; &AJ1-05153;
+      (=adobe-japan1-0	  . 05153)	; &AJ1-05153;
+      (=daikanwa	  . 14530)	; &I-M-14530;
+      )
+     ((=ucs@unicode	  . #x6047)	; &AJ1-16864;
+      (=adobe-japan1-5	  . 16864)	; &AJ1-16864;
+      (=daikanwa	  . 10529)	; &I-M-10529;
+      )
+     ((=ucs@unicode	  . #x7736)	; &JX1-7871;
+      (=gb2312		  . #x3F74)	; &JX1-7871; [31-84]
+      (=jis-x0212	  . #x4E6C)	; &I-JSP-4E6C; [46-76]
+      (=cns11643-1	  . #x5C3A)	; &I-C1-5C3A; [60-26]
+      (=jis-x0213-1	  . #x7871)	; &I-JX1-7871; [88-81]
+      (=daikanwa	  . 23310)	; &I-M-23310;
+      )
+     ((=ucs@unicode	  . #x5C29)	; &AJ1-17538;
+      (=adobe-japan1-5	  . 17538)	; &AJ1-17538;
+      (=daikanwa	  . 07557)	; &I-M-07557;
+      ))
+    (<-interchangeable$_1*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable$_2*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable$_3*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable$_4*sources
+     zhengzitong daikanwa)
+    (<-interchangeable$_5*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable*sources
+     daikanwa)
+    (<-interchangeable@ancient
+     ((=ucs@unicode	  . #x6047)	; &AJ1-16864;
+      (=adobe-japan1-5	  . 16864)	; &AJ1-16864;
+      ))
+    (<-original
+     ((=ucs@unicode	  . #x7736)	; &JX1-7871;
+      (=gb2312		  . #x3F74)	; &JX1-7871; [31-84]
+      (=jis-x0212	  . #x4E6C)	; &I-JSP-4E6C; [46-76]
+      (=cns11643-1	  . #x5C3A)	; &I-C1-5C3A; [60-26]
+      (=jis-x0213-1	  . #x7871)	; &I-JX1-7871; [88-81]
+      (=daikanwa	  . 23310)	; &I-M-23310;
+      ))
+    (->formed
+     ((=ucs@unicode	  . #x7B50)	; &AJ1-05969;
+      (=adobe-japan1-0	  . 05969)	; &AJ1-05969;
+      (=daikanwa	  . 26001)	; &I-M-26001;
+      )
+     ((=ucs@unicode	  . #x7736)	; &JX1-7871;
+      (=gb2312		  . #x3F74)	; &JX1-7871; [31-84]
+      (=jis-x0212	  . #x4E6C)	; &I-JSP-4E6C; [46-76]
+      (=cns11643-1	  . #x5C3A)	; &I-C1-5C3A; [60-26]
+      (=jis-x0213-1	  . #x7871)	; &I-JX1-7871; [88-81]
+      (=daikanwa	  . 23310)	; &I-M-23310;
+      )
+     ((=ucs@unicode	  . #x5329)	; &MJ007799;
+      (=mj		  . 007799)	; &MJ007799;
+      (=daikanwa	  . 02626)	; &I-M-02626;
+      ))
+    (->formed$_1*sources
+     shuowen daikanwa)
+    (->formed$_2*sources
+     zhengzitong)
+    (->formed*sources
+     daikanwa)
+    (->original
+     ((=ucs@unicode	  . #x5329)	; &MJ007799;
+      (=mj		  . 007799)	; &MJ007799;
+      (=daikanwa	  . 02626)	; &I-M-02626;
+      ))
+    (->original$_1*sources
+     zhengzitong daikanwa)
+    (->original*sources
+     zhengzitong daikanwa)
     (->subsumptive
-     ((==ucs@unicode	  . #x5321)	; &g2-AJ1-01697;
+     ((=decomposition@cid
+       ((=ucs		    . #x5321)	; 匡
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5321)	; &g2-AJ1-01697;
       (==adobe-japan1-0	  . 01697)	; &g2-AJ1-01697;
       (==gb2312		  . #x3F6F)	; &g2-AJ1-01697; [31-79]
       (==ks-x1001	  . #x4E44)	; &g2-AJ1-01697; [46-36]
@@ -485,6 +752,68 @@
     (=daikanwa		. 02608)	; &I-M-02608;
     ))
 (define-char
+  '((ideographic-radical@ucs . 23)	; ⼖
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@misc . 22)	; ⼕
+    (ideographic-radical@misc*sources
+     ucs@code)
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (=ucs		. #x20932)	; 𠤲
+    ))
+(define-char
+  '((<-denotational
+     ((=+>ucs@iso	  . #x20932)	; &o-IU+20932;
+      ))
+    (ideographic-radical@ucs . 23)	; ⼖
+    (ideographic-radical@misc . 22)	; ⼕
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (hanyu-dazidian	1 84 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@unicode	  . #x5C6F)	; &C1-453A;
+      (=gb2312		  . #x4D4D)	; &C1-453A; [45-45]
+      (=cns11643-1	  . #x453A)	; &I-C1-453A; [37-26]
+      ))
+    (=ucs@iso		. #x20932)	; &U-00020932;
+    (->subsumptive
+     ((==ucs@iso	  . #x20932)	; &g2-IU-00020932;
+      (->subsumptive
+       ((===ucs@iso	    . #x20932)	; &R-U-00020932;
+	)
+       ((=hanziku-1	    . #xB556)	; &HZK01-B556;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20932)	; 𠤲
+      ))
+    (ideographic-radical@ucs . 23)	; ⼖
+    (ideographic-radical@misc . 22)	; ⼕
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x5C6F)	; 屯
+      ))
+    (=+>ucs@iso		. #x20932)	; &o-IU+20932;
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 4)
+    (=ucs		. #x2B9CD)	; 𫧍
+    (=cbeta		. 09871)	; &I-CB09871;
+    ))
+(define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
@@ -521,87 +850,143 @@
     (=gt-pj-1		. #x523A)	; &I-GT-03347; [50-26]
     (=daikanwa		. 02610)	; &I-M-02610;
     (=shinjigen		.  0790)	; 匣
-    ))
-(define-char
-  '((=>ucs		. #x352F)	; 㔯
-    (ideographic-radical . 22)	; ⼕
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (=daikanwa		. 02611)	; &M-02611;
-    ))
-(define-char
-  '((morohashi-daikanwa	2611 0 0)
-    (ideographic-radical . 22)	; ⼕
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (=ucs		. #x352F)	; 㔯
-    (=cns11643-4	. #x234B)	; &I-C4-234B; [03-43]
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5323)	; 匣
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5323)	; &g2-AJ1-04303;
+      (==adobe-japan1-0	  . 04303)	; &g2-AJ1-04303;
+      (==gb2312		  . #x4F3B)	; &g2-AJ1-04303; [47-27]
+      (==ks-x1001	  . #x4B21)	; &g2-AJ1-04303; [43-01]
+      (==jis-x0208	  . #x523A)	; &g2-AJ1-04303; [50-26]
+      (==cns11643-1	  . #x493A)	; &g2-AJ1-04303; [41-26]
+      (==jis-x0213-1	  . #x523A)	; &g2-AJ1-04303; [50-26]
+      (==gt		  . 03347)	; &g2-AJ1-04303;
+      (==gt-k		  . 02687)	; &g2-AJ1-04303;
+      (==daikanwa	  . 02610)	; &g2-AJ1-04303;
+      (==shinjigen	  .  0790)	; &g2-AJ1-04303;
+      (->subsumptive
+       ((===daikanwa	    . 02610)	; &R-M-02610;
+	)
+       ((===jis-x0208	    . #x523A)	; &R-J0-523A; [50-26]
+	(===jis-x0213-1	    . #x523A)	; &R-J0-523A; [50-26]
+	)
+       ((===adobe-japan1-0  . 04303)	; &R-AJ1-04303;
+	)
+       ((===cns11643-1	    . #x493A)	; &R-C1-493A; [41-26]
+	)
+       ((===gt		    . 03347)	; &R-GT-03347;
+	(===gt-k	    . 02687)	; &R-GT-03347;
+	)
+       ((===ucs@ks	    . #x5323)	; &R-K0-4B21;
+	(===ks-x1001	    . #x4B21)	; &R-K0-4B21; [43-01]
+	)
+       ((===ucs@unicode	    . #x5323)	; &R-UU+5323;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 85 1)
-    (=ucs		. #x20934)	; ð ¤´
-    (=cns11643-4	. #x234A)	; &I-C4-234A; [03-42]
-    (=daikanwa		. 02612)	; &I-M-02612;
-    (=hanziku-1		. #xB573)	; &I-HZK01-B573;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=>ucs@iwds-1	  . #x3563)	; &A-IWDSU+3563;
+      ))
+    (sound@ja/on	"seN")
+    (=ucs		. #x352F)	; 㔯
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((<-denotational
+     ((=ucs		  . #x352F)	; 㔯
+      ))
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 84 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs		  . #x7389)	; 玉
+     ((=ucs@unicode	  . #x3563)	; &MJ000320;
+      (=mj		  . 000320)	; &MJ000320;
+      ))
+    (=ucs@cns		. #x352F)	; &MJ000263;
+    (=mj		. 000263)	; &MJ000263;
+    (=cns11643-4	. #x234B)	; &I-C4-234B; [03-43]
+    (=koseki		. 030350)	; &MJ000263;
+    (=daikanwa		. 02611)	; &I-M-02611;
+    (<-formed
+     ((=ucs@unicode	  . #x5334)	; &C2-5645;
+      (=cns11643-2	  . #x5645)	; &C2-5645; [54-37]
+      (=daikanwa	  . 02659)	; &I-M-02659;
+      ))
+    (<-formed$_1*sources
+     jiyun)
+    (<-same
+     ((=ucs@unicode	  . #x5334)	; &C2-5645;
+      (=cns11643-2	  . #x5645)	; &C2-5645; [54-37]
+      (=daikanwa	  . 02659)	; &I-M-02659;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
+    (->subsumptive
+     ((==mj		  . 000263)	; &g2-MJ000263;
+      (==koseki		  . 030350)	; &g2-MJ000263;
+      (==daikanwa	  . 02611)	; &g2-MJ000263;
+      (->subsumptive
+       ((===daikanwa	    . 02611)	; &R-M-02611;
+	)
+       ((===mj		    . 000263)	; &R-MJ000263;
+	))
+      )
+     ((==ucs@cns	  . #x352F)	; &g2-CU+352F;
+      (==cns11643-4	  . #x234B)	; &g2-CU+352F; [03-43]
       ))
-    (=ucs		. #x5324)	; 匤
-    (=adobe-japan1-2	. 08405)	; &I-AJ1-08405;
-    (=cns11643-5	. #x234B)	; &I-C5-234B; [03-43]
-    (=jis-x0213-2	. #x234E)	; &I-JX2-234E; [03-46]
-    (=daikanwa		. 02613)	; &I-M-02613;
-    (=hanziku-1		. #xB559)	; &I-HZK01-B559;
-    (=jef-china3	. #x45B3)	; &I-JC3-45B3;
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((<-denotational
+     ((=ucs		  . #x352F)	; 㔯
+      ))
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 85 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs		  . #x5F01)	; 弁
+     ((=ucs-var-001	  . #x3563)	; &U-v001+3563;
+      ))
+    (=ucs@unicode	. #x352F)	; &UU+352F;
+    (=ucs@JP/hanazono	. nil)
+    (->subsumptive
+     ((==ucs@unicode	  . #x352F)	; &g2-UU+352F;
+      (==ucs@JP/hanazono  . nil)
       ))
-    (=ucs		. #x5325)	; 匥
-    (=adobe-japan1-6	. 21225)	; &I-AJ1-21225;
-    (=jis-x0212		. #x3429)	; &I-JSP-3429; [20-09]
-    (=cns11643-3	. #x2465)	; &I-C3-2465; [04-69]
-    (=daikanwa		. 02614)	; &I-M-02614;
-    (=hanziku-1		. #xB57B)	; &I-HZK01-B57B;
-    (=jef-china3	. #x45B4)	; &I-JC3-45B4;
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 85 2)
-    (=ucs		. #x20935)	; 𠤵
-    (=cns11643-6	. #x2635)	; &I-C6-2635; [06-21]
-    (=daikanwa		. 02615)	; &I-M-02615;
-    (=hanziku-1		. #xB574)	; &I-HZK01-B574;
+    (hanyu-dazidian	1 85 1)
+    (=ucs		. #x20934)	; ð ¤´
+    (=cns11643-4	. #x234A)	; &I-C4-234A; [03-42]
+    (=daikanwa		. 02612)	; &I-M-02612;
+    (=hanziku-1		. #xB573)	; &I-HZK01-B573;
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x20971)	; ð ¥±
+  '((<-denotational@component
+     ((=>ucs@iwds-1	  . #x5321)	; &A-IWDSU+5321;
       ))
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 5)
@@ -610,11 +995,113 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #x531A)	; 匚
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
       )
-     ((=ucs		  . #x51FA)	; 出
+     ((=ucs		  . #x7389)	; 玉
       ))
-    (=cbeta		. 06935)	; &CB06935;
+    (sound@ja/on/go	"koku")
+    (sound@ja/on/kan	"kyoku")
+    (=ucs		. #x5324)	; 匤
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5324)	; 匤
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (hanyu-dazidian	1 84 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x7389)	; 玉
+      ))
+    (=ucs@unicode	. #x5324)	; &AJ1-08405;
+    (=adobe-japan1-2	. 08405)	; &AJ1-08405;
+    (=cns11643-5	. #x234B)	; &I-C5-234B; [03-43]
+    (=jis-x0213-2	. #x234E)	; &I-JX2-234E; [03-46]
+    (=daikanwa		. 02613)	; &I-M-02613;
+    (=jef-china3	. #x45B3)	; &I-JC3-45B3;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5324)	; 匤
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5324)	; &g2-AJ1-08405;
+      (==adobe-japan1-2	  . 08405)	; &g2-AJ1-08405;
+      (==cns11643-5	  . #x234B)	; &g2-AJ1-08405; [03-43]
+      (==jis-x0213-2	  . #x234E)	; &g2-AJ1-08405; [03-46]
+      (==daikanwa	  . 02613)	; &g2-AJ1-08405;
+      (==jef-china3	  . #x45B3)	; &g2-AJ1-08405;
+      (->subsumptive
+       ((===daikanwa	    . 02613)	; &R-M-02613;
+	)
+       ((===jis-x0213-2	    . #x234E)	; &R-JX2-234E; [03-46]
+	)
+       ((===adobe-japan1-2  . 08405)	; &R-AJ1-08405;
+	)
+       ((===cns11643-5	    . #x234B)	; &R-C5-234B; [03-43]
+	)
+       ((===jef-china3	    . #x45B3)	; &R-JC3-45B3;
+	)
+       ((===ucs@unicode	    . #x5324)	; &R-UU+5324;
+	)
+       ((=hanziku-1	    . #xB559)	; &HZK01-B559;
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (hanyu-dazidian	1 85 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x5F01)	; 弁
+      ))
+    (=ucs		. #x5325)	; 匥
+    (=adobe-japan1-6	. 21225)	; &I-AJ1-21225;
+    (=jis-x0212		. #x3429)	; &I-JSP-3429; [20-09]
+    (=cns11643-3	. #x2465)	; &I-C3-2465; [04-69]
+    (=daikanwa		. 02614)	; &I-M-02614;
+    (=hanziku-1		. #xB57B)	; &I-HZK01-B57B;
+    (=jef-china3	. #x45B4)	; &I-JC3-45B4;
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (hanyu-dazidian	1 85 2)
+    (=ucs		. #x20935)	; 𠤵
+    (=cns11643-6	. #x2635)	; &I-C6-2635; [06-21]
+    (=daikanwa		. 02615)	; &I-M-02615;
+    (=hanziku-1		. #xB574)	; &I-HZK01-B574;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20971)	; ð ¥±
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x51FA)	; 出
+      ))
+    (=cbeta		. 06935)	; &CB06935;
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -657,6 +1144,24 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x8F68)	; 轨
+      ))
+    (=ucs		. #x5326)	; 匦
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5326)	; 匦
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
     (hanyu-dazidian	1 85 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -664,24 +1169,39 @@
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x8F66)	; 车
+     ((=ucs		  . #x8F68)	; 轨
+      ))
+    (=ucs@unicode	. #x5326)	; &G0-5850;
+    (=gb2312		. #x5850)	; &G0-5850; [56-48]
+    (<-simplified@CN
+     ((=ucs@unicode	  . #x532D)	; &AJ1-19204;
+      (=adobe-japan1-5	  . 19204)	; &AJ1-19204;
+      (=gb12345		  . #x5850)	; &AJ1-19204; [56-48]
+      ))
+    (->subsumptive
+     ((==ucs@unicode	  . #x5326)	; &g2-UU+5326;
+      (==gb2312		  . #x5850)	; &g2-UU+5326; [56-48]
+      (->subsumptive
+       ((===ucs@unicode	    . #x5326)	; &R-UU+5326;
 	)
-       ((=ucs		    . #x4E5D)	; 九
+       ((=hanziku-1	    . #xB57C)	; &HZK01-B57C;
 	))
       ))
-    (=ucs		. #x5326)	; 匦
-    (=gb2312		. #x5850)	; &I-G0-5850; [56-48]
-    (=hanziku-1		. #xB57C)	; &I-HZK01-B57C;
     ))
 (define-char
   '((ideographic-radical@daikanwa . 23)	; ⼖
     (ideographic-radical@cns . 22)	; ⼕
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x5408)	; 合
+      ))
     (=ucs		. #x533C)	; 匼
     ))
 (define-char
@@ -765,6 +1285,7 @@
     (=jis-x0212		. #x342A)	; &I-JSP-342A; [20-10]
     (=cns11643-3	. #x2B49)	; &I-C3-2B49; [11-41]
     (=daikanwa		. 02621)	; &I-M-02621;
+    (=cbeta		. 05085)	; &I-CB05085;
     (=jef-china3	. #x45B7)	; &I-JC3-45B7;
     (->subsumptive
      ((=decomposition@cid
@@ -778,6 +1299,7 @@
       (==jis-x0212	  . #x342A)	; &g2-AJ1-21226; [20-10]
       (==cns11643-3	  . #x2B49)	; &g2-AJ1-21226; [11-41]
       (==daikanwa	  . 02621)	; &g2-AJ1-21226;
+      (==cbeta		  . 05085)	; &g2-AJ1-21226;
       (==jef-china3	  . #x45B7)	; &g2-AJ1-21226;
       (->subsumptive
        ((===daikanwa	    . 02621)	; &R-M-02621;
@@ -789,11 +1311,17 @@
        ((===cns11643-3	    . #x2B49)	; &R-C3-2B49; [11-41]
 	)
        ((===jef-china3	    . #x45B7)	; &R-JC3-45B7;
+	)
+       ((===cbeta	    . 05085)	; &R-CB05085;
 	))
       )
-     ((==ucs@unicode	  . #x5327)	; &HZK01-B5A6;
+     ((==ucs@unicode	  . #x5327)	; &g2-UU+5327;
       (==ucs@JP/hanazono  . nil)
-      (=hanziku-1	  . #xB5A6)	; &HZK01-B5A6;
+      (->subsumptive
+       ((===ucs@unicode	    . #x5327)	; &R-UU+5327;
+	)
+       ((=hanziku-1	    . #xB5A6)	; &HZK01-B5A6;
+	))
       ))
     ))
 (define-char
@@ -913,29 +1441,144 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x37B7)	; 㞷
+      ))
+    (=>ucs@iwds-1	. #x5329)	; &A-IWDSU+5329;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x5329)	; &A-IWDSU+5329;
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 7)
+    (total-strokes	 . 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)	; ⿱
-	)
-       ((=ucs		    . #x5C6E)	; å±®
-	)
-       ((=ucs		    . #x738B)	; 王
-	))
+     ((=ucs		  . #x37B7)	; 㞷
+      ))
+    (=>ucs@unicode	. #x5329)	; &A-UU+5329;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@unicode	  . #x5329)	; &A-UU+5329;
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=+>ucs@unicode	  . #x37B7)	; &A-MJ000835;
       ))
+    (sound@ja/on	"kIYAu")
     (=ucs		. #x5329)	; 匩
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5329)	; 匩
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@gb		  . #x37B7)	; &GU+37B7;
+      ))
+    (=ucs@unicode	. #x5329)	; &MJ007799;
+    (=mj		. 007799)	; &MJ007799;
     (=adobe-japan1-6	. 21228)	; &I-AJ1-21228;
     (=jis-x0212		. #x342C)	; &I-JSP-342C; [20-12]
     (=cns11643-4	. #x2850)	; &I-C4-2850; [08-48]
+    (=koseki		. 030580)	; &MJ007799;
     (=daikanwa		. 02626)	; &I-M-02626;
     (=jef-china3	. #x45B9)	; &I-JC3-45B9;
+    (<-formed
+     ((=ucs@unicode	  . #x5321)	; &AJ1-01697;
+      (=adobe-japan1-0	  . 01697)	; &AJ1-01697;
+      ))
+    (<-formed*sources
+     koseki mj)
     (<-original
-     ((=ucs		  . #x5321)	; 匡
+     ((=ucs@unicode	  . #x5321)	; &AJ1-01697;
+      (=adobe-japan1-0	  . 01697)	; &AJ1-01697;
       (=daikanwa	  . 02606)	; &I-M-02606;
       ))
     (<-original*sources
      zhengzitong daikanwa)
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5329)	; 匩
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5329)	; &g2-MJ007799;
+      (==mj		  . 007799)	; &g2-MJ007799;
+      (==adobe-japan1-6	  . 21228)	; &g2-MJ007799;
+      (==jis-x0212	  . #x342C)	; &g2-MJ007799; [20-12]
+      (==cns11643-4	  . #x2850)	; &g2-MJ007799; [08-48]
+      (==koseki		  . 030580)	; &g2-MJ007799;
+      (==daikanwa	  . 02626)	; &g2-MJ007799;
+      (==jef-china3	  . #x45B9)	; &g2-MJ007799;
+      (->subsumptive
+       ((===daikanwa	    . 02626)	; &R-M-02626;
+	)
+       ((===jis-x0212	    . #x342C)	; &R-JSP-342C; [20-12]
+	)
+       ((===adobe-japan1-6  . 21228)	; &R-AJ1-21228;
+	)
+       ((===mj		    . 007799)	; &R-MJ007799;
+	)
+       ((===cns11643-4	    . #x2850)	; &R-C4-2850; [08-48]
+	)
+       ((===jef-china3	    . #x45B9)	; &R-JC3-45B9;
+	)
+       ((===ucs@unicode	    . #x5329)	; &R-UU+5329;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@unicode	  . #x5329)	; &A-UU+5329;
+      ))
+    (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)	; 匚
+      )
+     ((=ucs@JP/hanazono	  . #x37B7)	; &MJ000836;
+      (=mj		  . 000836)	; &MJ000836;
+      ))
+    (=ucs		. #x20946)	; 𠥆
+    (<-unknown
+     ((=ucs		  . #x5329)	; 匩
+      ))
+    (->subsumptive
+     ((==ucs@iso	  . #x20946)	; &g2-IU-00020946;
+      (->subsumptive
+       ((===ucs@iso	    . #x20946)	; &R-U-00020946;
+	)
+       ((=hanziku-1	    . #xB5B6)	; &HZK01-B5B6;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -951,13 +1594,39 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian	1 85 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x6766)	; 杦
+      ))
     (=ucs		. #x20942)	; 𠥂
-    (=cns11643-6	. #x2F32)	; &I-C6-2F32; [15-18]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20942)	; 𠥂
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 85 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x6766)	; 杦
+      ))
+    (=ucs@iso		. #x20942)	; &C6-2F32;
+    (=cns11643-6	. #x2F32)	; &C6-2F32; [15-18]
     (=daikanwa		. 02628)	; &I-M-02628;
-    (=hanziku-1		. #xB5A4)	; &I-HZK01-B5A4;
     (<-same
-     ((=ucs		  . #x67E9)	; 柩
+     ((=ucs@unicode	  . #x67E9)	; &AJ1-05168;
+      (=adobe-japan1-0	  . 05168)	; &AJ1-05168;
       (=daikanwa	  . 14650)	; &I-M-14650;
       ))
     (<-same*sources
@@ -973,33 +1642,38 @@
 	))
       )
      ((==ucs@iso	  . #x20942)	; &g2-IU-00020942;
+      (->subsumptive
+       ((===ucs@iso	    . #x20942)	; &R-U-00020942;
+	)
+       ((=hanziku-1	    . #xB5A4)	; &HZK01-B5A4;
+	))
       ))
     ))
 (define-char
-  '((ideographic-radical . 22)	; ⼕
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x20975)	; &A-IWDSU+20975;
+      ))
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian	1 86 2)
+    (hanyu-dazidian	1 86 8)
     (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		  . #x8A00)	; 言
+      ))
+    (=ucs		. #x20947)	; 𠥇
+    (->subsumptive
+     ((==ucs@iso	  . #x20947)	; &g2-IU-00020947;
+      (->subsumptive
+       ((===ucs@iso	    . #x20947)	; &R-U-00020947;
 	)
-       ((=ucs		    . #x738B)	; 王
+       ((=hanziku-1	    . #xB5BC)	; &HZK01-B5BC;
 	))
       ))
-    (=ucs		. #x20946)	; 𠥆
-    (=hanziku-1		. #xB5B6)	; &I-HZK01-B5B6;
-    (<-unknown
-     ((=ucs		  . #x5329)	; 匩
-      ))
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -1053,7 +1727,9 @@
 	))
       (==ucs@cns	  . #x532A)	; &g2-AJ1-03439;
       (==ucs@jis	  . #x532A)	; &g2-AJ1-03439;
+      (==ucs@ks		  . #x532A)	; &g2-AJ1-03439;
       (==adobe-japan1-0	  . 03439)	; &g2-AJ1-03439;
+      (==ks-x1001	  . #x5D63)	; &g2-AJ1-03439; [61-67]
       (==jis-x0208	  . #x485B)	; &g2-AJ1-03439; [40-59]
       (==cns11643-1	  . #x544D)	; &g2-AJ1-03439; [52-45]
       (==jis-x0213-1	  . #x485B)	; &g2-AJ1-03439; [40-59]
@@ -1073,20 +1749,12 @@
 	)
        ((===gt		    . 03371)	; &R-GT-03371;
 	(===gt-k	    . 06536)	; &R-GT-03371;
-	))
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
 	)
-       ((=ucs		    . #x531A)	; 匚
-	)
-       ((==ucs@jis	    . #x975E)	; &g2-GT-57172;
-	(==ucs@ks	    . #x975E)	; &g2-GT-57172;
-	(==jis-x0208	    . #x4873)	; &g2-GT-57172; [40-83]
+       ((===ucs@ks	    . #x532A)	; &R-K0-5D63;
+	(===ks-x1001	    . #x5D63)	; &R-K0-5D63; [61-67]
 	))
-      (==ucs@ks		  . #x532A)	; &g2-K0-5D63;
-      (==ks-x1001	  . #x5D63)	; &g2-K0-5D63; [61-67]
+      )
+     ((=ucs-var-002	  . #x532A)	; &U-v002+532A;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -1172,6 +1840,47 @@
     (=daikanwa		. 02635)	; &I-M-02635;
     ))
 (define-char
+  '((ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x96B9)	; 隹
+      ))
+    (=ucs		. #x9FA8)	; 龨
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9FA8)	; 龨
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x96B9)	; 隹
+      ))
+    (=ucs@JP/hanazono	. #x9FA8)	; &hanaJU+9FA8;
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x9FA8)	; &g2-hanaJU+9FA8;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 8)
+    (=ucs		. #x2D15B)	; 𭅛
+    (=cbeta		. 02182)	; &I-CB02182;
+    ))
+(define-char
   '((=>ucs		. #x3531)	; 㔱
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 9)
@@ -1194,11 +1903,10 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=>ucs@component	  . #x531A)	; &IWDS1-209;
-      (=>iwds-1		  .  0209)	; &IWDS1-209;
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
       )
-     ((==>ucs@bucs	  . #x516A)	; &J97-5141;
-      (=>jis-x0208	  . #x5141)	; &J97-5141; [49-33]
+     ((=>jis-x0208	  . #x5141)	; &J97-5141; [49-33]
       ))
     (=ucs		. #x532C)	; 匬
     ))
@@ -1226,11 +1934,6 @@
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (=decomposition@cid
-     ((=ucs		  . #x532C)	; 匬
-      )
-     ((=ucs		  . #xE0100)	; 󠄀
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
@@ -1238,12 +1941,31 @@
      ((=ucs		  . #x531A)	; 匚
       )
      ((=ucs@jis		  . #x516A)	; &AJ1-04216;
+      (=ucs@ks		  . #x516A)	; &AJ1-04216;
       (=adobe-japan1-0	  . 04216)	; &AJ1-04216;
       ))
     (=ucs@jis		. #x532C)	; &AJ1-21230;
     (=adobe-japan1-6	. 21230)	; &AJ1-21230;
     (=jis-x0212		. #x342E)	; &I-JSP-342E; [20-14]
     (=daikanwa		. 02637)	; &I-M-02637;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x532C)	; 匬
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@jis	  . #x532C)	; &g2-AJ1-21230;
+      (==adobe-japan1-6	  . 21230)	; &g2-AJ1-21230;
+      (==jis-x0212	  . #x342E)	; &g2-AJ1-21230; [20-14]
+      (==daikanwa	  . 02637)	; &g2-AJ1-21230;
+      (->subsumptive
+       ((===daikanwa	    . 02637)	; &R-M-02637;
+	)
+       ((===jis-x0212	    . #x342E)	; &R-JSP-342E; [20-14]
+	)
+       ((===adobe-japan1-6  . 21230)	; &R-AJ1-21230;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1310,6 +2032,7 @@
        ((==ucs@unicode	    . #x4FDE)	; &g2-UU+4FDE;
 	))
       (==ucs@unicode	  . #x532C)	; &g2-UU+532C;
+      (==ucs@JP/hanazono  . nil)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -1345,6 +2068,25 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=>ucs@iwds-1	  . #x8ECC)	; &A-IWDSU+8ECC;
+      ))
+    (sound@ja/on	"ki")
+    (=ucs		. #x532D)	; 匭
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x532D)	; 匭
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
     (hanyu-dazidian	1 87 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -1354,15 +2096,72 @@
       )
      ((=ucs		  . #x8ECC)	; 軌
       ))
-    (=ucs		. #x532D)	; 匭
-    (=adobe-japan1-5	. 19204)	; &I-AJ1-19204;
+    (=ucs@unicode	. #x532D)	; &AJ1-19204;
+    (=adobe-japan1-5	. 19204)	; &AJ1-19204;
     (=jis-x0212		. #x342F)	; &I-JSP-342F; [20-15]
     (=cns11643-2	. #x3372)	; &I-C2-3372; [19-82]
-    (=gb12345		. #x5850)	; 匭 [56-48]
+    (=gb12345		. #x5850)	; &AJ1-19204; [56-48]
     (=big5		. #xD46F)	; &I-B-D46F;
     (=daikanwa		. 02639)	; &I-M-02639;
-    (=shinjigen		.  0792)	; 匭
+    (=shinjigen		.  0792)	; &AJ1-19204;
     (=jef-china3	. #x97D2)	; &I-JC3-97D2;
+    (<-ancient
+     ((=ucs@unicode	  . #x7C0B)	; &JX2-7365;
+      (=gb2312		  . #x737E)	; &JX2-7365; [83-94]
+      (=jis-x0212	  . #x5262)	; &I-JSP-5262; [50-66]
+      (=cns11643-2	  . #x5E2F)	; &I-C2-5E2F; [62-15]
+      (=jis-x0213-2	  . #x7365)	; &I-JX2-7365; [83-69]
+      (=daikanwa	  . 26448)	; &I-M-26448;
+      ))
+    (<-ancient$_1*sources
+     shuowen daikanwa)
+    (<-ancient*sources
+     shuowen daikanwa)
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x532D)	; 匭
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x532D)	; &g2-AJ1-19204;
+      (==adobe-japan1-5	  . 19204)	; &g2-AJ1-19204;
+      (==jis-x0212	  . #x342F)	; &g2-AJ1-19204; [20-15]
+      (==cns11643-2	  . #x3372)	; &g2-AJ1-19204; [19-82]
+      (==gb12345	  . #x5850)	; &g2-AJ1-19204; [56-48]
+      (==daikanwa	  . 02639)	; &g2-AJ1-19204;
+      (==shinjigen	  .  0792)	; &g2-AJ1-19204;
+      (==jef-china3	  . #x97D2)	; &g2-AJ1-19204;
+      (->subsumptive
+       ((===daikanwa	    . 02639)	; &R-M-02639;
+	)
+       ((===jis-x0212	    . #x342F)	; &R-JSP-342F; [20-15]
+	)
+       ((===adobe-japan1-5  . 19204)	; &R-AJ1-19204;
+	)
+       ((===cns11643-2	    . #x3372)	; &R-C2-3372; [19-82]
+	)
+       ((===ucs@unicode	    . #x532D)	; &R-UU+532D;
+	)
+       ((===jef-china3	    . #x97D2)	; &R-JC3-97D2;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x532D)	; 匭
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@JP/hanazono	  . #x2E73F)	; &hanaJU+2E73F;
+      ))
+    (=cbeta		. 06664)	; &CB06664;
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -1426,57 +2225,178 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (=ucs		. #x3532)	; 㔲
-    (=cns11643-3	. #x3A25)	; &I-C3-3A25; [26-05]
+    (hanyu-dazidian	1 87 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x8D35)	; è´µ
+      ))
+    (=ucs		. #x532E)	; 匮
+    (=gb2312		. #x5851)	; &I-G0-5851; [56-49]
+    (=hanziku-1		. #xB5DD)	; &I-HZK01-B5DD;
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
+    (=>ucs@iwds-1	. #x3532)	; &A-IWDSU+3532;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x3532)	; &A-IWDSU+3532;
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x98E2)	; 飢
+      ))
+    (sound@ja/on	"ki")
+    (=ucs		. #x3533)	; 㔳
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3533)	; 㔳
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@ks		  . #x98E2)	; &GT-59043;
+      (=ks-x1001	  . #x5146)	; &GT-59043; [49-38]
+      (=daikanwa	  . 44023)	; &I-M-44023;
+      ))
+    (=mj		. 000268)	; &MJ000268;
+    (=koseki		. 030910)	; &MJ000268;
+    (=daikanwa		. 02643)	; &I-M-02643;
+    (<-ancient
+     ((=ucs@unicode	  . #x7C0B)	; &JX2-7365;
+      (=gb2312		  . #x737E)	; &JX2-7365; [83-94]
+      (=jis-x0212	  . #x5262)	; &I-JSP-5262; [50-66]
+      (=cns11643-2	  . #x5E2F)	; &I-C2-5E2F; [62-15]
+      (=jis-x0213-2	  . #x7365)	; &I-JX2-7365; [83-69]
+      (=daikanwa	  . 26448)	; &I-M-26448;
+      ))
+    (<-ancient$_1*sources
+     shuowen zhengzitong daikanwa)
+    (->formed@shuowen-zhu
+     ((=ucs@JP/hanazono	  . #x3532)	; &hanaJU+3532;
+      ))
+    (->formed@shuowen-zhu*sources
+     shuowen-zhu daikanwa)
+    (->subsumptive
+     ((==mj		  . 000268)	; &g2-MJ000268;
+      (==koseki		  . 030910)	; &g2-MJ000268;
+      (==daikanwa	  . 02643)	; &g2-MJ000268;
+      (->subsumptive
+       ((===daikanwa	    . 02643)	; &R-M-02643;
+	)
+       ((===mj		    . 000268)	; &R-MJ000268;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3533)	; 㔳
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (total-strokes@cns	     . 13)
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 87 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs		  . #x8D35)	; è´µ
+     ((=ucs@unicode	  . #x98E2)	; &AJ1-01612;
+      (=adobe-japan1-0	  . 01612)	; &AJ1-01612;
+      ))
+    (=ucs@unicode	. #x3533)	; &C6-5076;
+    (=ucs@JP/hanazono	. nil)
+    (=cns11643-6	. #x5076)	; &C6-5076; [48-86]
+    (->subsumptive
+     ((==ucs@unicode	  . #x3533)	; &g2-UU+3533;
+      (==ucs@JP/hanazono  . nil)
+      )
+     ((==ucs@cns	  . #x3533)	; &g2-CU+3533;
+      (==cns11643-6	  . #x5076)	; &g2-CU+3533; [48-86]
       ))
-    (=ucs		. #x532E)	; 匮
-    (=gb2312		. #x5851)	; &I-G0-5851; [56-49]
-    (=hanziku-1		. #xB5DD)	; &I-HZK01-B5DD;
-    ))
-(define-char
-  '((ideographic-radical . 22)	; ⼕
-    (=ucs		. #x3533)	; 㔳
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x3533)	; 㔳
+     ((=>ucs@iwds-1	  . #x3532)	; &A-IWDSU+3532;
       ))
     (ideographic-radical . 22)	; ⼕
-    (ideographic-strokes . 11)
-    (total-strokes	 . 13)
-    (=daikanwa		. 02643)	; &M-02643;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=>ucs-itaiji-001	  . #x29690)	; &A-U-i001+29690;
+      ))
+    (=ucs		. #x3532)	; 㔲
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x3533)	; 㔳
+     ((=ucs		  . #x3532)	; 㔲
       ))
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (=ucs@unicode	. #x3533)	; &UU+3533;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs-itaiji-002	  . #x29690)	; &U-i002+29690;
+      ))
+    (=ucs@JP/hanazono	. #x3532)	; &hanaJU+3532;
+    (<-formed@shuowen-zhu
+     ((=mj		  . 000268)	; &MJ000268;
+      ))
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x3533)	; 㔳
+     ((=ucs		  . #x3532)	; 㔲
       ))
     (ideographic-radical . 22)	; ⼕
-    (total-strokes@cns	     . 13)
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (=cns11643-6	. #x5076)	; &C6-5076; [48-86]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs-itaiji-001	  . #x29690)	; &U-i001+29690;
+      ))
+    (=ucs@unicode	. #x3532)	; &C3-3A25;
+    (=ucs@JP/hanazono	. nil)
+    (=cns11643-3	. #x3A25)	; &C3-3A25; [26-05]
+    (->subsumptive
+     ((==ucs@cns	  . #x3532)	; &g2-CU+3532;
+      (==cns11643-3	  . #x3A25)	; &g2-CU+3532; [26-05]
+      )
+     ((==ucs@unicode	  . #x3532)	; &g2-UU+3532;
+      (==ucs@JP/hanazono  . nil)
+      (->subsumptive
+       ((===ucs@unicode	    . #x3532)	; &R-UU+3532;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -1643,30 +2563,146 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 89 14)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #x531A)	; 匚
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
       )
      ((=ucs		  . #x8CB4)	; è²´
       ))
+    (sound@ja/on/go	"gi")
+    (sound@ja/on/kan	"ki")
     (=ucs		. #x5331)	; 匱
-    (=adobe-japan1-0	. 04305)	; &I-AJ1-04305;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5331)	; 匱
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 89 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@unicode	  . #x8CB4)	; &AJ1-01608;
+      (=adobe-japan1-0	  . 01608)	; &AJ1-01608;
+      ))
+    (=ucs@unicode	. #x5331)	; &AJ1-04305;
+    (=adobe-japan1-0	. 04305)	; &AJ1-04305;
     (=jis-x0208		. #x523C)	; &I-J90-523C; [50-28]
     (=cns11643-1	. #x6824)	; &I-C1-6824; [72-04]
     (=jis-x0213-1	. #x523C)	; &I-JX1-523C; [50-28]
-    (=gb12345		. #x5851)	; 匱 [56-49]
+    (=gb12345		. #x5851)	; &AJ1-04305; [56-49]
     (=big5		. #xB9BC)	; &I-B-B9BC;
     (=gt		. 03398)	; &I-GT-03398;
     (=gt-k		. 11194)	; &I-GT-K11194;
     (=gt-pj-1		. #x523C)	; &I-GT-03398; [50-28]
     (=daikanwa		. 02651)	; &I-M-02651;
-    (=shinjigen		.  0795)	; 匱
+    (=shinjigen		.  0795)	; &AJ1-04305;
+    (<-formed
+     ((=ucs@cns		  . #x8562)	; &C2-596F;
+      (=cns11643-2	  . #x596F)	; &C2-596F; [57-79]
+      (=daikanwa	  . 31989)	; &I-M-31989;
+      ))
+    (<-interchangeable
+     ((=ucs		  . #x7C23)	; ç°£
+      (=daikanwa	  . 26524)	; &I-M-26524;
+      )
+     ((=ucs		  . #x6F70)	; æ½°
+      (=daikanwa	  . 18281)	; &I-M-18281;
+      )
+     ((=ucs@ks		  . #x907A)	; &AJ1-13642;
+      (=adobe-japan1-4	  . 13642)	; &AJ1-13642;
+      (=daikanwa	  . 39134)	; &I-M-39134;
+      )
+     ((=ucs@jis		  . #x994B)	; &AJ1-07222;
+      (=ucs@ks		  . #x994B)	; &AJ1-07222;
+      (=adobe-japan1-0	  . 07222)	; &AJ1-07222;
+      (=daikanwa	  . 44382)	; &I-M-44382;
+      ))
+    (<-interchangeable$_1*sources
+     zhengzitong daikanwa)
+    (<-interchangeable$_2*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable$_3*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable$_4*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable*sources
+     daikanwa)
+    (->formed
+     ((=ucs@unicode	  . #x6AC3)	; &AJ1-05315;
+      (=adobe-japan1-0	  . 05315)	; &AJ1-05315;
+      (=daikanwa	  . 15757)	; &I-M-15757;
+      )
+     ((=ucs@unicode	  . #x944E)	; &C3-5F6C;
+      (=cns11643-3	  . #x5F6C)	; &C3-5F6C; [63-76]
+      (=daikanwa	  . 40985)	; &I-M-40985;
+      ))
+    (->formed$_1*sources
+     jiyun daikanwa)
+    (->formed$_2*sources
+     jiyun daikanwa)
+    (->formed*sources
+     jiyun daikanwa)
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5331)	; 匱
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5331)	; &g2-AJ1-04305;
+      (==adobe-japan1-0	  . 04305)	; &g2-AJ1-04305;
+      (==jis-x0208	  . #x523C)	; &g2-AJ1-04305; [50-28]
+      (==cns11643-1	  . #x6824)	; &g2-AJ1-04305; [72-04]
+      (==jis-x0213-1	  . #x523C)	; &g2-AJ1-04305; [50-28]
+      (==gb12345	  . #x5851)	; &g2-AJ1-04305; [56-49]
+      (==gt		  . 03398)	; &g2-AJ1-04305;
+      (==gt-k		  . 11194)	; &g2-AJ1-04305;
+      (==daikanwa	  . 02651)	; &g2-AJ1-04305;
+      (==shinjigen	  .  0795)	; &g2-AJ1-04305;
+      (->subsumptive
+       ((===daikanwa	    . 02651)	; &R-M-02651;
+	)
+       ((===jis-x0208	    . #x523C)	; &R-J0-523C; [50-28]
+	(===jis-x0213-1	    . #x523C)	; &R-J0-523C; [50-28]
+	)
+       ((===adobe-japan1-0  . 04305)	; &R-AJ1-04305;
+	)
+       ((===cns11643-1	    . #x6824)	; &R-C1-6824; [72-04]
+	)
+       ((===gt		    . 03398)	; &R-GT-03398;
+	(===gt-k	    . 11194)	; &R-GT-03398;
+	)
+       ((===ucs@unicode	    . #x5331)	; &R-UU+5331;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x21657)	; 𡙗
+      ))
+    (sound@ja/on	"reN")
+    (=ucs		. #x5332)	; 匲
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5332)	; 匲
+      ))
+    (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
     (hanyu-dazidian	1 89 13)
@@ -1676,25 +2712,58 @@
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs		  . #x21657)	; 𡙗
+     ((=ucs@iso		  . #x21657)	; &C4-3678;
+      (=cns11643-4	  . #x3678)	; &C4-3678; [22-88]
+      (=daikanwa	  . 05972)	; &I-M-05972;
       ))
-    (=ucs		. #x5332)	; 匲
-    (=adobe-japan1-5	. 19205)	; &I-AJ1-19205;
+    (=ucs@unicode	. #x5332)	; &AJ1-19205;
+    (=adobe-japan1-5	. 19205)	; &AJ1-19205;
     (=jis-x0212		. #x3431)	; &I-JSP-3431; [20-17]
     (=cns11643-3	. #x4623)	; &I-C3-4623; [38-03]
     (=daikanwa		. 02652)	; &I-M-02652;
-    (=shinjigen		.  0798)	; 匲
-    (=hanziku-1		. #xB662)	; &I-HZK01-B662;
+    (=shinjigen		.  0798)	; &AJ1-19205;
     (=cbeta		. 02324)	; &I-CB02324;
     (=jef-china3	. #x45BC)	; &I-JC3-45BC;
+    (<-formed@jiyun
+     ((=ucs@jis		  . #x5969)	; &AJ1-04559;
+      (=adobe-japan1-0	  . 04559)	; &AJ1-04559;
+      ))
     (<-vulgar
-     ((=ucs		  . #x5333)	; 匳
+     ((=ucs@unicode	  . #x5333)	; &AJ1-04306;
+      (=adobe-japan1-0	  . 04306)	; &AJ1-04306;
       (=jis-x0208	  . #x523D)	; &I-J90-523D; [50-29]
       (=daikanwa	  . 02655)	; &I-M-02655;
-      (=shinjigen	  .  0796)	; 匳
+      (=shinjigen	  .  0796)	; &AJ1-04306;
       ))
     (<-vulgar*sources
      zhengzitong daikanwa shinjigen)
+    (->subsumptive
+     ((==ucs@unicode	  . #x5332)	; &g2-AJ1-19205;
+      (==adobe-japan1-5	  . 19205)	; &g2-AJ1-19205;
+      (==jis-x0212	  . #x3431)	; &g2-AJ1-19205; [20-17]
+      (==cns11643-3	  . #x4623)	; &g2-AJ1-19205; [38-03]
+      (==daikanwa	  . 02652)	; &g2-AJ1-19205;
+      (==shinjigen	  .  0798)	; &g2-AJ1-19205;
+      (==cbeta		  . 02324)	; &g2-AJ1-19205;
+      (==jef-china3	  . #x45BC)	; &g2-AJ1-19205;
+      (->subsumptive
+       ((===daikanwa	    . 02652)	; &R-M-02652;
+	)
+       ((===jis-x0212	    . #x3431)	; &R-JSP-3431; [20-17]
+	)
+       ((===adobe-japan1-5  . 19205)	; &R-AJ1-19205;
+	)
+       ((===cbeta	    . 02324)	; &R-CB02324;
+	)
+       ((===cns11643-3	    . #x4623)	; &R-C3-4623; [38-03]
+	)
+       ((===jef-china3	    . #x45BC)	; &R-JC3-45BC;
+	)
+       ((===ucs@unicode	    . #x5332)	; &R-UU+5332;
+	)
+       ((=hanziku-1	    . #xB662)	; &HZK01-B662;
+	))
+      ))
     ))
 (define-char
   '((=>ucs		. #x2095A)	; 𠥚
@@ -1741,17 +2810,36 @@
   '((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		  . #x531A)	; 匚
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
       )
      ((=ucs		  . #x50C9)	; 僉
       ))
     (=ucs		. #x5333)	; 匳
-    (=adobe-japan1-0	. 04306)	; &I-AJ1-04306;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5333)	; 匳
+      ))
+    (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		  . #x531A)	; 匚
+      )
+     ((=ucs@unicode	  . #x50C9)	; &AJ1-04184;
+      (=adobe-japan1-0	  . 04184)	; &AJ1-04184;
+      ))
+    (=ucs@unicode	. #x5333)	; &AJ1-04306;
+    (=adobe-japan1-0	. 04306)	; &AJ1-04306;
     (=jis-x0208		. #x523D)	; &I-J90-523D; [50-29]
     (=cns11643-3	. #x4B34)	; &I-C3-4B34; [43-20]
     (=jis-x0213-1	. #x523D)	; &I-JX1-523D; [50-29]
@@ -1759,9 +2847,44 @@
     (=gt-k		. 11965)	; &I-GT-K11965;
     (=gt-pj-1		. #x523D)	; &I-GT-03409; [50-29]
     (=daikanwa		. 02655)	; &I-M-02655;
-    (=shinjigen		.  0796)	; 匳
-    (=hanziku-1		. #xB67D)	; &I-HZK01-B67D;
+    (=shinjigen		.  0796)	; &AJ1-04306;
     (=cbeta		. 00633)	; &I-CB00633;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5333)	; 匳
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5333)	; &g2-AJ1-04306;
+      (==adobe-japan1-0	  . 04306)	; &g2-AJ1-04306;
+      (==jis-x0208	  . #x523D)	; &g2-AJ1-04306; [50-29]
+      (==cns11643-3	  . #x4B34)	; &g2-AJ1-04306; [43-20]
+      (==jis-x0213-1	  . #x523D)	; &g2-AJ1-04306; [50-29]
+      (==gt		  . 03409)	; &g2-AJ1-04306;
+      (==gt-k		  . 11965)	; &g2-AJ1-04306;
+      (==daikanwa	  . 02655)	; &g2-AJ1-04306;
+      (==shinjigen	  .  0796)	; &g2-AJ1-04306;
+      (==cbeta		  . 00633)	; &g2-AJ1-04306;
+      (->subsumptive
+       ((===daikanwa	    . 02655)	; &R-M-02655;
+	)
+       ((===jis-x0208	    . #x523D)	; &R-J0-523D; [50-29]
+	(===jis-x0213-1	    . #x523D)	; &R-J0-523D; [50-29]
+	)
+       ((===adobe-japan1-0  . 04306)	; &R-AJ1-04306;
+	)
+       ((===cns11643-3	    . #x4B34)	; &R-C3-4B34; [43-20]
+	)
+       ((===gt		    . 03409)	; &R-GT-03409;
+	(===gt-k	    . 11965)	; &R-GT-03409;
+	)
+       ((===ucs@unicode	    . #x5333)	; &R-UU+5333;
+	)
+       ((=hanziku-1	    . #xB67D)	; &HZK01-B67D;
+	)
+       ((===cbeta	    . 00633)	; &R-CB00633;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -1818,19 +2941,60 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
-    (hanyu-dazidian	1 90 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #x531A)	; 匚
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
       )
      ((=ucs		  . #x7B97)	; 算
       ))
+    (sound@ja/on	"saN" "seN")
     (=ucs		. #x5334)	; 匴
-    (=cns11643-2	. #x5645)	; &I-C2-5645; [54-37]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5334)	; 匴
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-strokes . 14)
+    (total-strokes	 . 16)
+    (hanyu-dazidian	1 90 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@unicode	  . #x7B97)	; &AJ1-02185;
+      (=adobe-japan1-0	  . 02185)	; &AJ1-02185;
+      ))
+    (=ucs@unicode	. #x5334)	; &C2-5645;
+    (=cns11643-2	. #x5645)	; &C2-5645; [54-37]
     (=big5		. #xE8FA)	; &I-B-E8FA;
     (=daikanwa		. 02659)	; &I-M-02659;
+    (->formed
+     ((=ucs@cns		  . #x352F)	; &MJ000263;
+      (=mj		  . 000263)	; &MJ000263;
+      (=daikanwa	  . 02611)	; &I-M-02611;
+      ))
+    (->formed$_1*sources
+     jiyun daikanwa)
+    (->formed*sources
+     jiyun daikanwa)
+    (->subsumptive
+     ((==ucs@unicode	  . #x5334)	; &g2-M-02659;
+      (==cns11643-2	  . #x5645)	; &g2-M-02659; [54-37]
+      (==daikanwa	  . 02659)	; &g2-M-02659;
+      (->subsumptive
+       ((===daikanwa	    . 02659)	; &R-M-02659;
+	)
+       ((===cns11643-2	    . #x5645)	; &R-C2-5645; [54-37]
+	)
+       ((===ucs@unicode	    . #x5334)	; &R-UU+5334;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -2003,6 +3167,8 @@
       )
      ((=ucs		  . #x820A)	; 舊
       ))
+    (sound@ja/on/go	"gu")
+    (sound@ja/on/kan	"kIu")
     (=ucs		. #x5336)	; 匶
     ))
 (define-char
@@ -2018,21 +3184,43 @@
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=cns11643-1	  . #x772E)	; &C1-772E; [87-14]
-      (=daikanwa	  . 30249)	; &I-M-30249;
+     ((=ucs-var-002	  . #x820A)	; &U-v002+820A;
+      ))
+    (=mj		. 007813)	; &MJ007813;
+    (=koseki		. 031140)	; &MJ007813;
+    (=daikanwa		. 02665)	; &I-M-02665;
+    (<-Zhouwen
+     ((=ucs@unicode	  . #x531B)	; &AJ1-21223;
+      (=adobe-japan1-6	  . 21223)	; &AJ1-21223;
+      (=daikanwa	  . 02597)	; &I-M-02597;
+      )
+     ((=ucs@unicode	  . #x67E9)	; &AJ1-05168;
+      (=adobe-japan1-0	  . 05168)	; &AJ1-05168;
+      (=daikanwa	  . 14650)	; &I-M-14650;
       ))
-    (=daikanwa		. 02665)	; &M-02665;
+    (<-Zhouwen$_1*sources
+     jiyun daikanwa)
+    (<-Zhouwen$_2*sources
+     jiyun zhengzitong daikanwa)
+    (<-Zhouwen*sources
+     jiyun daikanwa)
+    (<-formed
+     ((=ucs@unicode	  . #x67E9)	; &AJ1-05168;
+      (=adobe-japan1-0	  . 05168)	; &AJ1-05168;
+      ))
+    (<-formed$_1*sources
+     koseki mj)
+    (<-formed*sources
+     koseki mj)
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
-	)
-       ((=ucs		    . #x531A)	; 匚
+     ((==mj		  . 007813)	; &g2-MJ007813;
+      (==koseki		  . 031140)	; &g2-MJ007813;
+      (==daikanwa	  . 02665)	; &g2-MJ007813;
+      (->subsumptive
+       ((===daikanwa	    . 02665)	; &R-M-02665;
 	)
-       ((==ucs@cns	    . #x820A)	; &g2-M-30249;
-	(==daikanwa	    . 30249)	; &g2-M-30249;
+       ((===mj		    . 007813)	; &R-MJ007813;
 	))
-      (==daikanwa	  . 02665)	; &g2-M-02665;
       ))
     ))
 (define-char
@@ -2079,25 +3267,20 @@
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs@unicode	  . #x820A)	; &AJ1-06300;
-      (=adobe-japan1-0	  . 06300)	; &AJ1-06300;
+     ((=ucs@unicode	  . #x820A)	; &MJ021340;
+      (=mj		  . 021340)	; &MJ021340;
       ))
-    (=ucs@unicode	. #x5336)	; &UU+5336;
+    (=ucs@unicode	. #x5336)	; &CB12179;
+    (=cbeta		. 12179)	; &CB12179;
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
-	)
-       ((=ucs		    . #x531A)	; 匚
-	)
-       ((==ucs@unicode	    . #x820A)	; &g2-AJ1-06300;
-	(==adobe-japan1-0   . 06300)	; &g2-AJ1-06300;
-	))
-      (==ucs@unicode	  . #x5336)	; &g2-UU+5336;
+     ((==ucs@unicode	  . #x5336)	; &g2-CB12179;
+      (==cbeta		  . 12179)	; &g2-CB12179;
       (->subsumptive
        ((===ucs@unicode	    . #x5336)	; &R-UU+5336;
 	)
        ((=hanziku-1	    . #xB6B8)	; &HZK01-B6B8;
+	)
+       ((===cbeta	    . 12179)	; &R-CB12179;
 	))
       ))
     ))
@@ -2197,10 +3380,22 @@
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 24)
     (total-strokes	 . 26)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x25AD4)	; 𥫔
+      ))
+    (=ucs@cns		. #x3536)	; &C4-6D53;
+    (=cns11643-4	. #x6D53)	; &C4-6D53; [77-51]
+    (=daikanwa		. 02670)	; &I-M-02670;
     (->subsumptive
-     ((=daikanwa	  . 02670)	; &M-02670;
+     ((==daikanwa	  . 02670)	; &g2-M-02670;
       )
-     ((=cns11643-4	  . #x6D53)	; &C4-6D53; [77-51]
+     ((==ucs@cns	  . #x3536)	; &g2-CU+3536;
+      (==cns11643-4	  . #x6D53)	; &g2-CU+3536; [77-51]
       ))
     ))
 (define-char
@@ -2210,12 +3405,44 @@
     (ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 24)
     (total-strokes	 . 26)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@unicode	  . #x8D1B)	; &JX1-7C3F;
+      (=jis-x0212	  . #x5F45)	; &JX1-7C3F; [63-37]
+      (=cns11643-1	  . #x7C6D)	; &I-C1-7C6D; [92-77]
+      (=jis-x0213-1	  . #x7C3F)	; &I-JX1-7C3F; [92-31]
+      (=daikanwa	  . 36984)	; &I-M-36984;
+      ))
     (=ucs@unicode	. #x3536)	; &UU+3536;
+    (=ucs@JP/hanazono	. nil)
+    (<-wrong
+     ((=ucs@cns		  . #x3536)	; &C4-6D53;
+      (=cns11643-4	  . #x6D53)	; &C4-6D53; [77-51]
+      (=daikanwa	  . 02670)	; &I-M-02670;
+      ))
+    (<-wrong*sources
+     jiyun-kaozheng daikanwa)
+    (->subsumptive
+     ((==ucs@unicode	  . #x3536)	; &g2-UU+3536;
+      (==ucs@JP/hanazono  . nil)
+      ))
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 26)
     (total-strokes	 . 28)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x20953)	; 𠥓
+      )
+     ((=ucs		  . #x820A)	; 舊
+      ))
     (=ucs		. #x2096C)	; 𠥬
     ))
 (define-char
@@ -2226,16 +3453,24 @@
     (ideographic-strokes . 26)
     (total-strokes	 . 28)
     (hanyu-dazidian	1 91 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x20953)	; 𠥓
+      )
+     ((=ucs-var-002	  . #x820A)	; &U-v002+820A;
+      ))
     (=ucs@cns		. #x2096C)	; &C7-6443;
     (=cns11643-7	. #x6443)	; &C7-6443; [68-35]
     (=daikanwa		. 02671)	; &I-M-02671;
-    (=hanziku-1		. #xB6C1)	; &I-HZK01-B6C1;
     (<-Zhouwen
      ((=ucs@unicode	  . #x531B)	; &AJ1-21223;
       (=adobe-japan1-6	  . 21223)	; &AJ1-21223;
       (=daikanwa	  . 02597)	; &I-M-02597;
       )
-     ((=ucs		  . #x67E9)	; 柩
+     ((=ucs@unicode	  . #x67E9)	; &AJ1-05168;
+      (=adobe-japan1-0	  . 05168)	; &AJ1-05168;
       (=daikanwa	  . 14650)	; &I-M-14650;
       ))
     (<-Zhouwen*sources
@@ -2255,6 +3490,8 @@
        ((===daikanwa	    . 02671)	; &R-M-02671;
 	)
        ((===cns11643-7	    . #x6443)	; &R-C7-6443; [68-35]
+	)
+       ((=hanziku-1	    . #xB6C1)	; &HZK01-B6C1;
 	))
       ))
     ))
@@ -2272,9 +3509,34 @@
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
-    (hanyu-dazidian	1 84 4)
-    (=ucs		. #x20932)	; 𠤲
-    (=hanziku-1		. #xB556)	; &I-HZK01-B556;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=>ucs@iwds-1	  . #x7389)	; &A-IWDSU+7389;
+      (=>iwds-1		  .  1252)	; &A-IWDSU+7389;
+      ))
+    (=>ucs@iwds-1/normalized . #x5321)	; &A-NIWDSU+5321;
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>ucs@iwds-1/normalized . #x5321)	; &A-NIWDSU+5321;
+      ))
+    (ideographic-radical . 22)	; ⼕
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=>ucs@component	  . #x7389)	; &A-compU+7389;
+      (=>iwds-1		  .  0252)	; &A-compU+7389;
+      ))
+    (=>ucs@iwds-1	. #x5321)	; &A-IWDSU+5321;
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -2290,12 +3552,6 @@
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
-    (hanyu-dazidian	1 86 8)
-    (=ucs		. #x20947)	; 𠥇
-    (=hanziku-1		. #xB5BC)	; &I-HZK01-B5BC;
-    ))
-(define-char
-  '((ideographic-radical . 22)	; ⼕
     (hanyu-dazidian	1 86 9)
     (=ucs		. #x2094D)	; 𠥍
     (=hanziku-1		. #xB5BD)	; &I-HZK01-B5BD;