X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git;a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R023-Hiding-Enclosure.el;h=f9cfa475b2e73892669c6dce6e8aff83bf13bcee;hp=c976d21e1e13a5a5d882dabc20d1d8ab3c51f9aa;hb=HEAD;hpb=babb95019668e7e6b5484f5d34290ca12b902a35

diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index c976d21..850b835 100644
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -17,15 +17,31 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 23)	; ⼖
+  '((<-denotational@component
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      ))
+    (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=gt-k		  . 00027)	; &GT-K00027;
+      ))
     (=ucs		. #x5338)	; 匸
-    (=>>jis-x0208	. #x523E)	; 匸 [50-30]
+    (=+>jis-x0208	. #x523E)	; 匸 [50-30]
+    (=+>jis-x0213-1	. #x523E)	; 匸 [50-30]
+    (=+>adobe-japan1-0	. 04307)	; 匸
+    (=+>gt		. 03427)	; 匸
     (->subsumptive
      ((hanyu-dazidian	  1 81 4)
-      (=ucs@jis		  . #x5338)	; &GT-03427;
-      (=jis-x0208	  . #x523E)	; &GT-03427; [50-30]
+      (=ucs@unicode	  . #x5338)	; &AJ1-04307;
+      (=adobe-japan1-0	  . 04307)	; &AJ1-04307;
+      (=jis-x0208	  . #x523E)	; &I-J90-523E; [50-30]
       (=cns11643-3	  . #x2129)	; &I-C3-2129; [01-09]
       (=jis-x0213-1	  . #x523E)	; &I-JX1-523E; [50-30]
       (=big5-cdp	  . #x8A70)	; &I-CDP-8A70;
@@ -33,9 +49,45 @@
       (=gt-k		  . 00096)	; &I-GT-K00096;
       (=gt-pj-1		  . #x523E)	; &I-GT-03427; [50-30]
       (=daikanwa	  . 02672)	; &I-M-02672;
-      (=shinjigen	  .  0800)	; &GT-03427;
+      (=shinjigen	  .  0800)	; &AJ1-04307;
+      (->subsumptive
+       ((=decomposition@cid
+	 ((=ucs		      . #x5338)	; 匸
+	  )
+	 ((=ucs		      . #xE0100)	; 󠄀
+	  ))
+	(==ucs@cns	    . #x5338)	; &g2-AJ1-04307;
+	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
+	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
+	(==jis-x0208	    . #x523E)	; &g2-AJ1-04307; [50-30]
+	(==cns11643-3	    . #x2129)	; &g2-AJ1-04307; [01-09]
+	(==jis-x0213-1	    . #x523E)	; &g2-AJ1-04307; [50-30]
+	(==big5-cdp	    . #x8A70)	; &g2-AJ1-04307;
+	(==gt		    . 03427)	; &g2-AJ1-04307;
+	(==gt-k		    . 00096)	; &g2-AJ1-04307;
+	(==daikanwa	    . 02672)	; &g2-AJ1-04307;
+	(==shinjigen	    .  0800)	; &g2-AJ1-04307;
+	(->subsumptive
+	 ((===daikanwa	      . 02672)	; &R-M-02672;
+	  )
+	 ((===jis-x0208	      . #x523E)	; &R-J0-523E; [50-30]
+	  (===jis-x0213-1     . #x523E)	; &R-J0-523E; [50-30]
+	  )
+	 ((===adobe-japan1-0  . 04307)	; &R-AJ1-04307;
+	  )
+	 ((===big5-cdp	      . #x8A70)	; &R-CDP-8A70;
+	  )
+	 ((===cns11643-3      . #x2129)	; &R-C3-2129; [01-09]
+	  )
+	 ((===gt	      . 03427)	; &R-GT-03427;
+	  (===gt-k	      . 00096)	; &R-GT-03427;
+	  ))
+	)
+       ((==ucs@unicode	    . #x5338)	; &g2-UU+5338;
+	(==ucs@JP/hanazono  . nil)
+	))
       )
-     ((=ucs@unicode	  . #x5338)	; &UU+5338;
+     ((=ucs-var-002	  . #x5338)	; &U-v002+5338;
       ))
     ))
 (define-char
@@ -53,7 +105,6 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian	1 81 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
@@ -62,40 +113,93 @@
       )
      ((=ucs		  . #x513F)	; 儿
       ))
-    (=>>ucs@cns		. #x5339)	; &G-GT-03429;
-    (=big5		. #xA4C7)	; &G-GT-03429;
-    (=>>gt		. 03429)	; &G-GT-03429;
-    (=>>daikanwa	. 02673)	; &G-GT-03429;
+    (=+>ucs@cns		. #x5339)	; &o-AJ1-13994;
+    (=big5		. #xA4C7)	; &o-AJ1-13994;
+    (=+>adobe-japan1-4	. 13994)	; &o-AJ1-13994;
+    (=+>gt		. 03429)	; &o-AJ1-13994;
     (->subsumptive
-     ((ideographic-structure
+     ((hanyu-dazidian	  1 81 6)
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
 	(=ucs		    . #x2FF7)	; â¿·
 	)
-       ((=ucs@jis	    . #x5338)	; &GT-03427;
-	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
-	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
-	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
-	(=daikanwa	    . 02672)	; &I-M-02672;
+       ((=ucs@unicode	    . #x5338)	; &AJ1-04307;
+	(=adobe-japan1-0    . 04307)	; &AJ1-04307;
 	)
        ((=ucs		    . #x513F)	; 儿
 	))
-      (=daikanwa	  . 02673)	; &M-02673;
-      (=shinjigen	  .  0804)	; &M-02673;
-      )
-     ((=ucs@cns		  . #x5339)	; &C1-4528;
-      (=cns11643-1	  . #x4528)	; &C1-4528; [37-08]
+      (=ucs@cns		  . #x5339)	; &MJ007817;
+      (=mj		  . 007817)	; &MJ007817;
+      (=cns11643-1	  . #x4528)	; &I-C1-4528; [37-08]
+      (=hanyo-denshi/ks	  . 030150)	; &MJ007817;
+      (=gt		  . 03429)	; &I-GT-03429;
+      (=gt-k		  . 00478)	; &I-GT-K00478;
+      (=gt-pj-2		  . #x4777)	; &I-GT-03429; [39-87]
+      (=daikanwa	  . 02673)	; &I-M-02673;
+      (=shinjigen	  .  0804)	; &MJ007817;
+      (->subsumptive
+       ((=decomposition@hanyo-denshi
+	 ((=ucs		      . #x5339)	; 匹
+	  )
+	 ((=ucs		      . #xE0103)	; 󠄃
+	  ))
+	(ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	  (=ucs		      . #x2FF7)	; â¿·
+	  )
+	 ((==ucs@cns	      . #x5338)	; &g2-AJ1-04307;
+	  (==ucs@jis	      . #x5338)	; &g2-AJ1-04307;
+	  (==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
+	  )
+	 ((=ucs		      . #x513F)	; 儿
+	  ))
+	(==mj		    . 007817)	; &g2-MJ007817;
+	(==hanyo-denshi/ks  . 030150)	; &g2-MJ007817;
+	(==daikanwa	    . 02673)	; &g2-MJ007817;
+	(==shinjigen	    .  0804)	; &g2-MJ007817;
+	(->subsumptive
+	 ((===daikanwa	      . 02673)	; &R-M-02673;
+	  )
+	 ((===hanyo-denshi/ks . 030150)	; &R-HD-KS-030150;
+	  (=hanyo-denshi/ks/mf . #x0BC7)	; &R-HD-KS-030150;
+	  )
+	 ((===mj	      . 007817)	; &R-MJ007817;
+	  ))
+	)
+       ((==ucs@cns	    . #x5339)	; &g2-CU+5339;
+	(==cns11643-1	    . #x4528)	; &g2-CU+5339; [37-08]
+	)
+       ((===hng-kar	    . 06190)	; &HNG018-06190;
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	  (=ucs		      . #x2FF7)	; â¿·
+	  )
+	 ((==ucs@unicode      . #x5338)	; &g2-UU+5338;
+	  )
+	 ((=ucs		      . #x513F)	; 儿
+	  ))
+	(==gt		    . 03429)	; &g2-GT-03429;
+	(==gt-k		    . 00478)	; &g2-GT-03429;
+	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
 	(=ucs		    . #x2FF7)	; â¿·
 	)
-       ((=ucs@unicode	    . #x5338)	; &UU+5338;
+       ((=ucs-var-002	    . #x5338)	; &U-v002+5338;
 	)
        ((=ucs		    . #x513F)	; 儿
 	))
-      (=gt		  . 03429)	; &GT-03429;
-      (=gt-k		  . 00478)	; &I-GT-K00478;
-      (=gt-pj-2		  . #x4777)	; &GT-03429; [39-87]
+      (=adobe-japan1-4	  . 13994)	; &AJ1-13994;
+      (->subsumptive
+       ((=decomposition@cid
+	 ((=ucs		      . #x5339)	; 匹
+	  )
+	 ((=ucs		      . #xE0101)	; 󠄁
+	  ))
+	(==adobe-japan1-4   . 13994)	; &g2-AJ1-13994;
+	))
       ))
     ))
 (define-char
@@ -113,26 +217,72 @@
       )
      ((=ucs		  . #x513F)	; 儿
       ))
-    (=>>ucs@unicode	. #x5339)	; &GT-03328;
-    (=ucs@unicode	. #x5339)	; &GT-03328;
-    (=jis-x0208		. #x4924)	; &GT-03328; [41-04]
+    (=ucs@unicode	. #x5339)	; &MJ007818;
+    (=mj		. 007818)	; &MJ007818;
+    (=adobe-japan1-0	. 03478)	; &I-AJ1-03478;
+    (=jis-x0208		. #x4924)	; &I-J90-4924; [41-04]
     (=gb2312		. #x4625)	; &I-G0-4625; [38-05]
     (=ks-x1001		. #x792F)	; &I-K0-792F; [89-15]
     (=jis-x0213-1	. #x4924)	; &I-JX1-4924; [41-04]
+    (=hanyo-denshi/ja	. #x4924)	; &I-HD-JA-4924; [41-04]
     (=gt		. 03328)	; &I-GT-03328;
     (=gt-k		. 00479)	; &I-GT-K00479;
     (=gt-pj-1		. #x4924)	; &I-GT-03328; [41-04]
-    (=shinjigen		.  0803)	; &GT-03328;
-    (=hanyo-denshi/ja	. #x4924)	; &I-HD-JA-4924; [41-04]
+    (=shinjigen		.  0803)	; &MJ007818;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5339)	; 匹
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (=decomposition@hanyo-denshi
+       ((=ucs		    . #x5339)	; 匹
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (==ucs@unicode	  . #x5339)	; &g2-MJ007818;
+      (==mj		  . 007818)	; &g2-MJ007818;
+      (==adobe-japan1-0	  . 03478)	; &g2-MJ007818;
+      (==gb2312		  . #x4625)	; &g2-MJ007818; [38-05]
+      (==ks-x1001	  . #x792F)	; &g2-MJ007818; [89-15]
+      (==jis-x0208	  . #x4924)	; &g2-MJ007818; [41-04]
+      (==jis-x0213-1	  . #x4924)	; &g2-MJ007818; [41-04]
+      (==hanyo-denshi/ja  . #x4924)	; &g2-MJ007818; [41-04]
+      (==gt		  . 03328)	; &g2-MJ007818;
+      (==gt-k		  . 00479)	; &g2-MJ007818;
+      (==shinjigen	  .  0803)	; &g2-MJ007818;
+      (->subsumptive
+       ((===jis-x0208	    . #x4924)	; &R-J0-4924; [41-04]
+	(===jis-x0213-1	    . #x4924)	; &R-J0-4924; [41-04]
+	)
+       ((===adobe-japan1-0  . 03478)	; &R-AJ1-03478;
+	)
+       ((===mj		    . 007818)	; &R-MJ007818;
+	)
+       ((===gt		    . 03328)	; &R-GT-03328;
+	(===gt-k	    . 00479)	; &R-GT-03328;
+	)
+       ((===ucs@ks	    . #x5339)	; &R-K0-792F;
+	(===ks-x1001	    . #x792F)	; &R-K0-792F; [89-15]
+	)
+       ((===ucs@unicode	    . #x5339)	; &R-UU+5339;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (=ucs		. #x533A)	; 区
-    (<-simplified@ucs
-     ((=ucs		  . #x5340)	; 區
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x3405)	; 㐅
       ))
+    (=ucs		. #x533A)	; 区
     ))
 (define-char
   '((<-denotational
@@ -149,33 +299,40 @@
       )
      ((=ucs		  . #x3405)	; 㐅
       ))
-    (=>>ucs@cns		. #x533A)	; &G-GT-03428;
-    (=>>gt		. 03428)	; &G-GT-03428;
-    (=>>daikanwa	. 02674)	; &G-GT-03428;
+    (=ucs@cns		. #x533A)	; &GT-03428;
+    (=cns11643-3	. #x2157)	; &GT-03428; [01-55]
+    (=gt		. 03428)	; &I-GT-03428;
+    (=gt-pj-2		. #x4778)	; &I-GT-03428; [39-88]
+    (=daikanwa		. 02674)	; &I-M-02674;
+    (<-simplified
+     ((=ucs@cns		  . #x5340)	; &MJ007833;
+      (=mj		  . 007833)	; &MJ007833;
+      (=daikanwa	  . 02691)	; &I-M-02691;
+      ))
+    (<-simplified*sources
+     daikanwa)
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
 	(=ucs		    . #x2FF7)	; â¿·
 	)
-       ((=ucs@jis	    . #x5338)	; &GT-03427;
-	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
-	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
-	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
-	(=daikanwa	    . 02672)	; &I-M-02672;
+       ((==ucs@cns	    . #x5338)	; &g2-AJ1-04307;
+	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
+	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
 	)
        ((=ucs		    . #x3405)	; 㐅
 	))
-      (=ucs@cns		  . #x533A)	; &GT-03428;
-      (=cns11643-3	  . #x2157)	; &GT-03428; [01-55]
-      (=gt		  . 03428)	; &I-GT-03428;
-      (=gt-pj-2		  . #x4778)	; &I-GT-03428; [39-88]
-      (=daikanwa	  . 02674)	; &I-M-02674;
-      (<-simplified
-       ((=cns11643-1	    . #x5934)	; &M-02691; [57-20]
-	(=daikanwa	    . 02691)	; &I-M-02691;
+      (==ucs@cns	  . #x533A)	; &g2-GT-03428;
+      (==cns11643-3	  . #x2157)	; &g2-GT-03428; [01-55]
+      (==gt		  . 03428)	; &g2-GT-03428;
+      (==daikanwa	  . 02674)	; &g2-GT-03428;
+      (->subsumptive
+       ((===daikanwa	    . 02674)	; &R-M-02674;
+	)
+       ((===cns11643-3	    . #x2157)	; &R-C3-2157; [01-55]
+	)
+       ((===gt		    . 03428)	; &R-GT-03428;
 	))
-      (<-simplified*sources
-       daikanwa)
       ))
     ))
 (define-char
@@ -186,6 +343,11 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=decomposition@cid
+     ((=ucs		  . #x533A)	; 区
+      )
+     ((=ucs		  . #xE0100)	; 󠄀
+      ))
     (hanyu-dazidian	1 81 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -195,47 +357,92 @@
       )
      ((=ucs		  . #x3405)	; 㐅
       ))
-    (=>>ucs@unicode	. #x533A)	; &GT-03327;
-    (=ucs@unicode	. #x533A)	; &GT-03327;
-    (=jis-x0208		. #x3668)	; &GT-03327; [22-72]
+    (=ucs@unicode	. #x533A)	; &AJ1-01760;
+    (=adobe-japan1-0	. 01760)	; &AJ1-01760;
+    (=jis-x0208		. #x3668)	; &I-J90-3668; [22-72]
     (=gb2312		. #x4778)	; &I-G0-4778; [39-88]
     (=jis-x0213-1	. #x3668)	; &I-JX1-3668; [22-72]
     (=gt		. 03327)	; &I-GT-03327;
     (=gt-k		. 00414)	; &I-GT-K00414;
     (=gt-pj-1		. #x3668)	; &I-GT-03327; [22-72]
-    (=shinjigen		.  0801)	; &GT-03327;
+    (=shinjigen		.  0801)	; &AJ1-01760;
     (=hanziku-1		. #xB4B6)	; &I-HZK01-B4B6;
     (<-simplified@CN
-     ((=gb12345		  . #x4778)	; &GT-03378; [39-88]
+     ((=ucs@unicode	  . #x5340)	; &MJ007832;
+      (=mj		  . 007832)	; &MJ007832;
+      (=gb12345		  . #x4778)	; &MJ007832; [39-88]
       ))
     (<-simplified@JP/Jouyou
-     ((=ucs@unicode	  . #x5340)	; &GT-03378;
-      (=ks-x1001	  . #x4F21)	; &GT-03378; [47-01]
+     ((=ucs@unicode	  . #x5340)	; &MJ007832;
+      (=mj		  . 007832)	; &MJ007832;
       (=jis-x0208@1990	  . #x523F)	; &I-J90-523F; [50-31]
-      (=jis-x0213-1	  . #x523F)	; &I-JX1-523F; [50-31]
       ))
     (<-simplified@JP/misc
-     ((=cns11643-1	  . #x5934)	; &M-02691; [57-20]
-      (=daikanwa	  . 02691)	; &I-M-02691;
-      (=shinjigen	  .  0802)	; &M-02691;
+     ((=ucs@cns		  . #x5340)	; &MJ007833;
+      (=mj		  . 007833)	; &MJ007833;
+      (=jis-x0208@1978	  . #x523F)	; &I-J78-523F; [50-31]
+      (=jis-x0208@1983	  . #x523F)	; &I-J83-523F; [50-31]
+      (=shinjigen	  .  0802)	; &MJ007833;
       ))
     (<-simplified@JP/misc*sources
      shinjigen)
     ))
 (define-char
-  '((=>ucs		. #x20504)	; 𠔄
-    (ideographic-radical . 23)	; ⼖
-    (ideographic-strokes . 2)
-    (total-strokes	 . 4)
-    (=daikanwa		. 48948)	; &M-48948;
-    ))
-(define-char
-  '((morohashi-daikanwa	48948 0 1)
-    (ideographic-radical . 23)	; ⼖
+  '((ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E37)	; 丷
+      )
+     ((=ucs		  . #x5338)	; 匸
+      ))
+    (sound@ja/on	"ya")
     (=ucs		. #x20504)	; 𠔄
-    (=cns11643-6	. #x2159)	; &I-C6-2159; [01-57]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E37)	; 丷
+	)
+       ((=ucs-var-002	    . #x5338)	; &U-v002+5338;
+	))
+      (=daikanwa	  . 48948)	; &M-48948;
+      (<-same
+       ((=ucs@iso	    . #x26AF4)	; &GT-39663;
+	(=cns11643-6	    . #x2338)	; &GT-39663; [03-24]
+	(=daikanwa	    . 30642)	; &I-M-30642;
+	))
+      (<-same*sources
+       daikanwa)
+      (->subsumptive
+       ((==daikanwa	    . 48948)	; &g2-M-48948;
+	))
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E37)	; 丷
+	)
+       ((=ucs@unicode	    . #x5338)	; &AJ1-04307;
+	(=adobe-japan1-0    . 04307)	; &AJ1-04307;
+	))
+      (=ucs@iso		  . #x20504)	; &C6-2159;
+      (=cns11643-6	  . #x2159)	; &C6-2159; [01-57]
+      (->subsumptive
+       ((==ucs@iso	    . #x20504)	; &g2-IU-00020504;
+	(==cns11643-6	    . #x2159)	; &g2-IU-00020504; [01-57]
+	(->subsumptive
+	 ((===cns11643-6      . #x2159)	; &R-C6-2159; [01-57]
+	  )
+	 ((===ucs@iso	      . #x20504)	; &R-U-00020504;
+	  ))
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
@@ -261,18 +468,207 @@
     (=daikanwa		. 02676)	; &I-M-02676;
     ))
 (define-char
-  '((ideographic-radical . 23)	; ⼖
+  '((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)
-    (=daikanwa		. 02677)	; &M-02677;
+    (=ucs		. #x20932)	; 𠤲
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20932)	; 𠤲
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x5338)	; 匸
+      )
+     ((=ucs		  . #x5C6F)	; 屯
+      ))
+    (=>mj		. 031671)	; &A-MJ031671;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((=ucs@unicode	    . #x5338)	; &AJ1-04307;
+	(=adobe-japan1-0    . 04307)	; &AJ1-04307;
+	)
+       ((=ucs@jis	    . #x5C6F)	; &AJ1-03246;
+	(=ucs@ks	    . #x5C6F)	; &AJ1-03246;
+	(=adobe-japan1-0    . 03246)	; &AJ1-03246;
+	))
+      (=mj		  . 031671)	; &MJ031671;
+      (=daikanwa	  . 02677)	; &I-M-02677;
+      (->subsumptive
+       ((==mj		    . 031671)	; &g2-MJ031671;
+	(==daikanwa	    . 02677)	; &g2-MJ031671;
+	(->subsumptive
+	 ((===daikanwa	      . 02677)	; &R-M-02677;
+	  )
+	 ((===mj	      . 031671)	; &R-MJ031671;
+	  ))
+	))
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((=ucs-var-002	    . #x5338)	; &U-v002+5338;
+	)
+       ((=ucs@jis	    . #x5C6F)	; &AJ1-03246;
+	(=ucs@ks	    . #x5C6F)	; &AJ1-03246;
+	(=adobe-japan1-0    . 03246)	; &AJ1-03246;
+	))
+      (=koseki		  . 030320)	; &KOSEKI-030320;
+      ))
+    ))
+(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
+  '((<-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
   '((ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x4E19)	; 丙
+      ))
     (=ucs		. #x3537)	; 㔷
-    (=cns11643-6	. #x2636)	; &I-C6-2636; [06-22]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3537)	; 㔷
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x5338)	; 匸
+      )
+     ((=ucs		  . #x4E19)	; 丙
+      ))
+    (=ucs@cns		. #x3537)	; &C6-2636;
+    (=cns11643-6	. #x2636)	; &C6-2636; [06-22]
     (=daikanwa		. 02678)	; &I-M-02678;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((==ucs@cns	    . #x5338)	; &g2-AJ1-04307;
+	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
+	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
+	)
+       ((==mj		    . 006328)	; &g2-MJ006328;
+	))
+      (==daikanwa	  . 02678)	; &g2-M-02678;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((==ucs@cns	    . #x5338)	; &g2-AJ1-04307;
+	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
+	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
+	)
+       ((==ucs@unicode	    . #x4E19)	; &g2-MJ006327;
+	(==mj		    . 006327)	; &g2-MJ006327;
+	))
+      (==ucs@cns	  . #x3537)	; &g2-CU+3537;
+      (==cns11643-6	  . #x2636)	; &g2-CU+3537; [06-22]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3537)	; 㔷
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x4E19)	; 丙
+      ))
+    (=ucs@unicode	. #x3537)	; &UU+3537;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((==ucs@unicode	    . #x531A)	; &g2-AJ1-04302;
+	(==adobe-japan1-0   . 04302)	; &g2-AJ1-04302;
+	)
+       ((==ucs@unicode	    . #x4E19)	; &g2-MJ006327;
+	(==mj		    . 006327)	; &g2-MJ006327;
+	))
+      (==ucs@unicode	  . #x3537)	; &g2-UU+3537;
+      (->subsumptive
+       ((===ucs@unicode	    . #x3537)	; &R-UU+3537;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
@@ -283,13 +679,22 @@
     (=daikanwa		. 02679)	; &I-M-02679;
     ))
 (define-char
-  '((ideographic-radical . 23)	; ⼖
+  '((<-denotational@usage
+     ((==>ucs@bucs	  . #x91AB)	; &BUCS+91AB;
+      ))
+    (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (=ucs		. #x533B)	; 医
-    (<-simplified@ucs
-     ((=ucs		  . #x91AB)	; 醫
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x77E2)	; 矢
       ))
+    (=ucs		. #x533B)	; 医
     ))
 (define-char
   '((<-denotational
@@ -298,7 +703,6 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 85 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
@@ -307,25 +711,62 @@
       )
      ((=ucs		  . #x77E2)	; 矢
       ))
-    (=>>ucs@cns		. #x533B)	; &G-CU+533B;
-    (=>>daikanwa	. 02680)	; &G-CU+533B;
+    (=+>ucs@cns		. #x533B)	; &o-CDP-8CD3;
+    (=+>big5-cdp	. #x8CD3)	; &o-CDP-8CD3;
     (->subsumptive
-     ((ideographic-structure
+     ((hanyu-dazidian	  1 85 3)
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
 	(=ucs		    . #x2FF7)	; â¿·
 	)
-       ((=ucs@jis	    . #x5338)	; &GT-03427;
-	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
-	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
-	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
-	(=daikanwa	    . 02672)	; &I-M-02672;
+       ((=ucs@unicode	    . #x5338)	; &AJ1-04307;
+	(=adobe-japan1-0    . 04307)	; &AJ1-04307;
 	)
-       ((=gt-k		    . 01013)	; &GT-K01013;
+       ((=ucs		    . #x77E2)	; 矢
 	))
-      (=ucs@cns		  . #x533B)	; &CDP-8CD3;
-      (=cns11643-3	  . #x2466)	; &CDP-8CD3; [04-70]
+      (=ucs@cns		  . #x533B)	; &MJ007821;
+      (=mj		  . 007821)	; &MJ007821;
+      (=cns11643-3	  . #x2466)	; &I-C3-2466; [04-70]
       (=big5-cdp	  . #x8CD3)	; &I-CDP-8CD3;
+      (=hanyo-denshi/ks	  . 030470)	; &MJ007821;
       (=daikanwa	  . 02680)	; &I-M-02680;
+      (->subsumptive
+       ((==ucs@cns	    . #x533B)	; &g2-CDP-8CD3;
+	(==cns11643-3	    . #x2466)	; &g2-CDP-8CD3; [04-70]
+	(==big5-cdp	    . #x8CD3)	; &g2-CDP-8CD3;
+	(==daikanwa	    . 02680)	; &g2-CDP-8CD3;
+	(->subsumptive
+	 ((===daikanwa	      . 02680)	; &R-M-02680;
+	  )
+	 ((===big5-cdp	      . #x8CD3)	; &R-CDP-8CD3;
+	  )
+	 ((===cns11643-3      . #x2466)	; &R-C3-2466; [04-70]
+	  ))
+	)
+       ((=decomposition@hanyo-denshi
+	 ((=ucs		      . #x533B)	; 医
+	  )
+	 ((=ucs		      . #xE0102)	; 󠄂
+	  ))
+	(==mj		    . 007821)	; &g2-MJ007821;
+	(==hanyo-denshi/ks  . 030470)	; &g2-MJ007821;
+	(->subsumptive
+	 ((===hanyo-denshi/ks . 030470)	; &R-HD-KS-030470;
+	  (=hanyo-denshi/ks/mf . #x0BE7)	; &R-HD-KS-030470;
+	  )
+	 ((===mj	      . 007821)	; &R-MJ007821;
+	  ))
+	))
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((=ucs-var-002	    . #x5338)	; &U-v002+5338;
+	)
+       ((=ucs		    . #x77E2)	; 矢
+	))
+      (=ucs-var-004	  . #x533B)	; &U-v004+533B;
       ))
     ))
 (define-char
@@ -335,6 +776,11 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (=decomposition@hanyo-denshi
+     ((=ucs		  . #x533B)	; 医
+      )
+     ((=ucs		  . #xE0101)	; 󠄁
+      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
@@ -343,37 +789,55 @@
       )
      ((=ucs		  . #x77E2)	; 矢
       ))
-    (=>>ucs@unicode	. #x533B)	; &G-J0-3065;
-    (=>>jis-x0208	. #x3065)	; &G-J0-3065; [16-69]
+    (=ucs@unicode	. #x533B)	; &MJ007820;
+    (=mj		. 007820)	; &MJ007820;
+    (=adobe-japan1-0	. 01193)	; &I-AJ1-01193;
+    (=jis-x0208		. #x3065)	; &I-J90-3065; [16-69]
+    (=gb2312		. #x523D)	; &I-G0-523D; [50-29]
+    (=jis-x0213-1	. #x3065)	; &I-JX1-3065; [16-69]
+    (=hanyo-denshi/ja	. #x3065)	; &I-HD-JA-3065; [16-69]
+    (=gt		. 03344)	; &I-GT-03344;
+    (=gt-k		. 02502)	; &I-GT-K02502;
+    (=gt-pj-1		. #x3065)	; &I-GT-03344; [16-69]
+    (=shinjigen		.  8537)	; &MJ007820;
+    (<-simplified@CN
+     ((=ucs@unicode	  . #x91AB)	; &MJ026547;
+      (=mj		  . 026547)	; &MJ026547;
+      (=gb12345		  . #x523D)	; &MJ026547; [50-29]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs@unicode	  . #x91AB)	; &MJ026547;
+      (=mj		  . 026547)	; &MJ026547;
+      (=jis-x0208	  . #x6E50)	; &I-J90-6E50; [78-48]
+      ))
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
-	)
-       ((=ucs		    . #x531A)	; 匚
+     ((=decomposition@cid
+       ((=ucs		    . #x533B)	; 医
 	)
-       ((=gt-k		    . 01013)	; &GT-K01013;
+       ((=ucs		    . #xE0100)	; 󠄀
 	))
-      (=ucs@unicode	  . #x533B)	; &GT-03344;
-      (=jis-x0208	  . #x3065)	; &GT-03344; [16-69]
-      (=gb2312		  . #x523D)	; &I-G0-523D; [50-29]
-      (=jis-x0213-1	  . #x3065)	; &I-JX1-3065; [16-69]
-      (=gt		  . 03344)	; &I-GT-03344;
-      (=gt-k		  . 02502)	; &I-GT-K02502;
-      (=gt-pj-1		  . #x3065)	; &I-GT-03344; [16-69]
-      (=shinjigen	  .  8537)	; &GT-03344;
-      (=hanyo-denshi/ja	  . #x3065)	; &I-HD-JA-3065; [16-69]
-      (<-simplified@CN
-       ((=gb12345	    . #x523D)	; 醫 [50-29]
-	))
-      (<-simplified@JP/Jouyou
-       ((=ucs@jis	    . #x91AB)	; &GT-53782;
-	(=ucs@ks	    . #x91AB)	; &GT-53782;
-	(=jis-x0208	    . #x6E50)	; &GT-53782; [78-48]
-	(=ks-x1001	    . #x6C22)	; &I-K0-6C22; [76-02]
-	(=jis-x0213-1	    . #x6E50)	; &I-JX1-6E50; [78-48]
-	(=daikanwa	    . 40006)	; &I-M-40006;
+      (==ucs@unicode	  . #x533B)	; &g2-AJ1-01193;
+      (==adobe-japan1-0	  . 01193)	; &g2-AJ1-01193;
+      (==gb2312		  . #x523D)	; &g2-AJ1-01193; [50-29]
+      (==jis-x0208	  . #x3065)	; &g2-AJ1-01193; [16-69]
+      (==jis-x0213-1	  . #x3065)	; &g2-AJ1-01193; [16-69]
+      (==hanyo-denshi/ja  . #x3065)	; &g2-AJ1-01193; [16-69]
+      (==gt		  . 03344)	; &g2-AJ1-01193;
+      (==gt-k		  . 02502)	; &g2-AJ1-01193;
+      (==shinjigen	  .  8537)	; &g2-AJ1-01193;
+      (->subsumptive
+       ((===jis-x0208	    . #x3065)	; &R-J0-3065; [16-69]
+	(===jis-x0213-1	    . #x3065)	; &R-J0-3065; [16-69]
+	)
+       ((===adobe-japan1-0  . 01193)	; &R-AJ1-01193;
+	)
+       ((===ucs@unicode	    . #x533B)	; &R-UU+533B;
+	)
+       ((===gt		    . 03344)	; &R-GT-03344;
+	(===gt-k	    . 02502)	; &R-GT-03344;
 	))
+      )
+     ((==mj		  . 007820)	; &g2-MJ007820;
       ))
     ))
 (define-char
@@ -390,36 +854,59 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (=ucs@iso		. #x20971)	; &M-02681;
-    (=cns11643-6	. #x2637)	; &M-02681; [06-23]
+    (hanyu-dazidian	1 70 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x5338)	; 匸
+      )
+     ((=ucs		  . #x51FA)	; 出
+      ))
+    (=ucs@iso		. #x20971)	; &C6-2637;
+    (=cns11643-6	. #x2637)	; &C6-2637; [06-23]
     (=daikanwa		. 02681)	; &I-M-02681;
-    (<-Zetian
-     ((=gt		  . 18141)	; &GT-18141;
-      (=daikanwa	  . 14330)	; &I-M-14330;
+    (<-formed@Zetian
+     ((=ucs		  . #x6708)	; 月
       ))
-    (<-Zetian*sources
+    (<-formed@Zetian*sources
      zihui-bu)
     (<-same
-     ((=gt		  . 18141)	; &GT-18141;
+     ((=ucs@unicode	  . #x6708)	; &MJ013520;
+      (=mj		  . 013520)	; &MJ013520;
       (=daikanwa	  . 14330)	; &I-M-14330;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x20971)	; ð ¥±
+    (->subsumptive
+     ((==ucs@iso	  . #x20971)	; &g2-M-02681;
+      (==cns11643-6	  . #x2637)	; &g2-M-02681; [06-23]
+      (==daikanwa	  . 02681)	; &g2-M-02681;
+      (->subsumptive
+       ((===daikanwa	    . 02681)	; &R-M-02681;
+	)
+       ((===cns11643-6	    . #x2637)	; &R-C6-2637; [06-23]
+	)
+       ((===ucs@iso	    . #x20971)	; &R-U-00020971;
+	))
+      )
+     ((=hanziku-1	  . #xB273)	; &HZK01-B273;
       ))
-    (ideographic-radical . 23)	; ⼖
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (hanyu-dazidian	1 70 10)
-    (=hanziku-1		. #xB273)	; &HZK01-B273;
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x5916)	; 外
+      ))
+    (sound@ja/on	"kou")
     (=ucs		. #x3530)	; 㔰
     ))
 (define-char
@@ -429,20 +916,32 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (sound@ja/on	"kou")
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs@unicode	  . #x5338)	; &AJ1-04307;
+      (=adobe-japan1-0	  . 04307)	; &AJ1-04307;
+      )
+     ((=gt-k		  . 00902)	; &GT-K00902;
+      ))
     (=daikanwa		. 02682)	; &M-02682;
     (<-ancient
-     ((=ucs		  . #x6046)	; 恆
+     ((=ucs@unicode	  . #x6046)	; &AJ1-04828;
+      (=adobe-japan1-0	  . 04828)	; &AJ1-04828;
       (=daikanwa	  . 10528)	; &I-M-10528;
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
     (->formed@shuowen
-     ((=gt		  . 00353)	; &GT-00353;
+     ((=mj		  . 030470)	; &MJ030470;
       (=daikanwa	  . 00269)	; &I-M-00269;
       ))
     (->formed@shuowen*sources
      daikanwa)
+    (->subsumptive
+     ((==daikanwa	  . 02682)	; &g2-M-02682;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -451,23 +950,100 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs@unicode	  . #x5338)	; &AJ1-04307;
+      (=adobe-japan1-0	  . 04307)	; &AJ1-04307;
+      )
+     ((=ucs@unicode	  . #x5916)	; &C1-4640;
+      (=gb2312		  . #x4D62)	; &C1-4640; [45-66]
+      (=cns11643-1	  . #x4640)	; &I-C1-4640; [38-32]
+      ))
+    (=ucs@cns		. #x3530)	; &C6-2638;
+    (=cns11643-6	. #x2638)	; &C6-2638; [06-24]
+    (->subsumptive
+     ((==ucs@cns	  . #x3530)	; &g2-CU+3530;
+      (==cns11643-6	  . #x2638)	; &g2-CU+3530; [06-24]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3530)	; 㔰
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@unicode	  . #x5916)	; &C1-4640;
+      (=gb2312		  . #x4D62)	; &C1-4640; [45-66]
+      (=cns11643-1	  . #x4640)	; &I-C1-4640; [38-32]
+      ))
     (=ucs@unicode	. #x3530)	; &UU+3530;
+    (=ucs@JP/hanazono	. nil)
     (=jef-china3	. #x45B5)	; &UU+3530;
+    (->subsumptive
+     ((==ucs@unicode	  . #x3530)	; &g2-UU+3530;
+      (==ucs@JP/hanazono  . nil)
+      )
+     ((==jef-china3	  . #x45B5)	; &g2-JC3-45B5;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=big5-cdp	  . #x88AD)	; &CDP-88AD;
+      ))
+    (=ucs		. #x20972)	; ð ¥²
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x3530)	; 㔰
+     ((=ucs		  . #x20972)	; ð ¥²
       ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (=cns11643-6	. #x2638)	; &C6-2638; [06-24]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs@unicode	  . #x5338)	; &AJ1-04307;
+      (=adobe-japan1-0	  . 04307)	; &AJ1-04307;
+      )
+     ((=big5-cdp	  . #x88AD)	; &CDP-88AD;
+      ))
+    (=ucs@iso		. #x20972)	; &U-00020972;
     ))
 (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)	; 合
+      ))
+    (sound@ja/on/go	"oN")
+    (sound@ja/on/kan	"aN")
     (=ucs		. #x533C)	; 匼
     ))
 (define-char
@@ -481,23 +1057,50 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs@jis		  . #x5338)	; &GT-03427;
-      (=jis-x0208	  . #x523E)	; &GT-03427; [50-30]
-      (=cns11643-3	  . #x2129)	; &I-C3-2129; [01-09]
-      (=jis-x0213-1	  . #x523E)	; &I-JX1-523E; [50-30]
-      (=daikanwa	  . 02672)	; &I-M-02672;
+     ((=ucs		  . #x5338)	; 匸
       )
-     ((=ucs		  . #x5408)	; 合
+     ((=ucs@unicode	  . #x5408)	; &AJ1-02041;
+      (=adobe-japan1-0	  . 02041)	; &AJ1-02041;
       ))
-    (=ucs@jis		. #x533C)	; &M-02683;
-    (=jis-x0212		. #x3433)	; &M-02683; [20-19]
+    (=ucs@jis		. #x533C)	; &AJ1-21232;
+    (=adobe-japan1-6	. 21232)	; &AJ1-21232;
+    (=jis-x0212		. #x3433)	; &I-JSP-3433; [20-19]
     (=daikanwa		. 02683)	; &I-M-02683;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x533C)	; 匼
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@jis	  . #x533C)	; &g2-AJ1-21232;
+      (==adobe-japan1-6	  . 21232)	; &g2-AJ1-21232;
+      (==jis-x0212	  . #x3433)	; &g2-AJ1-21232; [20-19]
+      (==daikanwa	  . 02683)	; &g2-AJ1-21232;
+      (->subsumptive
+       ((===daikanwa	    . 02683)	; &R-M-02683;
+	)
+       ((===jis-x0212	    . #x3433)	; &R-JSP-3433; [20-19]
+	)
+       ((===adobe-japan1-6  . 21232)	; &R-AJ1-21232;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (hanyu-dazidian	1 85 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
+      )
+     ((=ucs		  . #x599F)	; 妟
+      ))
+    (sound@ja/on/go	"oN")
+    (sound@ja/on/kan	"eN")
     (=ucs		. #x533D)	; 匽
     (=big5		. #xCDF4)	; &I-B-CDF4;
     ))
@@ -516,39 +1119,42 @@
       )
      ((=ucs		  . #x599F)	; 妟
       ))
-    (=>>ucs@cns		. #x533D)	; &G-CU+533D;
+    (=ucs@cns		. #x533D)	; &C2-2936;
+    (=cns11643-2	. #x2936)	; &C2-2936; [09-22]
+    (=daikanwa		. 02684)	; &I-M-02684;
+    (<-ancient
+     ((=ucs@unicode	  . #x5043)	; &AJ1-04169;
+      (=adobe-japan1-0	  . 04169)	; &AJ1-04169;
+      ))
+    (<-interchangeable
+     ((=ucs@unicode	  . #x5043)	; &AJ1-04169;
+      (=adobe-japan1-0	  . 04169)	; &AJ1-04169;
+      (=daikanwa	  . 00830)	; &I-M-00830;
+      )
+     ((=ucs@unicode	  . #x8758)	; &MJ023570;
+      (=mj		  . 023570)	; &MJ023570;
+      (=daikanwa	  . 33268)	; &I-M-33268;
+      ))
+    (<-interchangeable$_1*sources
+     shuowen-tongxun-dingsheng hanshu-zhu daikanwa)
+    (<-interchangeable$_2*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (->formed
+     ((=ucs@unicode	  . #x5830)	; &AJ1-01283;
+      (=adobe-japan1-0	  . 01283)	; &AJ1-01283;
+      (=daikanwa	  . 05274)	; &I-M-05274;
+      ))
+    (->formed$_1*sources
+     zhengzitong daikanwa)
+    (->formed*sources
+     zhengzitong daikanwa)
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
-	)
-       ((=ucs@jis	    . #x5338)	; &GT-03427;
-	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
-	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
-	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
-	(=daikanwa	    . 02672)	; &I-M-02672;
-	)
-       ((=ucs@unicode	    . #x599F)	; &CDP-8DD2;
-	(=jis-x0212	    . #x392E)	; &CDP-8DD2; [25-14]
-	(=jis-x0213-2	    . #x254B)	; &I-JX2-254B; [05-43]
-	(=daikanwa	    . 06099)	; &I-M-06099;
-	))
-      (=daikanwa	  . 02684)	; &M-02684;
+     ((==daikanwa	  . 02684)	; &g2-M-02684;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
-	)
-       ((=ucs@jis	    . #x5338)	; &GT-03427;
-	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
-	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
-	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
-	(=daikanwa	    . 02672)	; &I-M-02672;
-	)
-       ((=cns11643-3	    . #x2551)	; &C3-2551; [05-49]
-	))
-      (=ucs@cns		  . #x533D)	; &C2-2936;
-      (=cns11643-2	  . #x2936)	; &C2-2936; [09-22]
+     ((==ucs@cns	  . #x533D)	; &g2-CU+533D;
+      (==cns11643-2	  . #x2936)	; &g2-CU+533D; [09-22]
       ))
     ))
 (define-char
@@ -566,23 +1172,29 @@
       )
      ((=ucs		  . #x599F)	; 妟
       ))
-    (=>>ucs@unicode	. #x533D)	; &G-UU+533D;
+    (=ucs@unicode	. #x533D)	; &AJ1-19206;
+    (=adobe-japan1-5	. 19206)	; &AJ1-19206;
+    (=jis-x0212		. #x3434)	; &I-JSP-3434; [20-20]
+    (=jef-china3	. #x45BA)	; &I-JC3-45BA;
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
+     ((=decomposition@cid
+       ((=ucs		    . #x533D)	; 匽
 	)
-       ((=ucs		    . #x531A)	; 匚
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x533D)	; &g2-AJ1-19206;
+      (==adobe-japan1-5	  . 19206)	; &g2-AJ1-19206;
+      (==jis-x0212	  . #x3434)	; &g2-AJ1-19206; [20-20]
+      (==jef-china3	  . #x45BA)	; &g2-AJ1-19206;
+      (->subsumptive
+       ((===jis-x0212	    . #x3434)	; &R-JSP-3434; [20-20]
+	)
+       ((===adobe-japan1-5  . 19206)	; &R-AJ1-19206;
+	)
+       ((===jef-china3	    . #x45BA)	; &R-JC3-45BA;
 	)
-       ((=ucs@unicode	    . #x599F)	; &CDP-8DD2;
-	(=jis-x0212	    . #x392E)	; &CDP-8DD2; [25-14]
-	(=jis-x0213-2	    . #x254B)	; &I-JX2-254B; [05-43]
-	(=daikanwa	    . 06099)	; &I-M-06099;
+       ((===ucs@unicode	    . #x533D)	; &R-UU+533D;
 	))
-      (=ucs@unicode	  . #x533D)	; &AJ1-19206;
-      (=jis-x0212	  . #x3434)	; &AJ1-19206; [20-20]
-      (=jef-china3	  . #x45BA)	; &I-JC3-45BA;
-      (=adobe-japan1-5	  . 19206)	; &I-AJ1-19206;
       ))
     ))
 (define-char
@@ -633,8 +1245,61 @@
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4491)	; 䒑
+      )
+     ((=ucs-itaiji-001	  . #x3829)	; &U-i001+3829;
+      ))
+    (=ucs		. #x2D15F)	; 𭅟
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2D15F)	; 𭅟
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs@unicode	  . #x4491)	; &AJ1-18467;
+      (=adobe-japan1-5	  . 18467)	; &AJ1-18467;
+      )
+     ((=ucs-itaiji-001	  . #x3829)	; &U-i001+3829;
+      ))
+    (=ucs@JP/hanazono	. #x2D15F)	; &MJ059395;
+    (=mj		. 059395)	; &MJ059395;
+    (<-formed
+     ((=ucs@unicode	  . #x8352)	; &MJ021897;
+      (=mj		  . 021897)	; &MJ021897;
+      ))
+    (<-formed*sources
+     mj)
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2D15F)	; &g2-MJ059395;
+      (==mj		  . 059395)	; &g2-MJ059395;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 23)	; ⼖
     (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		  . #x864E)	; 虎
+      ))
+    (sound@ja/on	"tei")
     (=ucs		. #x20976)	; 𠥶
     ))
 (define-char
@@ -665,50 +1330,69 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #x5338)	; 匸
+     ((=ucs@unicode	  . #x5338)	; &AJ1-04307;
+      (=adobe-japan1-0	  . 04307)	; &AJ1-04307;
       )
-     ((=>>ucs@jis	  . #x864E)	; &G-JU+864E;
-      ))
-    (=>>ucs@iso		. #x20976)	; &G-IU+20976;
+     ((=ucs@cns		  . #x864E)	; &MJ023272;
+      (=ucs@jis		  . #x864E)	; &MJ023272;
+      (=ucs@ks		  . #x864E)	; &MJ023272;
+      (=mj		  . 023272)	; &MJ023272;
+      ))
+    (=ucs@iso		. #x20976)	; &GT-03445;
+    (=cns11643-6	. #x3564)	; &GT-03445; [21-68]
+    (=gt		. 03445)	; &I-GT-03445;
+    (=gt-pj-2		. #x4828)	; &I-GT-03445; [40-08]
+    (=daikanwa		. 02688)	; &I-M-02688;
+    (<-vulgar
+     ((=ucs@cns		  . #x3538)	; &MJ000274;
+      (=mj		  . 000274)	; &MJ000274;
+      (=daikanwa	  . 02692)	; &I-M-02692;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
+     ((==gt		  . 03445)	; &g2-GT-03445;
+      (==daikanwa	  . 02688)	; &g2-GT-03445;
+      (->subsumptive
+       ((===daikanwa	    . 02688)	; &R-M-02688;
 	)
-       ((=ucs@jis	    . #x5338)	; &GT-03427;
-	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
-	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
-	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
-	(=daikanwa	    . 02672)	; &I-M-02672;
-	)
-       ((=ucs@jis	    . #x864E)	; &GT-44178;
-	(=jis-x0208	    . #x3857)	; &GT-44178; [24-55]
-	(=ks-x1001	    . #x7B5B)	; &I-K0-7B5B; [91-59]
-	(=jis-x0213-1	    . #x3857)	; &I-JX1-3857; [24-55]
-	(=daikanwa	    . 32675)	; &I-M-32675;
+       ((===gt		    . 03445)	; &R-GT-03445;
 	))
-      (=daikanwa	  . 02688)	; &M-02688;
       )
-     ((=gt		  . 03445)	; &GT-03445;
-      (=gt-pj-2		  . #x4828)	; &GT-03445; [40-08]
+     ((==ucs@iso	  . #x20976)	; &g2-IU-00020976;
+      )
+     ((==ucs@cns	  . #x20976)	; &g2-CU+20976;
+      (==cns11643-6	  . #x3564)	; &g2-CU+20976; [21-68]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iso	  . #x20976)	; &A-IU+20976;
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs@iso		  . #x20976)	; &U-00020976;
+     ((=ucs-var-002	  . #x5338)	; &U-v002+5338;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
-	)
-       ((=ucs@jis	    . #x5338)	; &GT-03427;
-	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
-	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
-	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
-	(=daikanwa	    . 02672)	; &I-M-02672;
-	)
-       ((=ucs@cns	    . #x864E)	; &C1-4F4D;
-	(=cns11643-1	    . #x4F4D)	; &C1-4F4D; [47-45]
-	))
-      (=ucs@cns		  . #x20976)	; &C6-3564;
-      (=cns11643-6	  . #x3564)	; &C6-3564; [21-68]
+     ((=ucs@cns		  . #x864E)	; &MJ023272;
+      (=ucs@jis		  . #x864E)	; &MJ023272;
+      (=ucs@ks		  . #x864E)	; &MJ023272;
+      (=mj		  . 023272)	; &MJ023272;
+      ))
+    (=mj		. 031717)	; &MJ031717;
+    (=koseki		. 030720)	; &MJ031717;
+    (<-formed
+     ((=koseki		  . 030900)	; &KOSEKI-030900;
+      ))
+    (<-formed$_1*sources
+     koseki)
+    (->subsumptive
+     ((==mj		  . 031717)	; &g2-MJ031717;
+      (==koseki		  . 030720)	; &g2-MJ031717;
       ))
     ))
 (define-char
@@ -752,11 +1436,11 @@
       )
      ((=ucs		  . #x6241)	; 扁
       ))
-    (=>ucs@JP		. #x533E)	; &o-JU+533E;
+    (=>ucs@cns		. #x533E)	; &A-CU+533E;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@JP		  . #x533E)	; &o-JU+533E;
+     ((=>ucs@cns	  . #x533E)	; &A-CU+533E;
       ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
@@ -767,40 +1451,100 @@
       )
      ((=ucs		  . #x5338)	; 匸
       )
-     ((=ucs@jis/2004	  . #x6241)	; &GT-14816;
-      (=ks-x1001	  . #x7837)	; &GT-14816; [88-23]
-      (=cns11643-1	  . #x5137)	; &I-C1-5137; [49-23]
-      (=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
-      (=daikanwa	  . 11724)	; &I-M-11724;
-      ))
-    (=>>ucs@jis		. #x533E)	; &G-GT-03448;
-    (=>>gt		. 03448)	; &G-GT-03448;
+     ((=ucs@cns		  . #x6241)	; &MJ012121;
+      (=ucs@jis/2004	  . #x6241)	; &MJ012121;
+      (=ucs@ks		  . #x6241)	; &MJ012121;
+      (=mj		  . 012121)	; &MJ012121;
+      ))
+    (=ucs@cns		. #x533E)	; &MJ007827;
+    (=ucs@jis		. #x533E)	; &MJ007827;
+    (=mj		. 007827)	; &MJ007827;
+    (=adobe-japan1-4	. 14366)	; &I-AJ1-14366;
+    (=jis-x0212		. #x3435)	; &I-JSP-3435; [20-21]
+    (=cns11643-1	. #x5935)	; &I-C1-5935; [57-21]
+    (=jis-x0213-2	. #x2350)	; &I-JX2-2350; [03-48]
+    (=hanyo-denshi/jb	. #x3435)	; &I-HD-JB-3435; [20-21]
+    (=hanyo-denshi/ks	. 030840)	; &MJ007827;
+    (=gt		. 03448)	; &I-GT-03448;
+    (=gt-k		. 08389)	; &I-GT-K08389;
+    (=gt-pj-2		. #x4829)	; &I-GT-03448; [40-09]
+    (=daikanwa		. 02689)	; &I-M-02689;
     (->subsumptive
-     ((ideographic-structure
+     ((=decomposition@cid
+       ((=ucs		    . #x533E)	; 匾
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (=decomposition@hanyo-denshi
+       ((=ucs		    . #x533E)	; 匾
+	)
+       ((=ucs		    . #xE0101)	; 󠄁
+	))
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
 	(=ucs		    . #x2FF7)	; â¿·
 	)
-       ((=ucs@jis	    . #x5338)	; &GT-03427;
-	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
-	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
-	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
-	(=daikanwa	    . 02672)	; &I-M-02672;
-	)
-       ((=ucs@jis/2004	    . #x6241)	; &GT-14816;
-	(=ks-x1001	    . #x7837)	; &GT-14816; [88-23]
-	(=cns11643-1	    . #x5137)	; &I-C1-5137; [49-23]
-	(=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
-	(=daikanwa	    . 11724)	; &I-M-11724;
+       ((==ucs@cns	    . #x5338)	; &g2-AJ1-04307;
+	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
+	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
+	)
+       ((==ucs@cns	    . #x6241)	; &g2-MJ012121;
+	(==ucs@jis/2004	    . #x6241)	; &g2-MJ012121;
+	(==ucs@ks	    . #x6241)	; &g2-MJ012121;
+	(==mj		    . 012121)	; &g2-MJ012121;
+	))
+      (==ucs@cns	  . #x533E)	; &g2-MJ007827;
+      (==ucs@jis	  . #x533E)	; &g2-MJ007827;
+      (==mj		  . 007827)	; &g2-MJ007827;
+      (==adobe-japan1-4	  . 14366)	; &g2-MJ007827;
+      (==jis-x0212	  . #x3435)	; &g2-MJ007827; [20-21]
+      (==cns11643-1	  . #x5935)	; &g2-MJ007827; [57-21]
+      (==jis-x0213-2	  . #x2350)	; &g2-MJ007827; [03-48]
+      (==hanyo-denshi/jb  . #x3435)	; &g2-MJ007827; [20-21]
+      (==gt		  . 03448)	; &g2-MJ007827;
+      (==gt-k		  . 08389)	; &g2-MJ007827;
+      (==daikanwa	  . 02689)	; &g2-MJ007827;
+      (->subsumptive
+       ((===daikanwa	    . 02689)	; &R-M-02689;
+	)
+       ((===jis-x0212	    . #x3435)	; &R-HD-JB-3435; [20-21]
+	(===jis-x0213-2	    . #x2350)	; &R-HD-JB-3435; [03-48]
+	(===hanyo-denshi/jb . #x3435)	; &R-HD-JB-3435; [20-21]
+	)
+       ((===adobe-japan1-4  . 14366)	; &R-AJ1-14366;
+	)
+       ((===mj		    . 007827)	; &R-MJ007827;
+	)
+       ((===cns11643-1	    . #x5935)	; &R-C1-5935; [57-21]
+	)
+       ((===gt		    . 03448)	; &R-GT-03448;
+	(===gt-k	    . 08389)	; &R-GT-03448;
 	))
-      (=ucs@jis		  . #x533E)	; &M-02689;
-      (=jis-x0212	  . #x3435)	; &M-02689; [20-21]
-      (=cns11643-1	  . #x5935)	; &I-C1-5935; [57-21]
-      (=jis-x0213-2	  . #x2350)	; &I-JX2-2350; [03-48]
-      (=daikanwa	  . 02689)	; &I-M-02689;
       )
-     ((=gt		  . 03448)	; &GT-03448;
-      (=gt-k		  . 08389)	; &I-GT-K08389;
-      (=gt-pj-2		  . #x4829)	; &GT-03448; [40-09]
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x533E)	; 匾
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((==ucs@unicode	    . #x5338)	; &g2-UU+5338;
+	)
+       ((==ucs@cns	    . #x6241)	; &g2-MJ012121;
+	(==ucs@jis/2004	    . #x6241)	; &g2-MJ012121;
+	(==ucs@ks	    . #x6241)	; &g2-MJ012121;
+	(==mj		    . 012121)	; &g2-MJ012121;
+	))
+      (=mj		  . 007828)	; &MJ007828;
+      (==hanyo-denshi/ks  . 030840)	; &MJ007828;
+      (->subsumptive
+       ((===hanyo-denshi/ks . 030840)	; &R-HD-KS-030840;
+	(=hanyo-denshi/ks/mf . #x0C0C)	; &R-HD-KS-030840;
+	)
+       ((===mj		    . 007828)	; &R-MJ007828;
+	))
       ))
     ))
 (define-char
@@ -833,11 +1577,10 @@
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs@jis/2004	  . #x6241)	; &GT-14816;
-      (=ks-x1001	  . #x7837)	; &GT-14816; [88-23]
-      (=cns11643-1	  . #x5137)	; &I-C1-5137; [49-23]
-      (=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
-      (=daikanwa	  . 11724)	; &I-M-11724;
+     ((=ucs@cns		  . #x6241)	; &MJ012121;
+      (=ucs@jis/2004	  . #x6241)	; &MJ012121;
+      (=ucs@ks		  . #x6241)	; &MJ012121;
+      (=mj		  . 012121)	; &MJ012121;
       ))
     (=jef-china3	. #x45BB)	; &JC3-45BB;
     ))
@@ -854,11 +1597,25 @@
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs@unicode	  . #x6241)	; &G0-3162;
-      (=gb2312		  . #x3162)	; &G0-3162; [17-66]
+     ((=ucs@unicode	  . #x6241)	; &MJ012122;
+      (=mj		  . 012122)	; &MJ012122;
       ))
     (=ucs@unicode	. #x533E)	; &G0-5852;
+    (=ucs@JP/hanazono	. nil)
     (=gb2312		. #x5852)	; &G0-5852; [56-50]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((=ucs		    . #x531A)	; 匚
+	)
+       ((==ucs@unicode	    . #x6241)	; &g2-UU+6241;
+	))
+      (==ucs@unicode	  . #x533E)	; &g2-UU+533E;
+      (==ucs@JP/hanazono  . nil)
+      (==gb2312		  . #x5852)	; &g2-UU+533E; [56-50]
+      ))
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
@@ -881,11 +1638,11 @@
       )
      ((=ucs		  . #x82E5)	; 若
       ))
-    (=>ucs@cns		. #x533F)	; &A-CU+533F;
+    (=+>ucs@cns		. #x533F)	; &o-CU+533F;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@cns	  . #x533F)	; &A-CU+533F;
+     ((=+>ucs@cns	  . #x533F)	; &o-CU+533F;
       ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
@@ -894,22 +1651,100 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs@jis		  . #x5338)	; &GT-03427;
-      (=jis-x0208	  . #x523E)	; &GT-03427; [50-30]
-      (=cns11643-3	  . #x2129)	; &I-C3-2129; [01-09]
-      (=jis-x0213-1	  . #x523E)	; &I-JX1-523E; [50-30]
-      (=daikanwa	  . 02672)	; &I-M-02672;
+     ((=ucs		  . #x5338)	; 匸
       )
-     ((=cns11643-1	  . #x533C)	; &GT-40124; [51-28]
+     ((=ucs@cns		  . #x82E5)	; &GT-40124;
+      (=cns11643-1	  . #x533C)	; &GT-40124; [51-28]
       (=daikanwa	  . 30796)	; &I-M-30796;
       ))
-    (=ucs@cns		. #x533F)	; &GT-03447;
-    (=cns11643-1	. #x5933)	; &GT-03447; [57-19]
+    (=ucs@cns		. #x533F)	; &MJ007831;
+    (=mj		. 007831)	; &MJ007831;
+    (=cns11643-1	. #x5933)	; &I-C1-5933; [57-19]
+    (=hanyo-denshi/ks	. 030800)	; &MJ007831;
     (=gt		. 03447)	; &I-GT-03447;
     (=gt-k		. 07990)	; &I-GT-K07990;
     (=gt-pj-2		. #x482A)	; &I-GT-03447; [40-10]
     (=daikanwa		. 02690)	; &I-M-02690;
-    (=shinjigen		.  0807)	; &GT-03447;
+    (=shinjigen		.  0807)	; &MJ007831;
+    (->subsumptive
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x533F)	; 匿
+	)
+       ((=ucs		    . #xE0103)	; 󠄃
+	))
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((==ucs@cns	    . #x5338)	; &g2-AJ1-04307;
+	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
+	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
+	)
+       ((==ucs@cns	    . #x82E5)	; &g2-GT-40124;
+	(==daikanwa	    . 30796)	; &g2-GT-40124;
+	))
+      (==ucs@cns	  . #x533F)	; &g2-MJ007831;
+      (==mj		  . 007831)	; &g2-MJ007831;
+      (==cns11643-1	  . #x5933)	; &g2-MJ007831; [57-19]
+      (==hanyo-denshi/ks  . 030800)	; &g2-MJ007831;
+      (==gt		  . 03447)	; &g2-MJ007831;
+      (==gt-k		  . 07990)	; &g2-MJ007831;
+      (==daikanwa	  . 02690)	; &g2-MJ007831;
+      (==shinjigen	  .  0807)	; &g2-MJ007831;
+      (->subsumptive
+       ((===daikanwa	    . 02690)	; &R-M-02690;
+	)
+       ((===hanyo-denshi/ks . 030800)	; &R-HD-KS-030800;
+	(=hanyo-denshi/ks/mf . #x0C08)	; &R-HD-KS-030800;
+	)
+       ((===mj		    . 007831)	; &R-MJ007831;
+	)
+       ((===cns11643-1	    . #x5933)	; &R-C1-5933; [57-19]
+	)
+       ((===gt		    . 03447)	; &R-GT-03447;
+	(===gt-k	    . 07990)	; &R-GT-03447;
+	))
+      )
+     ((===hng-kar	  . 00510)	; &HNG018-00510;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=+>ucs@cns	  . #x533F)	; &o-CU+533F;
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x5338)	; 匸
+      )
+     ((=ucs		  . #x2F998)	; 若
+      ))
+    (=adobe-japan1-5	. 20087)	; &AJ1-20087;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x533F)	; 匿
+	)
+       ((=ucs		    . #xE0101)	; 󠄁
+	))
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((==ucs@cns	    . #x5338)	; &g2-AJ1-04307;
+	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
+	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
+	)
+       ((==ucs@iso	    . #x2F998)	; &g2-MJ021677;
+	(==ucs@unicode	    . #x82E5)	; &g2-MJ021677;
+	(==ucs@cns	    . #x2F998)	; &g2-MJ021677;
+	(==mj		    . 021677)	; &g2-MJ021677;
+	))
+      (==adobe-japan1-5	  . 20087)	; &g2-AJ1-20087;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -924,12 +1759,34 @@
       )
      ((=ucs		  . #x82E5)	; 若
       ))
-    (=>ucs@unicode	. #x533F)	; &o-J0-463F;
-    (=>jis-x0208@usual	. #x463F)	; &o-J0-463F; [38-31]
+    (=+>ucs@unicode	. #x533F)	; &o-J0-463F;
+    (=+>jis-x0208	. #x463F)	; &o-J0-463F; [38-31]
+    (=+>jis-x0213-1	. #x463F)	; &o-J0-463F; [38-31]
+    ))
+(define-char
+  '((<-denotational
+     ((=+>ucs@unicode	  . #x533F)	; &o-J0-463F;
+      (=+>jis-x0208	  . #x463F)	; &o-J0-463F; [38-31]
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@cns		  . #x82E5)	; &GT-40124;
+      (=cns11643-1	  . #x533C)	; &GT-40124; [51-28]
+      (=daikanwa	  . 30796)	; &I-M-30796;
+      ))
+    (=ucs-var-001	. #x533F)	; &U-v001+533F;
     ))
 (define-char
   '((<-denotational
-     ((=>jis-x0208@usual  . #x463F)	; &o-J0-463F; [38-31]
+     ((=+>ucs@unicode	  . #x533F)	; &o-J0-463F;
+      (=+>jis-x0208	  . #x463F)	; &o-J0-463F; [38-31]
       ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 8)
@@ -942,23 +1799,89 @@
       )
      ((=ucs		  . #x2F998)	; 若
       ))
-    (=>>ucs@unicode	. #x533F)	; &GT-03370;
-    (=ucs@unicode	. #x533F)	; &GT-03370;
-    (=jis-x0208		. #x463F)	; &GT-03370; [38-31]
+    (=ucs@unicode	. #x533F)	; &MJ007830;
+    (=mj		. 007830)	; &MJ007830;
+    (=adobe-japan1-0	. 03223)	; &I-AJ1-03223;
+    (=jis-x0208		. #x463F)	; &I-J90-463F; [38-31]
     (=gb2312		. #x4464)	; &I-G0-4464; [36-68]
     (=ks-x1001		. #x527B)	; &I-K0-527B; [50-91]
     (=jis-x0213-1	. #x463F)	; &I-JX1-463F; [38-31]
+    (=hanyo-denshi/ja	. #x463F)	; &I-HD-JA-463F; [38-31]
     (=gt		. 03370)	; &I-GT-03370;
     (=gt-k		. 06521)	; &I-GT-K06521;
     (=gt-pj-1		. #x463F)	; &I-GT-03370; [38-31]
-    (=shinjigen		.  0806)	; &GT-03370;
-    (=hanyo-denshi/ja	. #x463F)	; &I-HD-JA-463F; [38-31]
+    (=shinjigen		.  0806)	; &MJ007830;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x533F)	; 匿
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (=decomposition@hanyo-denshi
+       ((=ucs		    . #x533F)	; 匿
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((==ucs@unicode	    . #x531A)	; &g2-AJ1-04302;
+	(==adobe-japan1-0   . 04302)	; &g2-AJ1-04302;
+	)
+       ((==ucs@iso	    . #x2F998)	; &g2-MJ021677;
+	(==ucs@unicode	    . #x82E5)	; &g2-MJ021677;
+	(==ucs@cns	    . #x2F998)	; &g2-MJ021677;
+	(==mj		    . 021677)	; &g2-MJ021677;
+	))
+      (==ucs@unicode	  . #x533F)	; &g2-MJ007830;
+      (==mj		  . 007830)	; &g2-MJ007830;
+      (==adobe-japan1-0	  . 03223)	; &g2-MJ007830;
+      (==gb2312		  . #x4464)	; &g2-MJ007830; [36-68]
+      (==ks-x1001	  . #x527B)	; &g2-MJ007830; [50-91]
+      (==jis-x0208	  . #x463F)	; &g2-MJ007830; [38-31]
+      (==jis-x0213-1	  . #x463F)	; &g2-MJ007830; [38-31]
+      (==hanyo-denshi/ja  . #x463F)	; &g2-MJ007830; [38-31]
+      (==gt		  . 03370)	; &g2-MJ007830;
+      (==gt-k		  . 06521)	; &g2-MJ007830;
+      (==shinjigen	  .  0806)	; &g2-MJ007830;
+      (->subsumptive
+       ((===jis-x0208	    . #x463F)	; &R-J0-463F; [38-31]
+	(===jis-x0213-1	    . #x463F)	; &R-J0-463F; [38-31]
+	)
+       ((===adobe-japan1-0  . 03223)	; &R-AJ1-03223;
+	)
+       ((===mj		    . 007830)	; &R-MJ007830;
+	)
+       ((===gt		    . 03370)	; &R-GT-03370;
+	(===gt-k	    . 06521)	; &R-GT-03370;
+	)
+       ((===ucs@ks	    . #x533F)	; &R-K0-527B;
+	(===ks-x1001	    . #x527B)	; &R-K0-527B; [50-91]
+	)
+       ((===ucs@unicode	    . #x533F)	; &R-UU+533F;
+	))
+      ))
     ))
 (define-char
-  '((ideographic-radical . 23)	; ⼖
+  '((<-denotational@usage
+     ((==>ucs@bucs	  . #x5340)	; &BUCS+5340;
+      ))
+    (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 87 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@iwds-1	  . #x54C1)	; &A-IWDSU+54C1;
+      ))
+    (sound@ja/on/go	"ku" "u" "ku" "ku")
+    (sound@ja/on/kan	"ku" "ou" "kou" "kIu")
     (=ucs		. #x5340)	; 區
     (=>jis-x0208	. #x523F)	; 區 [50-31]
     (=>jis-x0213-1	. #x523F)	; 區 [50-31]
@@ -979,33 +1902,75 @@
       )
      ((=ucs		  . #x54C1)	; 品
       ))
+    (=ucs@cns		. #x5340)	; &MJ007833;
+    (=mj		. 007833)	; &MJ007833;
+    (=adobe-japan1-4	. 13524)	; &I-AJ1-13524;
+    (=jis-x0208@1978	. #x523F)	; &I-J78-523F; [50-31]
+    (=jis-x0208@1983	. #x523F)	; &I-J83-523F; [50-31]
+    (=cns11643-1	. #x5934)	; &I-C1-5934; [57-20]
+    (=hanyo-denshi/ks	. 030850)	; &MJ007833;
+    (=daikanwa		. 02691)	; &I-M-02691;
+    (=daijiten		. 00984)	; &I-DJT-00984;
+    (=shinjigen		.  0802)	; &MJ007833;
+    (<-formed
+     ((=ucs		  . #x53E5)	; 句
+      ))
+    (<-formed$_1*sources
+     jiyun)
+    (<-interchangeable
+     ((=ucs		  . #x53E5)	; 句
+      (=daikanwa	  . 03234)	; &I-M-03234;
+      )
+     ((=ucs		  . #x4E18)	; 丘
+      (=daikanwa	  . 00033)	; &I-M-00033;
+      ))
+    (<-interchangeable$_1*sources
+     shuowen-zhu jiyun daikanwa)
+    (<-interchangeable$_2*sources
+     yunhai daikanwa)
+    (<-interchangeable*sources
+     daikanwa)
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x5340)	; 區
+	)
+       ((=ucs		    . #xE0103)	; 󠄃
+	))
+      (==ucs@cns	  . #x5340)	; &g2-MJ007833;
+      (==mj		  . 007833)	; &g2-MJ007833;
+      (==cns11643-1	  . #x5934)	; &g2-MJ007833; [57-20]
+      (==hanyo-denshi/ks  . 030850)	; &g2-MJ007833;
+      (==daikanwa	  . 02691)	; &g2-MJ007833;
+      (==shinjigen	  .  0802)	; &g2-MJ007833;
+      (->subsumptive
+       ((===daikanwa	    . 02691)	; &R-M-02691;
+	)
+       ((===hanyo-denshi/ks . 030850)	; &R-HD-KS-030850;
+	(=hanyo-denshi/ks/mf . #x0C0D)	; &R-HD-KS-030850;
 	)
-       ((=ucs@jis	    . #x5338)	; &GT-03427;
-	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
-	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
-	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
-	(=daikanwa	    . 02672)	; &I-M-02672;
+       ((===mj		    . 007833)	; &R-MJ007833;
 	)
-       ((=ucs		    . #x54C1)	; 品
+       ((===cns11643-1	    . #x5934)	; &R-C1-5934; [57-20]
 	))
-      (=cns11643-1	  . #x5934)	; &M-02691; [57-20]
-      (=daikanwa	  . 02691)	; &I-M-02691;
-      (=shinjigen	  .  0802)	; &M-02691;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
+     ((=decomposition@cid
+       ((=ucs		    . #x5340)	; 區
+	)
+       ((=ucs		    . #xE0101)	; 󠄁
+	))
+      (==adobe-japan1-4	  . 13524)	; &g2-AJ1-13524;
+      (==jis-x0208@1978	  . #x523F)	; &g2-AJ1-13524; [50-31]
+      (==jis-x0208@1983	  . #x523F)	; &g2-AJ1-13524; [50-31]
+      (==daijiten	  . 00984)	; &g2-AJ1-13524;
+      (->subsumptive
+       ((===daijiten	    . 00984)	; &R-DJT-00984;
 	)
-       ((=ucs@unicode	    . #x5338)	; &UU+5338;
+       ((===adobe-japan1-4  . 13524)	; &R-AJ1-13524;
 	)
-       ((=ucs		    . #x54C1)	; 品
+       ((===jis-x0208@1978  . #x523F)	; &R-J78-523F; [50-31]
+	)
+       ((===jis-x0208@1983  . #x523F)	; &R-J83-523F; [50-31]
 	))
-      (=jis-x0208@1978	  . #x523F)	; &J83-523F; [50-31]
-      (=jis-x0208@1983	  . #x523F)	; &I-J83-523F; [50-31]
       ))
     ))
 (define-char
@@ -1013,6 +1978,23 @@
      ((=ucs		  . #x5340)	; 區
       ))
     (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x5338)	; 匸
+      )
+     ((=ucs		  . #x20BEE)	; 𠯮
+      ))
+    (=daijiten		. 00981)	; &DJT-00981;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5340)	; 區
+      ))
+    (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (ideographic-structure
@@ -1023,34 +2005,120 @@
       )
      ((=ucs		  . #x54C1)	; 品
       ))
-    (=ucs@unicode	. #x5340)	; &GT-03378;
-    (=ks-x1001		. #x4F21)	; &GT-03378; [47-01]
+    (=ucs@unicode	. #x5340)	; &MJ007832;
+    (=mj		. 007832)	; &MJ007832;
+    (=adobe-japan1-0	. 04308)	; &I-AJ1-04308;
+    (=ks-x1001		. #x4F21)	; &I-K0-4F21; [47-01]
     (=jis-x0208@1990	. #x523F)	; &I-J90-523F; [50-31]
     (=jis-x0213-1	. #x523F)	; &I-JX1-523F; [50-31]
-    (=gb12345		. #x4778)	; &GT-03378; [39-88]
+    (=gb12345		. #x4778)	; &MJ007832; [39-88]
+    (=hanyo-denshi/ja	. #x523F)	; &I-HD-JA-523F; [50-31]
     (=gt		. 03378)	; &I-GT-03378;
     (=gt-k		. 07911)	; &I-GT-K07911;
     (=gt-pj-1		. #x523F)	; &I-GT-03378; [50-31]
-    (=hanyo-denshi/ja	. #x523F)	; &I-HD-JA-523F; [50-31]
+    (=daijiten		. 00965)	; &I-DJT-00965;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5340)	; 區
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (=decomposition@hanyo-denshi
+       ((=ucs		    . #x5340)	; 區
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (==ucs@unicode	  . #x5340)	; &g2-MJ007832;
+      (==mj		  . 007832)	; &g2-MJ007832;
+      (==adobe-japan1-0	  . 04308)	; &g2-MJ007832;
+      (==ks-x1001	  . #x4F21)	; &g2-MJ007832; [47-01]
+      (==jis-x0208@1990	  . #x523F)	; &g2-MJ007832; [50-31]
+      (==jis-x0213-1	  . #x523F)	; &g2-MJ007832; [50-31]
+      (==gb12345	  . #x4778)	; &g2-MJ007832; [39-88]
+      (==hanyo-denshi/ja  . #x523F)	; &g2-MJ007832; [50-31]
+      (==gt		  . 03378)	; &g2-MJ007832;
+      (==gt-k		  . 07911)	; &g2-MJ007832;
+      (==daijiten	  . 00965)	; &g2-MJ007832;
+      (->subsumptive
+       ((===daijiten	    . 00965)	; &R-DJT-00965;
+	)
+       ((===jis-x0208@1990  . #x523F)	; &R-J90-523F; [50-31]
+	(===jis-x0213-1	    . #x523F)	; &R-J90-523F; [50-31]
+	)
+       ((===adobe-japan1-0  . 04308)	; &R-AJ1-04308;
+	)
+       ((===mj		    . 007832)	; &R-MJ007832;
+	)
+       ((===gt		    . 03378)	; &R-GT-03378;
+	(===gt-k	    . 07911)	; &R-GT-03378;
+	)
+       ((===ucs@ks	    . #x5340)	; &R-K0-4F21;
+	(===ks-x1001	    . #x4F21)	; &R-K0-4F21; [47-01]
+	)
+       ((===ucs@unicode	    . #x5340)	; &R-UU+5340;
+	)
+       ((===hng-kar	    . 00500)	; &HNG018-00500;
+	))
+      ))
     ))
 (define-char
-  '((=>ucs		. #x3538)	; 㔸
-    (ideographic-radical . 23)	; ⼖
+  '((ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #x5338)	; 匸
+     ((=>ucs@component	  . #x531A)	; &A-compU+531A;
+      (=>iwds-1		  .  0209)	; &A-compU+531A;
       )
      ((=ucs		  . #x8652)	; 虒
       ))
-    (=cns11643-4	. #x3650)	; &M-02692; [22-48]
+    (sound@ja/on/go	"tai")
+    (sound@ja/on/kan	"tei")
+    (=ucs		. #x3538)	; 㔸
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3538)	; 㔸
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs@unicode	  . #x5338)	; &AJ1-04307;
+      (=adobe-japan1-0	  . 04307)	; &AJ1-04307;
+      )
+     ((=ucs@cns		  . #x8652)	; &JSP-5A39;
+      (=ucs@jis		  . #x8652)	; &JSP-5A39;
+      (=jis-x0212	  . #x5A39)	; &JSP-5A39; [58-25]
+      (=cns11643-2	  . #x325A)	; &I-C2-325A; [18-58]
+      (=daikanwa	  . 32682)	; &I-M-32682;
+      ))
+    (=ucs@cns		. #x3538)	; &MJ000274;
+    (=mj		. 000274)	; &MJ000274;
+    (=cns11643-4	. #x3650)	; &I-C4-3650; [22-48]
     (=daikanwa		. 02692)	; &I-M-02692;
+    (->subsumptive
+     ((==mj		  . 000274)	; &g2-MJ000274;
+      (==daikanwa	  . 02692)	; &g2-MJ000274;
+      (->subsumptive
+       ((===daikanwa	    . 02692)	; &R-M-02692;
+	)
+       ((===mj		    . 000274)	; &R-MJ000274;
+	))
+      )
+     ((==ucs@cns	  . #x3538)	; &g2-CU+3538;
+      (==cns11643-4	  . #x3650)	; &g2-CU+3538; [22-48]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	2692 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3538)	; 㔸
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
@@ -1058,27 +2126,101 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #x531A)	; 匚
+     ((=ucs-var-002	  . #x5338)	; &U-v002+5338;
       )
-     ((=ucs		  . #x8652)	; 虒
+     ((=ucs@cns		  . #x8652)	; &JSP-5A39;
+      (=ucs@jis		  . #x8652)	; &JSP-5A39;
+      (=jis-x0212	  . #x5A39)	; &JSP-5A39; [58-25]
+      (=cns11643-2	  . #x325A)	; &I-C2-325A; [18-58]
+      (=daikanwa	  . 32682)	; &I-M-32682;
       ))
-    (=ucs		. #x3538)	; 㔸
-    (=cbeta		. 00632)	; &I-CB00632;
+    (=koseki		. 030900)	; &KOSEKI-030900;
     ))
 (define-char
-  '((=>ucs		. #x20978)	; 𠥸
+  '((<-denotational
+     ((=ucs		  . #x3538)	; 㔸
+      ))
     (ideographic-radical . 23)	; ⼖
-    (ideographic-strokes . 18)
-    (total-strokes	 . 20)
-    (=daikanwa		. 02693)	; &M-02693;
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs@unicode	  . #x8652)	; &EGB-7A27;
+      (=iso-ir165	  . #x7A27)	; &EGB-7A27; [90-07]
+      ))
+    (=ucs@unicode	. #x3538)	; &CB00632;
+    (=ucs@JP/hanazono	. nil)
+    (=cbeta		. 00632)	; &CB00632;
+    (->subsumptive
+     ((==ucs@unicode	  . #x3538)	; &g2-CB00632;
+      (==ucs@JP/hanazono  . nil)
+      (==cbeta		  . 00632)	; &g2-CB00632;
+      (->subsumptive
+       ((===ucs@unicode	    . #x3538)	; &R-UU+3538;
+	)
+       ((===cbeta	    . 00632)	; &R-CB00632;
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 23)	; ⼖
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@iwds-1	  . #x81E5)	; &A-IWDSU+81E5;
+      (=>iwds-1		  .  0043)	; &A-IWDSU+81E5;
+      )
+     ((=ucs		  . #x3538)	; 㔸
+      ))
+    (sound@ja/on/go	"tai")
+    (sound@ja/on/kan	"tei")
+    (=ucs		. #x20978)	; 𠥸
     ))
 (define-char
-  '((morohashi-daikanwa	2693 0 0)
+  '((<-denotational
+     ((=ucs		  . #x20978)	; 𠥸
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 18)
     (total-strokes	 . 20)
-    (=ucs		. #x20978)	; 𠥸
-    (=cns11643-7	. #x4D45)	; &I-C7-4D45; [45-37]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x81E5)	; 臥
+      )
+     ((=ucs@cns		  . #x3538)	; &MJ000274;
+      (=mj		  . 000274)	; &MJ000274;
+      ))
+    (=ucs@iso		. #x20978)	; &C7-4D45;
+    (=cns11643-7	. #x4D45)	; &C7-4D45; [45-37]
+    (=daikanwa		. 02693)	; &I-M-02693;
+    (<-formed
+     ((=ucs@cns		  . #x4599)	; &MJ004272;
+      (=mj		  . 004272)	; &MJ004272;
+      ))
+    (<-formed$_1*sources
+     jiyun)
+    (<-same
+     ((=ucs@cns		  . #x4599)	; &MJ004272;
+      (=mj		  . 004272)	; &MJ004272;
+      (=daikanwa/+p	  . 32784)	; &MJ004272;
+      ))
+    (<-same*sources
+     jiyun daikanwa daikanwa/+p)
+    (->subsumptive
+     ((==daikanwa	  . 02693)	; &g2-M-02693;
+      )
+     ((==ucs@iso	  . #x20978)	; &g2-IU-00020978;
+      )
+     ((==ucs@cns	  . #x20978)	; &g2-CU+20978;
+      (==cns11643-7	  . #x4D45)	; &g2-CU+20978; [45-37]
+      ))
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
@@ -1088,3 +2230,8 @@
     (=cns11643-7	. #x5750)	; &I-C7-5750; [55-48]
     (=daikanwa		. 02694)	; &I-M-02694;
     ))
+(define-char
+  '((ideographic-radical . 23)	; ⼖
+    (==>ucs@bucs	. #x5340)	; &BUCS+5340;
+    (==>daijiten	. 00984)	; &BUCS+5340;
+    ))