X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R023-Hiding-Enclosure.el;h=a7166a820a91cfec35cc20d4e3e50c9f90bfdee2;hb=0f491c1083161c021800689e467902d140758cdc;hp=82499832c610cecac97bbb6deac04231cc5ca5b5;hpb=e97abcbe98e773a3aecef54d4ba2bb16991dc5d3;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index 8249983..a7166a8 100644
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -18,59 +18,68 @@
     ))
 (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 . 23)	; ⼖
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (hanyu-dazidian	1 81 4)
     (=ucs		. #x5338)	; 匸
-    (=adobe-japan1-0	. 04307)	; &I-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;
-    (=gt		. 03427)	; &I-GT-03427;
-    (=gt-k		. 00096)	; &I-GT-K00096;
-    (=gt-pj-1		. #x523E)	; &I-GT-03427; [50-30]
-    (=daikanwa		. 02672)	; &I-M-02672;
-    (=shinjigen		.  0800)	; 匸
+    (=+>jis-x0208	. #x523E)	; 匸 [50-30]
+    (=+>jis-x0213-1	. #x523E)	; 匸 [50-30]
+    (=+>adobe-japan1-0	. 04307)	; 匸
+    (=+>gt		. 03427)	; 匸
     (->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;
+     ((hanyu-dazidian	  1 81 4)
+      (=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;
+      (=gt		  . 03427)	; &I-GT-03427;
+      (=gt-k		  . 00096)	; &I-GT-K00096;
+      (=gt-pj-1		  . #x523E)	; &I-GT-03427; [50-30]
+      (=daikanwa	  . 02672)	; &I-M-02672;
+      (=shinjigen	  .  0800)	; &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]
+       ((=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;
+	  ))
 	)
-       ((===gt		    . 03427)	; &R-GT-03427;
-	(===gt-k	    . 00096)	; &R-GT-03427;
+       ((==ucs@unicode	    . #x5338)	; &g2-UU+5338;
+	(==ucs@JP/hanazono  . nil)
 	))
       )
-     ((==ucs@unicode	  . #x5338)	; &g2-UU+5338;
-      (==ucs@JP/hanazono  . nil)
+     ((=ucs-var-002	  . #x5338)	; &U-v002+5338;
       ))
     ))
 (define-char
@@ -88,6 +97,14 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x5338)	; 匸
+      )
+     ((=ucs		  . #x513F)	; 儿
+      ))
     (=+>ucs@cns		. #x5339)	; &o-AJ1-13994;
     (=big5		. #xA4C7)	; &o-AJ1-13994;
     (=+>adobe-japan1-4	. 13994)	; &o-AJ1-13994;
@@ -98,7 +115,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
 	(=ucs		    . #x2FF7)	; â¿·
 	)
-       ((=ucs		    . #x5338)	; 匸
+       ((=ucs@unicode	    . #x5338)	; &AJ1-04307;
+	(=adobe-japan1-0    . 04307)	; &AJ1-04307;
 	)
        ((=ucs		    . #x513F)	; 儿
 	))
@@ -143,11 +161,13 @@
        ((==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)	; &UU+5338;
+	 ((==ucs@unicode      . #x5338)	; &g2-UU+5338;
 	  )
 	 ((=ucs		      . #x513F)	; 儿
 	  ))
@@ -155,12 +175,23 @@
 	(==gt-k		    . 00478)	; &g2-GT-03429;
 	))
       )
-     ((=decomposition@cid
-       ((=ucs		    . #x5339)	; 匹
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
 	)
-       ((=ucs		    . #xE0101)	; 󠄁
+       ((=ucs-var-002	    . #x5338)	; &U-v002+5338;
+	)
+       ((=ucs		    . #x513F)	; 儿
 	))
       (=adobe-japan1-4	  . 13994)	; &AJ1-13994;
+      (->subsumptive
+       ((=decomposition@cid
+	 ((=ucs		      . #x5339)	; 匹
+	  )
+	 ((=ucs		      . #xE0101)	; 󠄁
+	  ))
+	(==adobe-japan1-4   . 13994)	; &g2-AJ1-13994;
+	))
       ))
     ))
 (define-char
@@ -170,16 +201,6 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (=decomposition@cid
-     ((=ucs		  . #x5339)	; 匹
-      )
-     ((=ucs		  . #xE0100)	; 󠄀
-      ))
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x5339)	; 匹
-      )
-     ((=ucs		  . #xE0102)	; 󠄂
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
@@ -200,6 +221,45 @@
     (=gt-k		. 00479)	; &I-GT-K00479;
     (=gt-pj-1		. #x4924)	; &I-GT-03328; [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)	; ⼖
@@ -314,19 +374,61 @@
      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)	; ⼖
@@ -352,18 +454,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)	; ⼖
@@ -374,7 +665,10 @@
     (=daikanwa		. 02679)	; &I-M-02679;
     ))
 (define-char
-  '((ideographic-radical . 23)	; ⼖
+  '((<-denotational
+     ((==>ucs@bucs	  . #x91AB)	; &BUCS+91AB;
+      ))
+    (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (=ucs		. #x533B)	; 医
@@ -484,19 +778,14 @@
     (=gt-pj-1		. #x3065)	; &I-GT-03344; [16-69]
     (=shinjigen		.  8537)	; &MJ007820;
     (<-simplified@CN
-     ((=ucs@unicode	  . #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]
-      (=gb12345		  . #x523D)	; &GT-53782; [50-29]
-      (=daikanwa	  . 40006)	; &I-M-40006;
+     ((=ucs@unicode	  . #x91AB)	; &MJ026547;
+      (=mj		  . 026547)	; &MJ026547;
+      (=gb12345		  . #x523D)	; &MJ026547; [50-29]
       ))
     (<-simplified@JP/Jouyou
-     ((=ucs@unicode	  . #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	  . #x91AB)	; &MJ026547;
+      (=mj		  . 026547)	; &MJ026547;
+      (=jis-x0208	  . #x6E50)	; &I-J90-6E50; [78-48]
       ))
     (->subsumptive
      ((=decomposition@cid
@@ -568,7 +857,8 @@
     (<-formed@Zetian*sources
      zihui-bu)
     (<-same
-     ((=ucs		  . #x6708)	; 月
+     ((=ucs@unicode	  . #x6708)	; &MJ013520;
+      (=mj		  . 013520)	; &MJ013520;
       (=daikanwa	  . 14330)	; &I-M-14330;
       ))
     (<-same*sources
@@ -592,6 +882,16 @@
   '((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
@@ -601,7 +901,15 @@
     (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)	; 恆
@@ -610,11 +918,14 @@
     (<-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
@@ -623,8 +934,23 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (=ucs@unicode	. #x3530)	; &UU+3530;
-    (=jef-china3	. #x45B5)	; &UU+3530;
+    (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
@@ -633,13 +959,40 @@
     (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		  . #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@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
@@ -842,6 +1195,50 @@
     ))
 (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)	; &JX2-7577;
+      (=jis-x0213-2	  . #x7577)	; &JX2-7577; [85-87]
+      (=daikanwa	  . 30640)	; &I-M-30640;
+      )
+     ((=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)
     (=ucs		. #x20976)	; 𠥶
@@ -876,14 +1273,10 @@
       )
      ((=ucs		  . #x5338)	; 匸
       )
-     ((=ucs@cns		  . #x864E)	; &GT-44178;
-      (=ucs@jis		  . #x864E)	; &GT-44178;
-      (=ucs@ks		  . #x864E)	; &GT-44178;
-      (=jis-x0208	  . #x3857)	; &GT-44178; [24-55]
-      (=ks-x1001	  . #x7B5B)	; &I-K0-7B5B; [91-59]
-      (=cns11643-1	  . #x4F4D)	; &I-C1-4F4D; [47-45]
-      (=jis-x0213-1	  . #x3857)	; &I-JX1-3857; [24-55]
-      (=daikanwa	  . 32675)	; &I-M-32675;
+     ((=ucs@cns		  . #x864E)	; &AJ1-01931;
+      (=ucs@jis		  . #x864E)	; &AJ1-01931;
+      (=ucs@ks		  . #x864E)	; &AJ1-01931;
+      (=adobe-japan1-0	  . 01931)	; &AJ1-01931;
       ))
     (=ucs@iso		. #x20976)	; &GT-03445;
     (=cns11643-6	. #x3564)	; &GT-03445; [21-68]
@@ -899,9 +1292,9 @@
 	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
 	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
 	)
-       ((==ucs@jis	    . #x864E)	; &g2-GT-44178;
-	(==ucs@ks	    . #x864E)	; &g2-GT-44178;
-	(==jis-x0208	    . #x3857)	; &g2-GT-44178; [24-55]
+       ((==ucs@jis	    . #x864E)	; &g2-AJ1-01931;
+	(==ucs@ks	    . #x864E)	; &g2-AJ1-01931;
+	(==adobe-japan1-0   . 01931)	; &g2-AJ1-01931;
 	))
       (==gt		  . 03445)	; &g2-GT-03445;
       (==daikanwa	  . 02688)	; &g2-GT-03445;
@@ -1186,7 +1579,8 @@
       )
      ((=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)	; &MJ007831;
@@ -1212,8 +1606,8 @@
 	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
 	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
 	)
-       ((=cns11643-1	    . #x533C)	; &GT-40124; [51-28]
-	(=daikanwa	    . 30796)	; &I-M-30796;
+       ((==ucs@cns	    . #x82E5)	; &g2-GT-40124;
+	(==daikanwa	    . 30796)	; &g2-GT-40124;
 	))
       (==ucs@cns	  . #x533F)	; &g2-MJ007831;
       (==mj		  . 007831)	; &g2-MJ007831;
@@ -1236,6 +1630,8 @@
        ((===gt		    . 03447)	; &R-GT-03447;
 	(===gt-k	    . 07990)	; &R-GT-03447;
 	))
+      )
+     ((===hng-kar	  . 00510)	; &HNG018-00510;
       ))
     ))
 (define-char
@@ -1268,7 +1664,10 @@
 	(==ucs@jis	    . #x5338)	; &g2-AJ1-04307;
 	(==adobe-japan1-0   . 04307)	; &g2-AJ1-04307;
 	)
-       ((=ucs		    . #x2F998)	; 若
+       ((==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;
       ))
@@ -1296,18 +1695,28 @@
       (=+>jis-x0208	  . #x463F)	; &o-J0-463F; [38-31]
       ))
     (ideographic-radical . 23)	; ⼖
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (=decomposition@cid
-     ((=ucs		  . #x533F)	; 匿
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #xE0100)	; 󠄀
-      ))
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x533F)	; 匿
+     ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs		  . #xE0102)	; 󠄂
+     ((=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
+     ((=+>ucs@unicode	  . #x533F)	; &o-J0-463F;
+      (=+>jis-x0208	  . #x463F)	; &o-J0-463F; [38-31]
       ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
@@ -1328,6 +1737,57 @@
     (=gt-k		. 06521)	; &I-GT-K06521;
     (=gt-pj-1		. #x463F)	; &I-GT-03370; [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)	; ⼖
@@ -1427,16 +1887,6 @@
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (=decomposition@cid
-     ((=ucs		  . #x5340)	; 區
-      )
-     ((=ucs		  . #xE0100)	; 󠄀
-      ))
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x5340)	; 區
-      )
-     ((=ucs		  . #xE0102)	; 󠄂
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
@@ -1456,6 +1906,46 @@
     (=gt		. 03378)	; &I-GT-03378;
     (=gt-k		. 07911)	; &I-GT-K07911;
     (=gt-pj-1		. #x523F)	; &I-GT-03378; [50-31]
+    (->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;
+      (->subsumptive
+       ((===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)	; 㔸