X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R008-Lid.el;h=6b95731a7bdcf5b507dd6a09e918d4af939c44c9;hb=2a39846bc116a8304269bd5f685decda21dd70b7;hp=7a7349c81b0cc02f6d3da19ac592161a58c95130;hpb=4a9111d21f10b1d4da94dd556e6932f396ccb85f;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index 7a7349c..6b95731 100644
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -30,21 +30,20 @@
     (sound@ja/on/go	"mAu")
     (sound@ja/on/kan	"bAu")
     (=ucs		. #x4EA1)	; 亡
+    (=big5		. #xA460)	; &I-B-A460;
     (->subsumptive
-     ((shinjigen-1	  . 90)
-      (=big5		  . #xA460)	; &M-00287;
-      (=gt-k		  . 00202)	; &I-GT-K00202;
+     ((=gt-k		  . 00202)	; &M-00287;
       (=gt-pj-k1	  . #x3343)	; &M-00287; [19-35]
       (=daikanwa	  . 00287)	; &I-M-00287;
-      (=ucs@big5	  . #x4EA1)	; &M-00287;
+      (=shinjigen@1ed	  .  0090)	; &M-00287;
       )
-     ((shinjigen-1	  . 89)
-      (shinjigen-2	  . 89)
-      (=jis-x0208	  . #x4B34)	; &GT-00378; [43-20]
+     ((=jis-x0208	  . #x4B34)	; &GT-00378; [43-20]
       (=ks-x1001	  . #x584C)	; &I-K0-584C; [56-44]
       (=gt		  . 00378)	; &I-GT-00378;
       (=gt-k		  . 00201)	; &I-GT-K00201;
       (=gt-pj-1		  . #x4B34)	; &I-GT-00378; [43-20]
+      (=shinjigen@1ed	  .  0089)	; &GT-00378;
+      (=shinjigen@rev	  .  0089)	; &GT-00378;
       (=ucs@jis		  . #x4EA1)	; &GT-00378;
       )
      ((=cns11643-1	  . #x4441)	; &C1-4441; [36-33]
@@ -70,14 +69,14 @@
 	)
        ((=ucs		    . #x51E0)	; 几
 	))
-      (shinjigen-1	  . 92)
-      (shinjigen-2	  . 92)
       (=jis-x0208	  . #x5036)	; &GT-00379; [48-22]
       (=ks-x1001	  . #x7971)	; &I-K0-7971; [89-81]
       (=gt		  . 00379)	; &I-GT-00379;
       (=gt-k		  . 00508)	; &I-GT-K00508;
       (=gt-pj-1		  . #x5036)	; &I-GT-00379; [48-22]
       (=daikanwa	  . 00288)	; &I-M-00288;
+      (=shinjigen@1ed	  .  0092)	; &GT-00379;
+      (=shinjigen@rev	  .  0092)	; &GT-00379;
       (=ucs@jis		  . #x4EA2)	; &GT-00379;
       )
      ((hanyu-dazidian	  1 280 1)
@@ -165,11 +164,6 @@
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-simplified
-     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
-      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
-      (=daikanwa	  . 45313)	; &I-M-45313;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -178,7 +172,17 @@
       )
      ((=ucs		  . #x53E3)	; 口
       ))
-    (=big5-cdp		. #x8BAA)	; &CDP-8BAA;
+    (<-simplified@component/connect-below
+     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
+      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
+      (=daikanwa	  . 45313)	; &I-M-45313;
+      ))
+    (->subsumptive
+     ((=big5-cdp	  . #x8BAA)	; &CDP-8BAA;
+      )
+     ((=gt-k		  . 01444)	; &GT-K01444;
+      (=gt-pj-k1	  . #x372D)	; &GT-K01444; [23-13]
+      ))
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -188,6 +192,8 @@
 			"ka-Ha+s5" "komogomo")
     (sound@ja/on	"kAu")
     (=ucs		. #x4EA4)	; 交
+    (=big5		. #xA5E6)	; &I-B-A5E6;
+    (=jis-x0208@1997	. #x3872)	; 交 [24-82]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -195,20 +201,18 @@
 	)
        ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=jis-x0208-1978    . #x4963)	; &GT-25336; [41-67]
-	(=jis-x0208-1983    . #x4963)	; &I-J83-4963; [41-67]
+       ((=jis-x0208@1978    . #x4963)	; &GT-25336; [41-67]
+	(=jis-x0208@1983    . #x4963)	; &I-J83-4963; [41-67]
 	(=ks-x1001	    . #x5D2B)	; &I-K0-5D2B; [61-11]
 	(=daikanwa	    . 19721)	; &I-M-19721;
 	))
-      (shinjigen-1	  . 97)
-      (shinjigen-2	  . 97)
-      (=jis-x0208-1978	  . #x3872)	; &M-00291; [24-82]
-      (=jis-x0208-1983	  . #x3872)	; &I-J83-3872; [24-82]
+      (=jis-x0208@1978	  . #x3872)	; &M-00291; [24-82]
+      (=jis-x0208@1983	  . #x3872)	; &I-J83-3872; [24-82]
       (=ks-x1001	  . #x4E5F)	; &I-K0-4E5F; [46-63]
-      (=big5		  . #xA5E6)	; &I-B-A5E6;
       (=daikanwa	  . 00291)	; &I-M-00291;
+      (=shinjigen@1ed	  .  0097)	; &M-00291;
+      (=shinjigen@rev	  .  0097)	; &M-00291;
       (=jef-china3	  . #x41D6)	; &I-JC3-41D6;
-      (=ucs@big5	  . #x4EA4)	; &M-00291;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -218,11 +222,11 @@
 	)
        ((=ucs		    . #x7236)	; 父
 	))
-      (shinjigen-1	  . 96)
-      (shinjigen-2	  . 96)
-      (=jis-x0208-1990	  . #x3872)	; &GT-00390; [24-82]
+      (=jis-x0208@1990	  . #x3872)	; &GT-00390; [24-82]
       (=gt		  . 00390)	; &I-GT-00390;
       (=gt-pj-1		  . #x3872)	; &I-GT-00390; [24-82]
+      (=shinjigen@1ed	  .  0096)	; &GT-00390;
+      (=shinjigen@rev	  .  0096)	; &GT-00390;
       (=ucs@jis		  . #x4EA4)	; &GT-00390;
       )
      ((hanyu-dazidian	  1 282 1)
@@ -247,6 +251,7 @@
     (sound@ja/kun	"inosisi" "i")
     (sound@ja/on	"gai")
     (=ucs		. #x4EA5)	; 亥
+    (=big5		. #xA5E8)	; &I-B-A5E8;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
@@ -259,9 +264,9 @@
 	)
        ((=ucs		    . #x4EBA)	; 人
 	))
-      (shinjigen-1	  . 95)
-      (shinjigen-2	  . 95)
       (=daikanwa	  . 00292)	; &M-00292;
+      (=shinjigen@1ed	  .  0095)	; &M-00292;
+      (=shinjigen@rev	  .  0095)	; &M-00292;
       (=jef-china3	  . #x41D5)	; &I-JC3-41D5;
       )
      ((ideographic-structure
@@ -275,16 +280,16 @@
 	)
        ((=ucs		    . #x4EBA)	; 人
 	))
-      (shinjigen-1	  . 94)
-      (shinjigen-2	  . 94)
       (=jis-x0208	  . #x3067)	; &GT-00387; [16-71]
       (=ks-x1001	  . #x7A24)	; &I-K0-7A24; [90-04]
-      (=big5		  . #xA5E8)	; &I-B-A5E8;
       (=gt		  . 00387)	; &I-GT-00387;
       (=gt-k		  . 01560)	; &I-GT-K01560;
       (=gt-pj-1		  . #x3067)	; &I-GT-00387; [16-71]
+      (=shinjigen@1ed	  .  0094)	; &GT-00387;
+      (=shinjigen@rev	  .  0094)	; &GT-00387;
       (=ucs@jis		  . #x4EA5)	; &GT-00387;
-      (=ucs@big5	  . #x4EA5)	; &GT-00387;
+      )
+     ((=cns11643-1	  . #x472A)	; &C1-472A; [39-10]
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
@@ -297,9 +302,8 @@
 	)
        ((=ucs		    . #x4EBA)	; 人
 	))
-      (=gb2312		  . #x3A25)	; &C1-472A; [26-05]
-      (=cns11643-1	  . #x472A)	; &I-C1-472A; [39-10]
-      (=ucs@unicode	  . #x4EA5)	; &C1-472A;
+      (=gb2312		  . #x3A25)	; &G0-3A25; [26-05]
+      (=ucs@unicode	  . #x4EA5)	; &G0-3A25;
       ))
     ))
 (define-char
@@ -319,8 +323,6 @@
 	)
        ((=big5-cdp	    . #x8CB5)	; &CDP-8CB5;
 	))
-      (shinjigen-1	  . 93)
-      (shinjigen-2	  . 93)
       (=jis-x0208	  . #x4B72)	; &GT-00384; [43-82]
       (=ks-x1001	  . #x6632)	; &I-K0-6632; [70-18]
       (=big5		  . #xA5E7)	; &I-B-A5E7;
@@ -328,6 +330,8 @@
       (=gt-k		  . 01690)	; &I-GT-K01690;
       (=gt-pj-1		  . #x4B72)	; &I-GT-00384; [43-82]
       (=daikanwa	  . 00293)	; &I-M-00293;
+      (=shinjigen@1ed	  .  0093)	; &GT-00384;
+      (=shinjigen@rev	  .  0093)	; &GT-00384;
       (=ucs@jis		  . #x4EA6)	; &GT-00384;
       (=ucs@big5	  . #x4EA6)	; &GT-00384;
       )
@@ -482,15 +486,15 @@
     (sound@ja/on/go	"kyAu")
     (=ucs		. #x4EA8)	; 亨
     (->subsumptive
-     ((shinjigen-1	  . 98)
-      (shinjigen-2	  . 98)
-      (=jis-x0208	  . #x357C)	; &GT-00392; [21-92]
+     ((=jis-x0208	  . #x357C)	; &GT-00392; [21-92]
       (=ks-x1001	  . #x7A7B)	; &I-K0-7A7B; [90-91]
       (=big5		  . #xA6EB)	; &I-B-A6EB;
       (=gt		  . 00392)	; &I-GT-00392;
       (=gt-k		  . 02521)	; &I-GT-K02521;
       (=gt-pj-1		  . #x357C)	; &I-GT-00392; [21-92]
       (=daikanwa	  . 00295)	; &I-M-00295;
+      (=shinjigen@1ed	  .  0098)	; &GT-00392;
+      (=shinjigen@rev	  .  0098)	; &GT-00392;
       (=ucs@jis		  . #x4EA8)	; &GT-00392;
       (=ucs@big5	  . #x4EA8)	; &GT-00392;
       )
@@ -535,10 +539,12 @@
 	(=daikanwa	    . 00296)	; &I-M-00296;
 	(=jef-china3	    . #x41D7)	; &I-JC3-41D7;
 	(=ucs@jis	    . #x342C)	; &M-00296;
+	(=adobe-japan1-5    . 17246)	; &M-00296;
 	)
        ((=ucs@unicode	    . #x342C)	; &UU+342C;
 	)
        ((=cns11643-4	    . #x2337)	; &C4-2337; [03-23]
+	(=ucs@cns	    . #x342C)	; &C4-2337;
 	))
       )
      ((ideographic-strokes . 4)
@@ -548,7 +554,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x20AD3)	; 𠫓
+       ((=big5-cdp	    . #x8B7E)	; &CDP-8B7E;
+	(=daikanwa	    . 03058)	; &I-M-03058;
 	)
        ((=big5-cdp	    . #x8BED)	; &GT-10942;
 	(=daikanwa	    . 08674)	; &I-M-08674;
@@ -637,11 +644,6 @@
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified
-     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
-      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
-      (=daikanwa	  . 45313)	; &I-M-45313;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs		  . #x2FF3)	; ⿳
@@ -653,6 +655,11 @@
      ((=ucs		  . #x5196)	; 冖
       ))
     (=big5-cdp		. #x8C4D)	; &CDP-8C4D;
+    (<-simplified@component/connect-below
+     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
+      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
+      (=daikanwa	  . 45313)	; &I-M-45313;
+      ))
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -661,24 +668,24 @@
     (sound@ja/kun	"toHoru" "u-k+eru")
     (sound@ja/on/kan	"kyAu")
     (=ucs		. #x4EAB)	; 享
+    (=big5		. #xA8C9)	; &I-B-A8C9;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=big5-cdp	    . #x8BAA)	; &CDP-8BAA;
+       ((=gt-k		    . 01444)	; &GT-K01444;
 	)
        ((=ucs		    . #x5B50)	; 子
 	))
-      (shinjigen-1	  . 101)
-      (shinjigen-2	  . 101)
       (=jis-x0208	  . #x357D)	; &GT-00396; [21-93]
       (=ks-x1001	  . #x7A3D)	; &I-K0-7A3D; [90-29]
-      (=big5		  . #xA8C9)	; &I-B-A8C9;
       (=gt		  . 00396)	; &I-GT-00396;
       (=gt-k		  . 03669)	; &I-GT-K03669;
       (=gt-pj-1		  . #x357D)	; &I-GT-00396; [21-93]
       (=daikanwa	  . 00298)	; &I-M-00298;
+      (=shinjigen@1ed	  .  0101)	; &GT-00396;
+      (=shinjigen@rev	  .  0101)	; &GT-00396;
       (=ucs@jis		  . #x4EAB)	; &GT-00396;
       (=ucs@big5	  . #x4EAB)	; &GT-00396;
       )
@@ -711,15 +718,15 @@
     (sound@ja/on/kan	"kei")
     (=ucs		. #x4EAC)	; 京
     (->subsumptive
-     ((shinjigen-1	  . 102)
-      (shinjigen-2	  . 102)
-      (=jis-x0208	  . #x357E)	; &GT-00397; [21-94]
+     ((=jis-x0208	  . #x357E)	; &GT-00397; [21-94]
       (=ks-x1001	  . #x4C48)	; &I-K0-4C48; [44-40]
       (=big5		  . #xA8CA)	; &I-B-A8CA;
       (=gt		  . 00397)	; &I-GT-00397;
       (=gt-k		  . 03671)	; &I-GT-K03671;
       (=gt-pj-1		  . #x357E)	; &I-GT-00397; [21-94]
       (=daikanwa	  . 00299)	; &I-M-00299;
+      (=shinjigen@1ed	  .  0102)	; &GT-00397;
+      (=shinjigen@rev	  .  0102)	; &GT-00397;
       (=ucs@jis		  . #x4EAC)	; &GT-00397;
       (=ucs@big5	  . #x4EAC)	; &GT-00397;
       )
@@ -784,7 +791,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=big5-cdp	    . #x8BAA)	; &CDP-8BAA;
+       ((=gt-k		    . 01444)	; &GT-K01444;
 	)
        ((=ucs		    . #x5927)	; 大
 	))
@@ -826,6 +833,35 @@
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=jis-x0208	  . #x5035)	; &GT-00376; [48-21]
+      )
+     ((=big5-cdp	  . #x89CC)	; &CDP-89CC;
+      )
+     ((=ucs		  . #x5196)	; 冖
+      ))
+    (=gt-k		. 04733)	; &GT-K04733;
+    (=gt-pj-k1		. #x393A)	; &GT-K04733; [25-26]
+    (<-simplified@component/connect-below
+     ((=gt		  . 60969)	; &GT-60969;
+      (=daikanwa	  . 45314)	; &I-M-45314;
+      ))
+    (<-vulgar@component
+     ((=big5-cdp	  . #x8C4D)	; &CDP-8C4D;
+      ))
+    (<-vulgar@component/connect-below
+     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
+      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
+      (=daikanwa	  . 45313)	; &I-M-45313;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (sound@ja/on/kan	"tei")
@@ -839,8 +875,6 @@
 	)
        ((=ucs		    . #x4E01)	; 丁
 	))
-      (shinjigen-1	  . 104)
-      (shinjigen-2	  . 104)
       (=jis-x0208	  . #x4462)	; &GT-00406; [36-66]
       (=ks-x1001	  . #x6F4D)	; &I-K0-6F4D; [79-45]
       (=big5		  . #xAB46)	; &I-B-AB46;
@@ -848,6 +882,8 @@
       (=gt-k		  . 05149)	; &I-GT-K05149;
       (=gt-pj-1		  . #x4462)	; &I-GT-00406; [36-66]
       (=daikanwa	  . 00303)	; &I-M-00303;
+      (=shinjigen@1ed	  .  0104)	; &GT-00406;
+      (=shinjigen@rev	  .  0104)	; &GT-00406;
       (=ucs@jis		  . #x4EAD)	; &GT-00406;
       (=ucs@big5	  . #x4EAD)	; &GT-00406;
       )
@@ -891,8 +927,6 @@
 	)
        ((=ucs		    . #x513F)	; 儿
 	))
-      (shinjigen-1	  . 106)
-      (shinjigen-2	  . 106)
       (=jis-x0208	  . #x4E3C)	; &GT-00408; [46-28]
       (=ks-x1001	  . #x5555)	; &I-K0-5555; [53-53]
       (=big5		  . #xAB47)	; &I-B-AB47;
@@ -900,6 +934,8 @@
       (=gt-k		  . 05202)	; &I-GT-K05202;
       (=gt-pj-1		  . #x4E3C)	; &I-GT-00408; [46-28]
       (=daikanwa	  . 00304)	; &I-M-00304;
+      (=shinjigen@1ed	  .  0106)	; &GT-00408;
+      (=shinjigen@rev	  .  0106)	; &GT-00408;
       (=ucs@jis		  . #x4EAE)	; &GT-00408;
       (=ucs@big5	  . #x4EAE)	; &GT-00408;
       )
@@ -939,9 +975,9 @@
 	)
        ((=ucs		    . #x51E0)	; 几
 	))
-      (shinjigen-1	  . 107)
-      (shinjigen-2	  . 107)
       (=gb2312		  . #x4141)	; &G0-4141; [33-33]
+      (=shinjigen@1ed	  .  0107)	; &G0-4141;
+      (=shinjigen@rev	  .  0107)	; &G0-4141;
       (=ucs@unicode	  . #x4EAE)	; &G0-4141;
       ))
     ))
@@ -951,10 +987,10 @@
     (total-strokes	 . 9)
     (=ucs		. #x4EAF)	; 亯
     (->subsumptive
-     ((shinjigen-1	  . 99)
-      (=jis-x0212	  . #x3041)	; &CDP-8AA5; [16-33]
+     ((=jis-x0212	  . #x3041)	; &CDP-8AA5; [16-33]
       (=big5-cdp	  . #x8AA5)	; &I-CDP-8AA5;
       (=daikanwa	  . 00305)	; &I-M-00305;
+      (=shinjigen@1ed	  .  0099)	; &CDP-8AA5;
       (=jef-china3	  . #x41D8)	; &I-JC3-41D8;
       (=ucs@jis		  . #x4EAF)	; &CDP-8AA5;
       )
@@ -1029,15 +1065,7 @@
     (sound@ja/on/go	"kyAu")
     (=ucs		. #x4EB0)	; 亰
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 102)
-	(=jis-x0208	    . #x357E)	; &GT-00397; [21-94]
-	(=ks-x1001	    . #x4C48)	; &I-K0-4C48; [44-40]
-	(=daikanwa	    . 00299)	; &I-M-00299;
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
@@ -1045,14 +1073,22 @@
 	)
        ((=big5-cdp	    . #x8CED)	; &CDP-8CED;
 	))
-      (shinjigen-1	  . 103)
-      (shinjigen-2	  . 103)
       (=jis-x0208	  . #x5037)	; &GT-00402; [48-23]
       (=gt		  . 00402)	; &I-GT-00402;
       (=gt-k		  . 05205)	; &I-GT-K05205;
       (=gt-pj-1		  . #x5037)	; &I-GT-00402; [48-23]
       (=daikanwa	  . 00307)	; &I-M-00307;
+      (=shinjigen@1ed	  .  0103)	; &GT-00402;
+      (=shinjigen@rev	  .  0103)	; &GT-00402;
       (=ucs@jis		  . #x4EB0)	; &GT-00402;
+      (<-vulgar
+       ((=jis-x0208	    . #x357E)	; &GT-00397; [21-94]
+	(=ks-x1001	    . #x4C48)	; &I-K0-4C48; [44-40]
+	(=daikanwa	    . 00299)	; &I-M-00299;
+	(=shinjigen@1ed	    .  0102)	; &GT-00397;
+	))
+      (<-vulgar*sources
+       shinjigen@1ed)
       )
      ((hanyu-dazidian	  1 285 4)
       (ideographic-structure
@@ -1129,23 +1165,42 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 7)
+  '((ideographic-radical@ucs . 117)	; â½´
+    (ideographic-strokes@ucs . 4)
+    (ideographic-radical@ucs*sources
+     daikanwa=25736 jis-x0208 cns11643 ucs)
+    (ideographic-radical@misc . 8)	; ⼇
+    (ideographic-strokes@misc . 7)
+    (ideographic-radical@misc*sources
+     daikanwa=00310 cbeta)
     (total-strokes	 . 9)
-    (->identical
+    (=ucs		. #x7AD2)	; 竒
+    (->subsumptive
      ((=jis-x0208	  . #x5474)	; &GT-00400; [52-84]
-      (=daikanwa	  . 25736)	; &I-M-25736;
-      ))
-    (<-denotational
-     ((=ucs		  . #x7AD2)	; 竒
+      (=gt		  . 00400)	; &I-GT-00400;
+      (=gt-k		  . 05227)	; &I-GT-K05227;
+      (=gt-pj-1		  . #x5474)	; &I-GT-00400; [52-84]
+      (=cbeta		  . 00282)	; &I-CB00282;
+      (=ucs@jis		  . #x7AD2)	; &GT-00400;
+      (->subsumptive
+       ((ideographic-radical . 117)	; â½´
+	(ideographic-strokes . 4)
+	(=daikanwa	    . 25736)	; &M-25736;
+	)
+       ((ideographic-radical . 8)	; ⼇
+	(ideographic-strokes . 7)
+	(=daikanwa	    . 00310)	; &M-00310;
+	))
+      )
+     ((=cns11643-3	  . #x2E4F)	; &C3-2E4F; [14-47]
+      (=ucs@unicode	  . #x7AD2)	; &C3-2E4F;
       ))
-    (=daikanwa		. 00310)	; &M-00310;
-    (=cbeta		. 00282)	; &I-CB00282;
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (hanyu-dazidian	4 2707 7)
     (=ucs		. #x4EB2)	; 亲
     (->subsumptive
      ((ideographic-structure
@@ -1163,14 +1218,15 @@
      ((=big5-cdp	  . #x8BA7)	; &CDP-8BA7;
       (=jef-china3	  . #x81D2)	; &I-JC3-81D2;
       )
-     ((hanyu-dazidian	  4 2707 7)
-      (=cns11643-3	  . #x2B24)	; &C3-2B24; [11-04]
+     ((=cns11643-3	  . #x2B24)	; &C3-2B24; [11-04]
+      (=ucs@cns		  . #x4EB2)	; &C3-2B24;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x7ACB)	; 立
+       ((=gb2312	    . #x4122)	; &C1-4721; [33-02]
+	(=cns11643-1	    . #x4721)	; &I-C1-4721; [39-01]
 	)
        ((=ucs		    . #x6729)	; 朩
 	))
@@ -1184,6 +1240,7 @@
     (total-strokes	 . 10)
     (sound@ja/on/kan	"haku")
     (=ucs		. #x4EB3)	; 亳
+    (=big5		. #xADBD)	; &I-B-ADBD;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1191,15 +1248,15 @@
 	)
        ((=big5-cdp	    . #x8C4D)	; &CDP-8C4D;
 	)
-       ((=ucs		    . #x4E47)	; 乇
+       ((=gb2312	    . #x5831)	; &GT-00167; [56-17]
+	(=daikanwa	    . 00120)	; &I-M-00120;
 	))
-      (shinjigen-1	  . 109)
-      (shinjigen-2	  . 109)
       (=jis-x0208	  . #x5038)	; &GT-00414; [48-24]
-      (=big5		  . #xADBD)	; &I-B-ADBD;
       (=gt		  . 00414)	; &I-GT-00414;
       (=gt-pj-1		  . #x5038)	; &I-GT-00414; [48-24]
       (=daikanwa	  . 00312)	; &I-M-00312;
+      (=shinjigen@1ed	  .  0109)	; &GT-00414;
+      (=shinjigen@rev	  .  0109)	; &GT-00414;
       (=ucs@jis		  . #x4EB3)	; &GT-00414;
       (=ucs@big5	  . #x4EB3)	; &GT-00414;
       )
@@ -1212,18 +1269,41 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	  (=ucs		      . #x2FF3)	; ⿳
 	  )
-	 ((=ucs		      . #x4EA0)	; 亠
+	 ((=gb2312	      . #x596F)	; &GT-00375; [57-79]
+	  (=daikanwa	      . 00286)	; &I-M-00286;
 	  )
 	 ((=ucs		      . #x53E3)	; 口
 	  )
 	 ((=ucs		      . #x5196)	; 冖
 	  ))
 	)
-       ((=ucs		    . #x4E47)	; 乇
+       ((=gb2312	    . #x5831)	; &GT-00167; [56-17]
+	(=daikanwa	    . 00120)	; &I-M-00120;
 	))
-      (=gb2312		  . #x5971)	; &C1-537E; [57-81]
-      (=cns11643-1	  . #x537E)	; &I-C1-537E; [51-94]
-      (=ucs@unicode	  . #x4EB3)	; &C1-537E;
+      (=gb2312		  . #x5971)	; &G0-5971; [57-81]
+      (=ucs@unicode	  . #x4EB3)	; &G0-5971;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	  (=ucs		      . #x2FF3)	; ⿳
+	  )
+	 ((=gb2312	      . #x596F)	; &GT-00375; [57-79]
+	  (=daikanwa	      . 00286)	; &I-M-00286;
+	  )
+	 ((=ucs		      . #x53E3)	; 口
+	  )
+	 ((=ucs		      . #x5196)	; 冖
+	  ))
+	)
+       ((=jis-x0212	    . #x3032)	; &JX2-2129; [16-18]
+	(=cns11643-2	    . #x2128)	; &I-C2-2128; [01-08]
+	(=jis-x0213-2-2000  . #x2129)	; &I-JX2-2129; [01-09]
+	))
+      (=cns11643-1	  . #x537E)	; &C1-537E; [51-94]
       ))
     ))
 (define-char
@@ -1236,7 +1316,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	(=ucs		    . #x2FF3)	; ⿳
 	)
-       ((=big5-cdp	    . #x8BAA)	; &CDP-8BAA;
+       ((=gt-k		    . 01444)	; &GT-K01444;
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
@@ -1268,7 +1348,12 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
+  '((ideographic-radical@ucs . 8)	; ⼇
+    (ideographic-radical@ucs*sources
+     daikanwa=00314 cns11643 ucs)
+    (ideographic-radical@daikanwa=01783 . 16)	; ⼏
+    (ideographic-radical@daikanwa=01783*sources
+     daikanwa=01783)
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (=ucs		. #x2015E)	; 𠅞
@@ -1279,33 +1364,86 @@
 	)
        ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=ucs		    . #x821B)	; 舛
+       ((=jis-x0208	    . #x4124)	; &GT-39240; [33-04]
+	(=gb2312	    . #x6236)	; &I-G0-6236; [66-22]
+	(=daikanwa	    . 30338)	; &I-M-30338;
 	)
        ((=ucs		    . #x51E0)	; 几
 	))
-      (=daikanwa	  . 00314)	; &M-00314;
+      (->subsumptive
+       ((ideographic-radical . 8)	; ⼇
+	(=daikanwa	    . 00314)	; &M-00314;
+	)
+       ((ideographic-radical . 16)	; ⼏
+	(=daikanwa	    . 01783)	; &M-01783;
+	))
       )
-     ((hanyu-dazidian	  1 287 13)
+     ((ideographic-radical . 8)	; ⼇
+      (hanyu-dazidian	  1 287 13)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	(=ucs		    . #x2FF3)	; ⿳
 	)
-       ((=ucs		    . #x4EA0)	; 亠
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
-       ((=ucs		    . #x821B)	; 舛
+       ((=jis-x0208	    . #x4124)	; &GT-39240; [33-04]
+	(=gb2312	    . #x6236)	; &I-G0-6236; [66-22]
+	(=daikanwa	    . 30338)	; &I-M-30338;
 	)
        ((=ucs		    . #x51E0)	; 几
 	))
-      (=cns11643-6	  . #x3531)	; &HZK01-E15B; [21-17]
-      (=hanziku-1	  . #xE15B)	; &I-HZK01-E15B;
+      (=hanziku-1	  . #xE15B)	; &HZK01-E15B;
       (=ucs@iso		  . #x2015E)	; &HZK01-E15B;
+      )
+     ((ideographic-radical . 8)	; ⼇
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
+	)
+       ((=cns11643-1	    . #x4860)	; &C1-4860; [40-64]
+	)
+       ((=ucs		    . #x51E0)	; 几
+	))
+      (=cns11643-6	  . #x3531)	; &C6-3531; [21-17]
       ))
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (=daikanwa		. 00315)	; &M-00315;
+    (=ucs		. #x2015A)	; 𠅚
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
+	)
+       ((=jis-x0208@1978    . #x3B48)	; &M-00573; [27-40]
+	(=jis-x0208@1983    . #x3B48)	; &I-J83-3B48; [27-40]
+	(=daikanwa	    . 00573)	; &I-M-00573;
+	))
+      (=daikanwa	  . 00315)	; &M-00315;
+      )
+     ((hanyu-dazidian	  1 287 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
+	)
+       ((=gb2312	    . #x4A39)	; &GT-00744; [42-25]
+	(=ks-x1001	    . #x5E45)	; &I-K0-5E45; [62-37]
+	(=cns11643-1	    . #x4B70)	; &I-C1-4B70; [43-80]
+	))
+      (=hanziku-1	  . #xE158)	; &HZK01-E158;
+      (=ucs@unicode	  . #x2015A)	; &HZK01-E158;
+      ))
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -1313,34 +1451,25 @@
     (total-strokes	 . 10)
     (=ucs		. #x20158)	; 𠅘
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 104)
-	(=jis-x0208	    . #x4462)	; &GT-00406; [36-66]
-	(=ks-x1001	    . #x6F4D)	; &I-K0-6F4D; [79-45]
-	(=daikanwa	    . 00303)	; &I-M-00303;
-	))
-      (<-vulgar*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	  (=ucs		      . #x2FF3)	; ⿳
-	  )
-	 ((=jis-x0208	      . #x5035)	; &GT-00376; [48-21]
-	  )
-	 ((=big5-cdp	      . #x89CC)	; &CDP-89CC;
-	  )
-	 ((=ucs		      . #x5196)	; 冖
-	  ))
+       ((=gt-k		    . 04733)	; &GT-K04733;
 	)
        ((=ucs		    . #x4E01)	; 丁
 	))
-      (shinjigen-1	  . 105)
-      (shinjigen-2	  . 105)
       (=daikanwa	  . 00316)	; &M-00316;
+      (=shinjigen@1ed	  .  0105)	; &M-00316;
+      (=shinjigen@rev	  .  0105)	; &M-00316;
+      (<-vulgar
+       ((=jis-x0208	    . #x4462)	; &GT-00406; [36-66]
+	(=ks-x1001	    . #x6F4D)	; &I-K0-6F4D; [79-45]
+	(=daikanwa	    . 00303)	; &I-M-00303;
+	(=shinjigen@1ed	    .  0104)	; &GT-00406;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa shinjigen@1ed)
       )
      ((hanyu-dazidian	  1 287 6)
       (ideographic-structure
@@ -1351,7 +1480,8 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	  (=ucs		      . #x2FF3)	; ⿳
 	  )
-	 ((=ucs		      . #x4EA0)	; 亠
+	 ((=gb2312	      . #x596F)	; &GT-00375; [57-79]
+	  (=daikanwa	      . 00286)	; &I-M-00286;
 	  )
 	 ((=big5-cdp	      . #x89CC)	; &CDP-89CC;
 	  )
@@ -1371,34 +1501,25 @@
     (total-strokes	 . 10)
     (=ucs		. #x20159)	; 𠅙
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 106)
-	(=jis-x0208	    . #x4E3C)	; &GT-00408; [46-28]
-	(=ks-x1001	    . #x5555)	; &I-K0-5555; [53-53]
-	(=daikanwa	    . 00304)	; &I-M-00304;
-	))
-      (<-vulgar*sources
-       daikanwa shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	  (=ucs		      . #x2FF3)	; ⿳
-	  )
-	 ((=jis-x0208	      . #x5035)	; &GT-00376; [48-21]
-	  )
-	 ((=big5-cdp	      . #x89CC)	; &CDP-89CC;
-	  )
-	 ((=ucs		      . #x5196)	; 冖
-	  ))
+       ((=gt-k		    . 04733)	; &GT-K04733;
 	)
        ((=ucs		    . #x513F)	; 儿
 	))
-      (shinjigen-1	  . 108)
-      (shinjigen-2	  . 108)
       (=daikanwa	  . 00317)	; &M-00317;
+      (=shinjigen@1ed	  .  0108)	; &M-00317;
+      (=shinjigen@rev	  .  0108)	; &M-00317;
+      (<-vulgar
+       ((=jis-x0208	    . #x4E3C)	; &GT-00408; [46-28]
+	(=ks-x1001	    . #x5555)	; &I-K0-5555; [53-53]
+	(=daikanwa	    . 00304)	; &I-M-00304;
+	(=shinjigen@1ed	    .  0106)	; &GT-00408;
+	))
+      (<-vulgar*sources
+       daikanwa shinjigen@1ed)
       )
      ((hanyu-dazidian	  1 287 7)
       (ideographic-structure
@@ -1409,7 +1530,8 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	  (=ucs		      . #x2FF3)	; ⿳
 	  )
-	 ((=ucs		      . #x4EA0)	; 亠
+	 ((=gb2312	      . #x596F)	; &GT-00375; [57-79]
+	  (=daikanwa	      . 00286)	; &I-M-00286;
 	  )
 	 ((=big5-cdp	      . #x89CC)	; &CDP-89CC;
 	  )
@@ -1420,7 +1542,7 @@
 	))
       (=cns11643-6	  . #x3530)	; &HZK01-E155; [21-16]
       (=hanziku-1	  . #xE155)	; &I-HZK01-E155;
-      (=ucs@unicode	  . #x20159)	; &HZK01-E155;
+      (=ucs@iso		  . #x20159)	; &HZK01-E155;
       ))
     ))
 (define-char
@@ -1463,22 +1585,6 @@
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 287 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4EA0)	; 亠
-      )
-     ((=ucs		  . #x4F7F)	; 使
-      ))
-    (=ucs		. #x2015A)	; 𠅚
-    (=hanziku-1		. #xE158)	; &I-HZK01-E158;
-    ))
-(define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
     (hanyu-dazidian	1 287 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
@@ -1611,16 +1717,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=big5-cdp	    . #x8BAA)	; &CDP-8BAA;
+       ((=gt-k		    . 01444)	; &GT-K01444;
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	  (=ucs		      . #x2FF8)	; ⿸
-	  )
-	 ((=ucs		      . #x5C38)	; å°¸
-	  )
-	 ((=ucs		      . #x5C38)	; å°¸
-	  ))
+       ((=ucs		    . #x21C32)	; ð¡°²
 	))
       (=daikanwa	  . 00320)	; &M-00320;
       )
@@ -1638,14 +1737,7 @@
 	 ((=ucs		      . #x53E3)	; 口
 	  ))
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	  (=ucs		      . #x2FF8)	; ⿸
-	  )
-	 ((=ucs		      . #x5C38)	; å°¸
-	  )
-	 ((=ucs		      . #x5C38)	; å°¸
-	  ))
+       ((=ucs		    . #x21C32)	; ð¡°²
 	))
       (=cns11643-6	  . #x3D22)	; &HZK01-E171; [29-02]
       (=hanziku-1	  . #xE171)	; &I-HZK01-E171;
@@ -1914,7 +2006,8 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	  (=ucs		      . #x2FF3)	; ⿳
 	  )
-	 ((=ucs		      . #x4EA0)	; 亠
+	 ((=gb2312	      . #x596F)	; &GT-00375; [57-79]
+	  (=daikanwa	      . 00286)	; &I-M-00286;
 	  )
 	 ((=ucs		      . #x53E3)	; 口
 	  )
@@ -1936,7 +2029,8 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	  (=ucs		      . #x2FF3)	; ⿳
 	  )
-	 ((=ucs		      . #x4EA0)	; 亠
+	 ((=gb2312	      . #x596F)	; &GT-00375; [57-79]
+	  (=daikanwa	      . 00286)	; &I-M-00286;
 	  )
 	 ((=ucs		      . #x53E3)	; 口
 	  )
@@ -1948,6 +2042,7 @@
        ((=ucs		    . #x4E5D)	; 九
 	))
       (=cns11643-4	  . #x362E)	; &C4-362E; [22-14]
+      (=ucs@cns		  . #x4EB4)	; &C4-362E;
       ))
     ))
 (define-char
@@ -1955,55 +2050,69 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 290 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x4EA0)	; 亠
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((name		    . "CJK RADICAL HAND")
-	(=ucs		    . #x2E98)	; ⺘
-	)
-       ((=ucs		    . #x4E38)	; 丸
-	))
-      )
-     ((=big5-cdp	  . #x8B67)	; &CDP-8B67;
-      ))
     (=ucs		. #x4EB5)	; 亵
     (=gb2312		. #x5974)	; &I-G0-5974; [57-84]
     (=hanziku-1		. #xE1D2)	; &I-HZK01-E1D2;
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 10)
+  '((ideographic-radical@ucs . 8)	; ⼇
+    (ideographic-strokes@ucs . 10)
+    (ideographic-radical@cns . 111)	; â½®
+    (ideographic-strokes@cns . 7)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 12)
-    (->same
-     ((=daikanwa	  . 23981)	; &M-23981;
-      ))
-    (hanyu-dazidian	1 290 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4EA0)	; 亠
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
-	(=ucs		    . #x2FF2)	; ⿲
+    (=ucs		. #x20170)	; 𠅰
+    (->subsumptive
+     ((ideographic-radical . 111)	; â½®
+      (ideographic-strokes . 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x571F)	; 土
+       ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=ucs		    . #x77E2)	; 矢
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	  (=ucs		      . #x2FF2)	; ⿲
+	  )
+	 ((=gt-k	      . 00199)	; &GT-K00199;
+	  )
+	 ((=gt-k	      . 01013)	; &GT-K01013;
+	  )
+	 ((=ucs		      . #x5315)	; 匕
+	  ))
+	))
+      (=daikanwa	  . 23981)	; &M-23981;
+      )
+     ((ideographic-radical . 8)	; ⼇
+      (ideographic-strokes . 10)
+      (hanyu-dazidian	  1 290 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x5315)	; 匕
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	  (=ucs		      . #x2FF2)	; ⿲
+	  )
+	 ((=gt-k	      . 00199)	; &GT-K00199;
+	  )
+	 ((=gt-k	      . 01013)	; &GT-K01013;
+	  )
+	 ((=ucs		      . #x5315)	; 匕
+	  ))
 	))
+      (=hanziku-1	  . #xE1D1)	; &HZK01-E1D1;
+      (=ucs@iso		  . #x20170)	; &HZK01-E1D1;
+      )
+     ((ideographic-radical . 111)	; â½®
+      (ideographic-strokes . 7)
+      (=cns11643-6	  . #x4C2D)	; &C6-4C2D; [44-13]
       ))
-    (=ucs		. #x20170)	; 𠅰
-    (=hanziku-1		. #xE1D1)	; &I-HZK01-E1D1;
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -2038,14 +2147,14 @@
 	)
        ((=ucs		    . #x65E6)	; 旦
 	))
-      (shinjigen-1	  . 110)
-      (shinjigen-2	  . 110)
       (=jis-x0208	  . #x5039)	; &GT-00433; [48-25]
       (=big5		  . #xDCB3)	; &I-B-DCB3;
       (=gt		  . 00433)	; &I-GT-00433;
       (=gt-k		  . 10291)	; &I-GT-K10291;
       (=gt-pj-1		  . #x5039)	; &I-GT-00433; [48-25]
       (=daikanwa	  . 00328)	; &I-M-00328;
+      (=shinjigen@1ed	  .  0110)	; &GT-00433;
+      (=shinjigen@rev	  .  0110)	; &GT-00433;
       (=jef-china3	  . #x41DA)	; &I-JC3-41DA;
       (=ucs@jis		  . #x4EB6)	; &GT-00433;
       (=ucs@big5	  . #x4EB6)	; &GT-00433;
@@ -2159,14 +2268,6 @@
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-      (=ucs		  . #x2FF8)	; ⿸
-      )
-     ((=ucs		  . #x4EA7)	; 产
-      )
-     ((=ucs		  . #x517C)	; 兼
-      ))
     (=ucs		. #x4EB7)	; 亷
     (=cns11643-3	. #x4033)	; &I-C3-4033; [32-19]
     ))
@@ -2331,7 +2432,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=big5-cdp	    . #x8BAA)	; &CDP-8BAA;
+       ((=gt-k		    . 01444)	; &GT-K01444;
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2416,7 +2517,9 @@
 	)
        ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=ucs		    . #x5967)	; 奧
+       ((=jis-x0208	    . #x547C)	; &GT-07553; [52-92]
+	(=ks-x1001	    . #x6773)	; &I-K0-6773; [71-83]
+	(=daikanwa	    . 05985)	; &I-M-05985;
 	))
       (=daikanwa	  . 00332)	; &M-00332;
       )
@@ -2425,9 +2528,12 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4EA0)	; 亠
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
-       ((=ucs		    . #x5967)	; 奧
+       ((=jis-x0208	    . #x547C)	; &GT-07553; [52-92]
+	(=ks-x1001	    . #x6773)	; &I-K0-6773; [71-83]
+	(=daikanwa	    . 05985)	; &I-M-05985;
 	))
       (=hanziku-1	  . #xE25A)	; &HZK01-E25A;
       )
@@ -2435,7 +2541,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4EA0)	; 亠
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
        ((=cns11643-1	    . #x635F)	; &C1-635F; [67-63]
 	))
@@ -2476,7 +2583,8 @@
 	   ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	    (=ucs		. #x2FF1)	; ⿱
 	    )
-	   ((=ucs		. #x4EA0)	; 亠
+	   ((=gb2312		. #x596F)	; &GT-00375; [57-79]
+	    (=daikanwa		. 00286)	; &I-M-00286;
 	    )
 	   ((=ucs		. #x53E3)	; 口
 	    ))
@@ -2517,21 +2625,28 @@
       ))
     ))
 (define-char
-  '((morohashi-daikanwa	49510 0 0)
-    (ideographic-	(:radical	123 ; ⽺
-			 :strokes	8)
-			(:radical	8 ; ⼇
-			 :strokes	13))
+  '((ideographic-radical@ucs . 8)	; ⼇
+    (ideographic-strokes@ucs . 13)
+    (ideographic-radical@cns . 123)	; ⽺
+    (ideographic-strokes@cns . 8)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 15)
-    (->same
-     ((=daikanwa	  . 49510)	; &M-49510;
-      ))
-    (hanyu-dazidian	1 292 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((ideographic-structure
+    (=ucs		. #x20186)	; 𠆆
+    (->subsumptive
+     ((ideographic-radical . 123)	; ⽺
+      (ideographic-strokes . 8)
+      (=daikanwa	  . 49510)	; &M-49510;
+      )
+     ((ideographic-radical . 8)	; ⼇
+      (ideographic-strokes . 13)
+      (hanyu-dazidian	  1 292 5)
+      (=hanziku-1	  . #xE256)	; &HZK01-E256;
+      (=ucs@iso		  . #x20186)	; &HZK01-E256;
+      )
+     ((ideographic-radical . 123)	; ⽺
+      (ideographic-strokes . 8)
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
@@ -2539,26 +2654,24 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	  (=ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((=ucs		      . #x4EA0)	; 亠
+	 ((ideographic-structure
+	   ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	    (=ucs		. #x2FF1)	; ⿱
+	    )
+	   ((=gb2312		. #x596F)	; &GT-00375; [57-79]
+	    (=daikanwa		. 00286)	; &I-M-00286;
+	    )
+	   ((=ucs		. #x53E3)	; 口
+	    ))
 	  )
 	 ((=ucs		      . #x53E3)	; 口
 	  ))
 	)
-       ((=ucs		    . #x53E3)	; 口
-	))
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x535D)	; 卝
-	)
-       ((=ucs		    . #x5E72)	; å¹²
+       ((name		    . "CJK RADICAL EWE")
+	(=ucs		    . #x2EB8)	; ⺸
 	))
+      (=cns11643-7	  . #x2679)	; &C7-2679; [06-89]
       ))
-    (=ucs		. #x20186)	; 𠆆
-    (=cns11643-7	. #x2679)	; &I-C7-2679; [06-89]
-    (=hanziku-1		. #xE256)	; &I-HZK01-E256;
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -2694,8 +2807,8 @@
 	)
        ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=jis-x0208-1978    . #x5423)	; &GT-06038; [52-03]
-	(=jis-x0208-1983    . #x5423)	; &I-J83-5423; [52-03]
+       ((=jis-x0208@1978    . #x5423)	; &GT-06038; [52-03]
+	(=jis-x0208@1983    . #x5423)	; &I-J83-5423; [52-03]
 	(=ks-x1001	    . #x6A4C)	; &I-K0-6A4C; [74-44]
 	(=cns11643-1	    . #x5E58)	; &I-C1-5E58; [62-56]
 	(=daikanwa	    . 04806)	; &I-M-04806;
@@ -2711,8 +2824,8 @@
 	)
        ((=ucs		    . #x4EA0)	; 亠
 	)
-       ((=jis-x0208-1978    . #x5423)	; &GT-06038; [52-03]
-	(=jis-x0208-1983    . #x5423)	; &I-J83-5423; [52-03]
+       ((=jis-x0208@1978    . #x5423)	; &GT-06038; [52-03]
+	(=jis-x0208@1983    . #x5423)	; &I-J83-5423; [52-03]
 	(=ks-x1001	    . #x6A4C)	; &I-K0-6A4C; [74-44]
 	(=cns11643-1	    . #x5E58)	; &I-C1-5E58; [62-56]
 	(=daikanwa	    . 04806)	; &I-M-04806;
@@ -2992,7 +3105,7 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	  (=ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((=big5-cdp	      . #x8BAA)	; &CDP-8BAA;
+	 ((=gt-k	      . 01444)	; &GT-K01444;
 	  )
 	 ((=ucs		      . #x53E3)	; 口
 	  ))
@@ -3029,25 +3142,55 @@
       ))
     ))
 (define-char
-  '((morohashi-daikanwa	5824 0 2)
-    (ideographic-	(:radical	8 ; ⼇
-			 :strokes	15
-			 :sources	(ucs))
-			(:radical	36 ; â¼£
-			 :strokes	14
-			 :strokes	(morohashi-daikanwa)))
+  '((ideographic-radical@ucs . 8)	; ⼇
+    (ideographic-strokes@ucs . 15)
+    (ideographic-radical@ucs*sources
+     ucs)
+    (ideographic-radical@daikanwa . 36)	; â¼£
+    (ideographic-strokes@daikanwa . 14)
+    (ideographic-strokes@daikanwa*sources
+     daikanwa)
     (total-strokes	 . 17)
-    (hanyu-dazidian	1 294 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x20199)	; 𠆙
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x4462)	; &GT-00406; [36-66]
+	(=ks-x1001	    . #x6F4D)	; &I-K0-6F4D; [79-45]
+	(=daikanwa	    . 00303)	; &I-M-00303;
+	)
+       ((=daikanwa	    . 05763)	; &M-05763;
+	))
+      (=daikanwa	  . 05824)	; &M-05824;
       )
-     ((=ucs		  . #x4EAD)	; 亭
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x4462)	; &GT-00406; [36-66]
+	(=ks-x1001	    . #x6F4D)	; &I-K0-6F4D; [79-45]
+	(=daikanwa	    . 00303)	; &I-M-00303;
+	)
+       ((=jis-x0208	    . #x4C6B)	; &GT-07291; [44-75]
+	(=ks-x1001	    . #x6528)	; &I-K0-6528; [69-08]
+	))
+      (=cbeta		  . 00833)	; &CB00833;
       )
-     ((=ucs		  . #x591C)	; 夜
+     ((hanyu-dazidian	  1 294 4)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gb2312	    . #x4D24)	; &C1-4F68; [45-04]
+	(=cns11643-1	    . #x4F68)	; &I-C1-4F68; [47-72]
+	)
+       ((=ucs		    . #x591C)	; 夜
+	))
+      (=hanziku-1	  . #xE2B7)	; &HZK01-E2B7;
+      (=ucs@iso		  . #x20199)	; &HZK01-E2B7;
       ))
-    (=ucs		. #x20199)	; 𠆙
-    (=hanziku-1		. #xE2B7)	; &I-HZK01-E2B7;
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -3216,88 +3359,75 @@
 (define-char
   '((ideographic-radical . 8)	; ⼇
     (=ucs		. #x4EB9)	; 亹
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4EB9)	; 亹
+      ))
+    (ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 20)
+    (total-strokes	 . 22)
+    (=big5		. #xF6D6)	; &B-F6D6;
+    (=ucs@big5		. #x4EB9)	; &B-F6D6;
     (->subsumptive
      ((ideographic-strokes@jis-x0213 . 19)
-      (ideographic-strokes . 20)
-      (total-strokes	   . 22)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
        ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=ucs		    . #x820B)	; 舋
+       ((=ucs@unicode	    . #x820B)	; &UU+820B;
 	))
-      (shinjigen-2	  . 112)
       (=jis-x0212	  . #x3042)	; &M-00342; [16-34]
       (=jis-x0213-2-2000  . #x2134)	; &I-JX2-2134; [01-20]
-      (=big5		  . #xF6D6)	; &I-B-F6D6;
       (=daikanwa	  . 00342)	; &I-M-00342;
+      (=shinjigen@rev	  .  0112)	; &M-00342;
       (=ucs@jis		  . #x4EB9)	; &M-00342;
-      (=ucs@big5	  . #x4EB9)	; &M-00342;
       )
-     ((ideographic-strokes . 20)
-      (total-strokes	   . 22)
-      (hanyu-dazidian	  1 294 12)
+     ((hanyu-dazidian	  1 294 12)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4EA0)	; 亠
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
-       ((=ucs		    . #x820B)	; 舋
+       ((=ucs@unicode	    . #x820B)	; &UU+820B;
 	))
       (=cns11643-2	  . #x6D44)	; &C2-6D44; [77-36]
       (=ucs@unicode	  . #x4EB9)	; &C2-6D44;
-      )
-     ((ideographic-strokes . 19)
-      (total-strokes	   . 21)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
-	)
-       ((=cns11643-2	    . #x664D)	; &C2-664D; [70-45]
-	))
-      (=jef-china3	  . #x41DB)	; &JC3-41DB;
       ))
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 22)
-    (total-strokes	 . 24)
-    (=daikanwa		. 00343)	; &M-00343;
-    ))
-(define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 22)
-    (total-strokes	 . 24)
-    (hanyu-dazidian	1 294 17)
+  '((<-denotational
+     ((=ucs		  . #x4EB9)	; 亹
+      ))
+    (ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 19)
+    (total-strokes	 . 21)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs		  . #x4EA0)	; 亠
+     ((=jis-x0208	  . #x5035)	; &GT-00376; [48-21]
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	(=ucs		    . #x2FF5)	; ⿵
-	)
-       ((=big5-cdp	    . #x8B65)	; &CDP-8B65;
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (=ucs		      . #x2FF1)	; ⿱
-	  )
-	 ((=big5-cdp	      . #x8A6E)	; &CDP-8A6E;
-	  )
-	 ((=big5-cdp	      . #x8BC9)	; &CDP-8BC9;
-	  ))
-	))
+     ((=cns11643-2	  . #x664D)	; &C2-664D; [70-45]
       ))
+    (=jef-china3	. #x41DB)	; &JC3-41DB;
+    ))
+(define-char
+  '((ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 22)
+    (total-strokes	 . 24)
     (=ucs		. #x2019F)	; 𠆟
-    (=hanziku-1		. #xE2C4)	; &I-HZK01-E2C4;
+    (->subsumptive
+     ((=daikanwa	  . 00343)	; &M-00343;
+      )
+     ((hanyu-dazidian	  1 294 17)
+      (=hanziku-1	  . #xE2C4)	; &HZK01-E2C4;
+      (=ucs@iso		  . #x2019F)	; &HZK01-E2C4;
+      ))
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇