X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R008-Lid.el;h=98c770d7e8a126debd4e19dd5deecc85da60232b;hb=0e0bc24bbeeac1721546774907e6388f2bf550b3;hp=f89ddb39c43df7cde25387cf0c7670ab3c207dfa;hpb=1ffdcca901995feafd909e77a6071aa138c7ede4;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index f89ddb3..98c770d 100644
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -3,6 +3,17 @@
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (=>ucs@component	. #x4EA0)	; &IWDS1-062;
+    (=>iwds-1		.  0062)	; &IWDS1-062;
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>ucs@component	  . #x4EA0)	; &IWDS1-062;
+      (=>iwds-1		  .  0062)	; &IWDS1-062;
+      ))
+    (ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 0)
+    (total-strokes	 . 2)
     (sound@ja/on/kan	"tou")
     (=ucs		. #x4EA0)	; 亠
     (=+>jis-x0208	. #x5035)	; 亠 [48-21]
@@ -94,6 +105,8 @@
        ((===gt-k	    . 00202)	; &R-GT-K00202;
 	)
        ((===hng-kak	    . 00040)	; &HNG017-00040;
+	)
+       ((===hng-kar	    . 05270)	; &HNG018-05270;
 	))
       ))
     ))
@@ -246,6 +259,8 @@
 	)
        ((===cns11643-1	    . #x446D)	; &R-C1-446D; [36-77]
 	))
+      )
+     ((===hng-kar	  . 00060)	; &HNG018-00060;
       ))
     ))
 (define-char
@@ -317,31 +332,24 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 8)	; ⼇
+    (=>big5-cdp		. #x8BAA)	; &A-CDP-8BAA;
+    ))
+(define-char
   '((<-denotational
-     ((=big5-cdp	  . #x8BAA)	; &CDP-8BAA;
+     ((=>big5-cdp	  . #x8BAA)	; &A-CDP-8BAA;
       ))
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (=gt-k		. 01444)	; &GT-K01444;
-    (=gt-pj-k1		. #x372D)	; &GT-K01444; [23-13]
-    (<-identical@component/connect-below
-     ((=big5-cdp	  . #x8BAA)	; &CDP-8BAA;
-      ))
-    (->subsumptive
-     ((==gt-k		  . 01444)	; &g2-GT-K01444;
-      (<-identical@component/connect-below
-       ((==big5-cdp	    . #x8BAA)	; &g2-CDP-8BAA;
-	))
-      (->subsumptive
-       ((===gt-k	    . 01444)	; &R-GT-K01444;
-	))
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4EA0)	; 亠
+      )
+     ((=ucs		  . #x53E3)	; 口
       ))
-    ))
-(define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 3)
-    (total-strokes	 . 5)
     (=big5-cdp		. #x8BAA)	; &CDP-8BAA;
     (<-simplified@component/connect-below
      ((=ucs		  . #x9AD8)	; 高
@@ -353,15 +361,15 @@
 	)
        ((=ucs		    . #x4EA0)	; 亠
 	)
-       ((=ucs		    . #x53E3)	; 口
+       ((==ucs@unicode	    . #x53E3)	; &g2-AJ1-01969;
+	(==adobe-japan1-0   . 01969)	; &g2-AJ1-01969;
 	))
       (==big5-cdp	  . #x8BAA)	; &g2-CDP-8BAA;
-      (<-simplified@component/connect-below
-       ((==ucs@unicode	    . #x9AD8)	; &g2-GT-60968;
-	(==jis-x0208	    . #x3962)	; &g2-GT-60968; [25-66]
-	))
-      (->subsumptive
-       ((===big5-cdp	    . #x8BAA)	; &R-CDP-8BAA;
+      )
+     ((=gt-k		  . 01444)	; &GT-K01444;
+      (=gt-pj-k1	  . #x372D)	; &GT-K01444; [23-13]
+      (<-identical@component/connect-below
+       ((=big5-cdp	    . #x8BAA)	; &CDP-8BAA;
 	))
       ))
     ))
@@ -420,11 +428,8 @@
 	)
        ((=ucs		    . #x4EA0)	; 亠
 	)
-       ((=ucs@ks	    . #x7236)	; &GT-25336;
-	(=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;
+       ((==ucs@ks	    . #x7236)	; &GT-25336;
+	(=gt		    . 25336)	; &GT-25336;
 	))
       (==ucs@ks		  . #x4EA4)	; &g2-AJ1-13439;
       (==adobe-japan1-4	  . 13439)	; &g2-AJ1-13439;
@@ -457,6 +462,10 @@
 	(=gt-pj-k1	    . #x335C)	; &GT-K01603; [19-60]
 	))
       )
+     ((===hng-kar	  . 05250)	; &HNG018-05250;
+      )
+     ((===hng-kyu	  . 02080)	; &HNG047-02080;
+      )
      ((=decomposition@cid
        ((=ucs		    . #x4EA4)	; 交
 	)
@@ -473,10 +482,8 @@
 	)
        ((=ucs		    . #x4EA0)	; 亠
 	)
-       ((=ucs@unicode	    . #x7236)	; &GT-25337;
-	(=gb2312	    . #x3838)	; &GT-25337; [24-24]
-	(=cns11643-1	    . #x4558)	; &I-C1-4558; [37-56]
-	(=jis-x0213-1	    . #x4963)	; &I-JX1-4963; [41-67]
+       ((==ucs@unicode	    . #x7236)	; &g2-AJ1-03541;
+	(==adobe-japan1-0   . 03541)	; &g2-AJ1-03541;
 	))
       (==ucs@unicode	  . #x4EA4)	; &g2-MJ006467;
       (==mj		  . 006467)	; &g2-MJ006467;
@@ -502,8 +509,6 @@
 	)
        ((===cns11643-1	    . #x4728)	; &R-C1-4728; [39-08]
 	))
-      )
-     ((===hng-kyu	  . 02080)	; &HNG047-02080;
       ))
     ))
 (define-char
@@ -512,14 +517,23 @@
       ))
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x4EA4)	; 交
-      )
-     ((=ucs		  . #xE0103)	; 󠄃
-      ))
     (=mj		. 006468)	; &MJ006468;
     (=hanyo-denshi/ks	. 003610)	; &MJ006468;
-    (=hanyo-denshi/ks/mf . #x0169)	; &I-KSMF-00361;
+    (->subsumptive
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x4EA4)	; 交
+	)
+       ((=ucs		    . #xE0103)	; 󠄃
+	))
+      (==mj		  . 006468)	; &g2-MJ006468;
+      (==hanyo-denshi/ks  . 003610)	; &g2-MJ006468;
+      (->subsumptive
+       ((===hanyo-denshi/ks . 003610)	; &R-HD-KS-003610;
+	(=hanyo-denshi/ks/mf . #x0169)	; &R-HD-KS-003610;
+	)
+       ((===mj		    . 006468)	; &R-MJ006468;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -536,10 +550,6 @@
       ))
     (->subsumptive
      ((==gt-k		  . 01604)	; &g2-GT-K01604;
-      (<-formed@component/connect-right
-       ((==ucs@unicode	    . #x4EA4)	; &g2-MJ006467;
-	(==mj		    . 006467)	; &g2-MJ006467;
-	))
       (->subsumptive
        ((===gt-k	    . 01604)	; &R-GT-K01604;
 	))
@@ -549,11 +559,21 @@
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (=ucs		. #x4EA5)	; 亥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4EA5)	; 亥
+      ))
+    (ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
     (hanyu-dazidian	1 283 5)
     (sound@ja/kun	"inosisi" "i")
     (sound@ja/on	"gai")
-    (=ucs		. #x4EA5)	; 亥
-    (=mj		. 006470)	; &I-MJ006470;
+    (=>ucs@iwds-1	. #x4EA5)	; &MJ006470;
+    (=ucs@unicode	. #x4EA5)	; &MJ006470;
+    (=mj		. 006470)	; &MJ006470;
     (=adobe-japan1-0	. 01195)	; &I-AJ1-01195;
     (=jis-x0208		. #x3067)	; &I-J90-3067; [16-71]
     (=gb2312		. #x3A25)	; &I-G0-3A25; [26-05]
@@ -567,7 +587,7 @@
     (=gt-k		. 01560)	; &I-GT-K01560;
     (=gt-pj-1		. #x3067)	; &I-GT-00387; [16-71]
     (=daikanwa		. 00292)	; &I-M-00292;
-    (=shinjigen		.  0094)	; 亥
+    (=shinjigen		.  0094)	; &MJ006470;
     (->subsumptive
      ((=decomposition@hanyo-denshi
        ((=ucs		    . #x4EA5)	; 亥
@@ -660,6 +680,15 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x4EA5)	; 亥
+      ))
+    (ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (=ucs-itaiji-005	. #x4EA5)	; &U-i005+4EA5;
+    ))
+(define-char
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
@@ -679,6 +708,12 @@
     (=gt-pj-1		. #x4B72)	; &I-GT-00384; [43-82]
     (=daikanwa		. 00293)	; &I-M-00293;
     (=shinjigen		.  0093)	; 亦
+    (<-simplified@CN/component
+     ((=ucs@unicode	  . #x470C)	; &AJ1-18690;
+      (=adobe-japan1-5	  . 18690)	; &AJ1-18690;
+      )
+     ((=ucs		  . #x9FBB)	; é¾»
+      ))
     (->subsumptive
      ((=decomposition@cid
        ((=ucs		    . #x4EA6)	; 亦
@@ -731,6 +766,8 @@
       )
      ((===hng-kak	  . 00030)	; &HNG017-00030;
       )
+     ((===hng-kar	  . 05260)	; &HNG018-05260;
+      )
      ((===hng-nkk	  . 09981)	; &HNG039-09981;
       ))
     ))
@@ -828,7 +865,10 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
+  '((<-denotational
+     ((==>ucs@bucs	  . #x7522)	; &BUCS+7522;
+      ))
+    (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
     (hanyu-dazidian	1 283 3)
@@ -850,6 +890,10 @@
     (=ucs		. #x4EA7)	; 产
     (=gb2312		. #x327A)	; &I-G0-327A; [18-90]
     (=hanziku-1		. #xE06E)	; &I-HZK01-E06E;
+    (<-simplified@CN
+     ((=ucs		  . #x7523)	; 産
+      (=gb12345		  . #x327A)	; 産 [18-90]
+      ))
     ))
 (define-char
   '((=>ucs		. #x4EA7)	; 产
@@ -893,34 +937,27 @@
     (=hanziku-1		. #xE071)	; &I-HZK01-E071;
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
+  '((<-denotational
+     ((=>big5-cdp	  . #x8BAA)	; &A-CDP-8BAA;
+      ))
+    (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4EA0)	; 亠
+      )
+     ((=big5-cdp	  . #x89CC)	; &CDP-89CC;
+      ))
     (=gt-k		. 02128)	; &GT-K02128;
     (=gt-pj-k2		. #x444C)	; &GT-K02128; [36-44]
     (<-simplified@component/connect-below
      ((=ucs		  . #x9AD9)	; 髙
       ))
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x4EA0)	; 亠
-	)
-       ((=big5-cdp	    . #x89CC)	; &CDP-89CC;
-	))
-      (==gt-k		  . 02128)	; &g2-GT-K02128;
-      (<-formed
-       ((==gt-k		    . 01444)	; &g2-GT-K01444;
-	))
-      (<-simplified@component/connect-below
-       ((==ucs@unicode	    . #x9AD9)	; &g2-AJ1-08705;
-	(==adobe-japan1-2   . 08705)	; &g2-AJ1-08705;
-	))
-      (->subsumptive
-       ((===gt-k	    . 02128)	; &R-GT-K02128;
-	))
+     ((==gt-k		  . 02128)	; &g2-GT-K02128;
       ))
     ))
 (define-char
@@ -1010,16 +1047,23 @@
       (=>iwds-1		  .  0345)	; &IWDS1-345;
       ))
     (ideographic-radical . 8)	; ⼇
+    (=ucs		. #x342C)	; 㐬
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x342C)	; 㐬
+      ))
+    (ideographic-radical . 8)	; ⼇
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
      ((=ucs		  . #x20AD3)	; 𠫓
       )
-     ((=big5-cdp	  . #x8BED)	; &GT-10942;
-      (=daikanwa	  . 08674)	; &I-M-08674;
+     ((=ucs		  . #x2BDA7)	; 𫶧
       ))
-    (=ucs		. #x342C)	; 㐬
+    (=>ucs@iwds-1	. #x342C)	; &A-IWDSU+342C;
+    (=>ucs@unicode	. #x342C)	; &A-IWDSU+342C;
     (->subsumptive
      ((ideographic-strokes . 5)
       (total-strokes	   . 7)
@@ -1030,8 +1074,7 @@
        ((=ucs@jis	    . #x20AD3)	; &MJ031960;
 	(=mj		    . 031960)	; &MJ031960;
 	)
-       ((=big5-cdp	    . #x8BED)	; &GT-10942;
-	(=daikanwa	    . 08674)	; &I-M-08674;
+       ((=ucs		    . #x2BDA7)	; 𫶧
 	))
       (=ucs@unicode	  . #x342C)	; &AJ1-17246;
       (=adobe-japan1-5	  . 17246)	; &AJ1-17246;
@@ -1052,7 +1095,8 @@
 	 ((=ucs@jis	      . #x20AD3)	; &MJ031960;
 	  (=mj		      . 031960)	; &MJ031960;
 	  )
-	 ((==daikanwa	      . 08674)	; &g2-GT-10942;
+	 ((==ucs@iso	      . #x2BDA7)	; &g2-GT-10942;
+	  (==daikanwa	      . 08674)	; &g2-GT-10942;
 	  ))
 	(==ucs@unicode	    . #x342C)	; &g2-AJ1-17246;
 	(==adobe-japan1-5   . 17246)	; &g2-AJ1-17246;
@@ -1085,10 +1129,22 @@
        ((=ucs@iso	    . #x20AD3)	; &MJ031959;
 	(=mj		    . 031959)	; &MJ031959;
 	)
-       ((=big5-cdp	    . #x8BED)	; &GT-10942;
-	(=daikanwa	    . 08674)	; &I-M-08674;
+       ((=ucs		    . #x2BDA7)	; 𫶧
 	))
       (=big5-cdp	  . #x8C50)	; &CDP-8C50;
+      (->subsumptive
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((==ucs@iso	      . #x20AD3)	; &g2-MJ031959;
+	  (==mj		      . 031959)	; &g2-MJ031959;
+	  )
+	 ((==ucs@iso	      . #x2BDA7)	; &g2-GT-10942;
+	  (==daikanwa	      . 08674)	; &g2-GT-10942;
+	  ))
+	(==big5-cdp	    . #x8C50)	; &g2-CDP-8C50;
+	))
       ))
     ))
 (define-char
@@ -1172,6 +1228,14 @@
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>big5-cdp	  . #x8BAA)	; &A-CDP-8BAA;
+      )
+     ((=ucs		  . #x5196)	; 冖
+      ))
     (=>big5-cdp		. #x8C4D)	; &A-GT-K02791;
     (=>gt-k		. 02791)	; &A-GT-K02791;
     ))
@@ -1186,7 +1250,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=gt-k		  . 01444)	; &GT-K01444;
+     ((=big5-cdp	  . #x8BAA)	; &CDP-8BAA;
       )
      ((=ucs		  . #x5196)	; 冖
       ))
@@ -1201,16 +1265,13 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((==gt-k		    . 01444)	; &g2-GT-K01444;
+       ((=gt-k		    . 01444)	; &GT-K01444;
 	)
-       ((=ucs		    . #x5196)	; 冖
+       ((==ucs@unicode	    . #x5196)	; &g2-AJ1-04227;
+	(==adobe-japan1-0   . 04227)	; &g2-AJ1-04227;
 	))
       (==big5-cdp	  . #x8C4D)	; &g2-CDP-8C4D;
       (==gt-k		  . 02791)	; &g2-CDP-8C4D;
-      (<-simplified@component/connect-below
-       ((==ucs@unicode	    . #x9AD8)	; &g2-GT-60968;
-	(==jis-x0208	    . #x3962)	; &g2-GT-60968; [25-66]
-	))
       ))
     ))
 (define-char
@@ -1291,6 +1352,13 @@
 	)
        ((===cns11643-1	    . #x4B6A)	; &R-C1-4B6A; [43-74]
 	))
+      )
+     ((=gt-k		  . 03670)	; &GT-K03670;
+      (=gt-pj-k1	  . #x3135)	; &GT-K03670; [17-21]
+      (<-formed@component/connect-right
+       ((=ucs@unicode	    . #x4EAB)	; &AJ1-01687;
+	(=adobe-japan1-0    . 01687)	; &AJ1-01687;
+	))
       ))
     ))
 (define-char
@@ -1310,7 +1378,22 @@
       )
      ((=ucs		  . #x5B50)	; 子
       ))
-    (===hng-kak		. 02720)	; &HNG017-02720;
+    (=mj		. 056895)	; &MJ056895;
+    (=hanyo-denshi/ks	. 003860)	; &MJ056895;
+    (->subsumptive
+     ((==mj		  . 056895)	; &g2-MJ056895;
+      (==hanyo-denshi/ks  . 003860)	; &g2-MJ056895;
+      (->subsumptive
+       ((===hanyo-denshi/ks . 003860)	; &R-HD-KS-003860;
+	(=hanyo-denshi/ks/mf . #x0182)	; &R-HD-KS-003860;
+	)
+       ((===mj		    . 056895)	; &R-MJ056895;
+	)
+       ((===hng-kak	    . 02720)	; &HNG017-02720;
+	)
+       ((===hng-kar	    . 00070)	; &HNG018-00070;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -1492,7 +1575,10 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
+  '((<-denotational
+     ((=>big5-cdp	  . #x8C4D)	; &A-GT-K02791;
+      ))
+    (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
     (ideographic-structure
@@ -1508,6 +1594,9 @@
     (<-simplified@component/connect-below
      ((=ucs		  . #x9AD9)	; 髙
       ))
+    (<-vulgar@component
+     ((=big5-cdp	  . #x8C4D)	; &CDP-8C4D;
+      ))
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1515,20 +1604,10 @@
 	)
        ((==gt-k		    . 02128)	; &g2-GT-K02128;
 	)
-       ((=ucs		    . #x5196)	; 冖
+       ((==ucs@unicode	    . #x5196)	; &g2-AJ1-04227;
+	(==adobe-japan1-0   . 04227)	; &g2-AJ1-04227;
 	))
       (==gt-k		  . 04733)	; &g2-GT-K04733;
-      (<-simplified@component/connect-below
-       ((==ucs@unicode	    . #x9AD9)	; &g2-AJ1-08705;
-	(==adobe-japan1-2   . 08705)	; &g2-AJ1-08705;
-	))
-      (<-vulgar@component
-       ((==gt-k		    . 02791)	; &g2-CDP-8C4D;
-	))
-      (<-vulgar@component/connect-below
-       ((==ucs@unicode	    . #x9AD8)	; &g2-GT-60968;
-	(==jis-x0208	    . #x3962)	; &g2-GT-60968; [25-66]
-	))
       ))
     ))
 (define-char
@@ -2115,6 +2194,14 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (hanyu-dazidian	4 2707 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x7ACB)	; 立
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
     (=ucs		. #x4EB2)	; 亲
     (=gb2312		. #x4757)	; &I-G0-4757; [39-55]
     (=cns11643-3	. #x2B24)	; &I-C3-2B24; [11-04]
@@ -2126,36 +2213,40 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((==ucs@unicode	    . #x7ACB)	; &g2-GT-33181;
-	(==jis-x0208	    . #x4E29)	; &g2-GT-33181; [46-09]
+       ((==ucs@unicode	    . #x7ACB)	; &g2-AJ1-03953;
+	(==adobe-japan1-0   . 03953)	; &g2-AJ1-03953;
 	)
        ((=ucs		    . #x6728)	; 木
 	))
       (==daikanwa	  . 00311)	; &g2-M-00311;
       )
-     ((==ucs@cns	  . #x4EB2)	; &g2-CDP-8BA7;
-      (==cns11643-3	  . #x2B24)	; &g2-CDP-8BA7; [11-04]
-      (==big5-cdp	  . #x8BA7)	; &g2-CDP-8BA7;
-      (==jef-china3	  . #x81D2)	; &g2-CDP-8BA7;
-      (->subsumptive
-       ((===big5-cdp	    . #x8BA7)	; &R-CDP-8BA7;
-	)
-       ((===jef-china3	    . #x81D2)	; &R-JC3-81D2;
-	)
-       ((===cns11643-3	    . #x2B24)	; &R-C3-2B24; [11-04]
-	))
-      )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((==ucs@unicode	    . #x7ACB)	; &g2-GT-33181;
-	(==jis-x0208	    . #x4E29)	; &g2-GT-33181; [46-09]
+       ((=ucs		    . #x7ACB)	; 立
 	)
        ((=ucs		    . #x6729)	; 朩
 	))
-      (==ucs@unicode	  . #x4EB2)	; &g2-UU+4EB2;
-      (==gb2312		  . #x4757)	; &g2-UU+4EB2; [39-55]
+      (=>>ucs@unicode	  . #x4EB2)	; &G-CDP-8BA7;
+      (=>>big5-cdp	  . #x8BA7)	; &G-CDP-8BA7;
+      (->subsumptive
+       ((==ucs@cns	    . #x4EB2)	; &g2-CDP-8BA7;
+	(==cns11643-3	    . #x2B24)	; &g2-CDP-8BA7; [11-04]
+	(==big5-cdp	    . #x8BA7)	; &g2-CDP-8BA7;
+	(==jef-china3	    . #x81D2)	; &g2-CDP-8BA7;
+	(->subsumptive
+	 ((===big5-cdp	      . #x8BA7)	; &R-CDP-8BA7;
+	  )
+	 ((===cns11643-3      . #x2B24)	; &R-C3-2B24; [11-04]
+	  )
+	 ((===jef-china3      . #x81D2)	; &R-JC3-81D2;
+	  ))
+	)
+       ((==ucs@unicode	    . #x4EB2)	; &g2-UU+4EB2;
+	(==ucs@JP/hanazono  . nil)
+	(==gb2312	    . #x4757)	; &g2-UU+4EB2; [39-55]
+	))
       ))
     ))
 (define-char
@@ -2402,8 +2493,8 @@
 	(=gb2312	    . #x596F)	; &GT-00375; [57-79]
 	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
-       ((==ucs@unicode	    . #x821B)	; &g2-HD-JA-4124;
-	(==jis-x0208	    . #x4124)	; &g2-HD-JA-4124; [33-04]
+       ((==ucs@unicode	    . #x821B)	; &g2-MJ021365;
+	(==mj		    . 021365)	; &g2-MJ021365;
 	)
        ((=ucs		    . #x51E0)	; 几
 	))
@@ -2491,7 +2582,6 @@
     (=cns11643-4	. #x2B5F)	; &I-C4-2B5F; [11-63]
     (=daikanwa		. 00316)	; &I-M-00316;
     (=shinjigen		.  0105)	; 𠅘
-    (=hanziku-1		. #xE154)	; &I-HZK01-E154;
     (<-vulgar
      ((=ucs		  . #x4EAD)	; 亭
       (=jis-x0208	  . #x4462)	; &I-J90-4462; [36-66]
@@ -2524,9 +2614,13 @@
 	)
        ((===adobe-japan1-5  . 20075)	; &R-AJ1-20075;
 	)
+       ((===cns11643-4	    . #x2B5F)	; &R-C4-2B5F; [11-63]
+	)
        ((===ucs@iso	    . #x20158)	; &R-U-00020158;
 	)
-       ((===cns11643-4	    . #x2B5F)	; &R-C4-2B5F; [11-63]
+       ((=hanziku-1	    . #xE154)	; &HZK01-E154;
+	)
+       ((===hng-kar	    . 00080)	; &HNG018-00080;
 	))
       ))
     ))
@@ -3484,39 +3578,31 @@
     (total-strokes	 . 13)
     (hanyu-dazidian	1 291 8)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x516D)	; 六
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
       )
-     ((=big5-cdp	  . #x8BB7)	; &CDP-8BB7;
+     ((=ucs		  . #x8863)	; è¡£
       )
-     ((=big5-cdp	  . #x8B67)	; &CDP-8B67;
+     ((=big5-cdp-itaiji-001 . #x8CA3)	; &CDP-i001-8CA3;
       ))
     (=ucs		. #x342E)	; 㐮
     (=adobe-japan1-4	. 14216)	; &I-AJ1-14216;
     (=cns11643-3	. #x4034)	; &I-C3-4034; [32-20]
     (=jis-x0213-2	. #x2133)	; &I-JX2-2133; [01-19]
     (=daikanwa		. 00329)	; &I-M-00329;
-    (=hanziku-1		. #xE1F8)	; &I-HZK01-E1F8;
     (=jef-china3	. #x41D9)	; &I-JC3-41D9;
+    (<-simplified@misc
+     ((=ucs		  . #x8944)	; 襄
+      (=daikanwa	  . 34556)	; &I-M-34556;
+      ))
+    (<-simplified@misc*sources
+     daikanwa)
     (->subsumptive
      ((=decomposition@cid
        ((=ucs		    . #x342E)	; 㐮
 	)
        ((=ucs		    . #xE0100)	; 󠄀
 	))
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	(=ucs		    . #x2FF3)	; ⿳
-	)
-       ((==ucs@unicode	    . #x516D)	; &g2-AJ1-04065;
-	(==adobe-japan1-0   . 04065)	; &g2-AJ1-04065;
-	)
-       ((=big5-cdp	    . #x8BB7)	; &CDP-8BB7;
-	)
-       ((=big5-cdp	    . #x8B67)	; &CDP-8B67;
-	))
       (==ucs@unicode	  . #x342E)	; &g2-AJ1-14216;
       (==adobe-japan1-4	  . 14216)	; &g2-AJ1-14216;
       (==jis-x0213-2	  . #x2133)	; &g2-AJ1-14216; [01-19]
@@ -3532,6 +3618,8 @@
        ((===jef-china3	    . #x41D9)	; &R-JC3-41D9;
 	)
        ((===ucs@unicode	    . #x342E)	; &R-UU+342E;
+	)
+       ((=hanziku-1	    . #xE1F8)	; &HZK01-E1F8;
 	))
       )
      ((==ucs@cns	  . #x342E)	; &g2-CU+342E;
@@ -3844,6 +3932,49 @@
       ))
     ))
 (define-char
+  '((ideographic-radical@ucs . 178)	; â¾±
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@ucs*sources
+     daikanwa cns11643 ucs)
+    (ideographic-strokes@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@misc . 8)	; ⼇
+    (ideographic-strokes@misc . 13)
+    (total-strokes	 . 15)
+    (hanyu-dazidian	1 293 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x516D)	; 六
+      )
+     ((=ucs		  . #x97CB)	; 韋
+      )
+     ((=ucs		  . #x4E42)	; 乂
+      ))
+    (=ucs		. #x293AE)	; 𩎮
+    (=cns11643-5	. #x5251)	; &I-C5-5251; [50-49]
+    (=daikanwa		. 43141)	; &I-M-43141;
+    (->subsumptive
+     ((ideographic-radical . 178)	; â¾±
+      (ideographic-strokes . 6)
+      (==daikanwa	  . 43141)	; &g2-M-43141;
+      )
+     ((ideographic-radical . 178)	; â¾±
+      (ideographic-strokes . 6)
+      (==ucs@iso	  . #x293AE)	; &g2-IU-000293AE;
+      )
+     ((ideographic-radical . 178)	; â¾±
+      (ideographic-strokes . 6)
+      (==ucs@cns	  . #x293AE)	; &g2-CU+293AE;
+      (==cns11643-5	  . #x5251)	; &g2-CU+293AE; [50-49]
+      )
+     ((ideographic-radical . 8)	; ⼇
+      (ideographic-strokes . 13)
+      (=hanziku-1	  . #xE27E)	; &HZK01-E27E;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
@@ -3973,25 +4104,6 @@
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 13)
-    (total-strokes	 . 15)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 293)
-    (hanyu-dazidian-char . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x516D)	; 六
-      )
-     ((=ucs		  . #x97CB)	; 韋
-      )
-     ((=ucs		  . #x4E42)	; 乂
-      ))
-    (=hanziku-1		. #xE27E)	; &HZK01-E27E;
-    ))
-(define-char
-  '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
     (hanyu-dazidian	1 293 17)
@@ -4027,6 +4139,14 @@
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4EAF)	; 亯
+      )
+     ((=ucs		  . #x34B6)	; 㒶
+      ))
     (=ucs		. #x2018C)	; 𠆌
     ))
 (define-char
@@ -4037,6 +4157,15 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
     (hanyu-dazidian	1 293 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs@unicode	  . #x4EAF)	; &AJ1-21082;
+      (=adobe-japan1-6	  . 21082)	; &AJ1-21082;
+      )
+     ((=ucs		  . #x34B6)	; 㒶
+      ))
     (=ucs@iso		. #x2018C)	; &C7-2C3F;
     (=cns11643-7	. #x2C3F)	; &C7-2C3F; [12-31]
     (=daikanwa		. 00334)	; &I-M-00334;
@@ -4062,10 +4191,11 @@
 	 ((==ucs@unicode      . #x4EAF)	; &g2-AJ1-21082;
 	  (==adobe-japan1-6   . 21082)	; &g2-AJ1-21082;
 	  )
-	 ((==ucs@unicode      . #x516B)	; &MJ007274;
-	  (=mj		      . 007274)	; &MJ007274;
+	 ((==ucs@unicode      . #x516B)	; &g2-MJ007274;
+	  (==mj		      . 007274)	; &g2-MJ007274;
 	  )
-	 ((=ucs		      . #x767D)	; 白
+	 ((==ucs@unicode      . #x767D)	; &g2-AJ1-03368;
+	  (==adobe-japan1-0   . 03368)	; &g2-AJ1-03368;
 	  ))
 	(==ucs@iso	    . #x2018C)	; &g2-M-00334;
 	(==daikanwa	    . 00334)	; &g2-M-00334;
@@ -4224,6 +4354,14 @@
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>big5-cdp	  . #x8C4D)	; &A-GT-K02791;
+      )
+     ((=ucs		  . #x97F3)	; 音
+      ))
     (=ucs		. #x20192)	; 𠆒
     ))
 (define-char
@@ -4253,8 +4391,8 @@
 	)
        ((==gt-k		    . 02791)	; &g2-CDP-8C4D;
 	)
-       ((==ucs@unicode	    . #x97F3)	; &g2-GT-58109;
-	(==jis-x0208	    . #x323B)	; &g2-GT-58109; [18-27]
+       ((==ucs@unicode	    . #x97F3)	; &g2-AJ1-01339;
+	(==adobe-japan1-0   . 01339)	; &g2-AJ1-01339;
 	))
       (==ucs@iso	  . #x20192)	; &g2-M-00338;
       (==cns11643-7	  . #x2C3D)	; &g2-M-00338; [12-29]
@@ -4389,25 +4527,15 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
     (hanyu-dazidian	1 294 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=big5-cdp	    . #x8BEC)	; &CDP-8BEC;
+    (=ucs		. #x20198)	; 𠆘
+    (->subsumptive
+     ((==ucs@iso	  . #x20198)	; &g2-IU-00020198;
+      (->subsumptive
+       ((===ucs@iso	    . #x20198)	; &R-U-00020198;
 	)
-       ((=ucs		    . #x516B)	; 八
+       ((=hanziku-1	    . #xE2B4)	; &HZK01-E2B4;
 	))
-      )
-     ((=big5-cdp	  . #x8BE2)	; &CDP-8BE2;
-      )
-     ((=big5-cdp	  . #x8B67)	; &CDP-8B67;
       ))
-    (=ucs		. #x20198)	; 𠆘
-    (=hanziku-1		. #xE2B4)	; &I-HZK01-E2B4;
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -4594,7 +4722,6 @@
     (=ucs		. #x2019C)	; 𠆜
     (=cns11643-7	. #x4623)	; &I-C7-4623; [38-03]
     (=daikanwa		. 48577)	; &I-M-48577;
-    (=hanziku-1		. #xE2BA)	; &I-HZK01-E2BA;
     (->subsumptive
      ((ideographic-radical . 210)	; ⿑
       (ideographic-strokes . 8)
@@ -4604,17 +4731,19 @@
 	)
        ((==big5-cdp	    . #x8DEB)	; &g2-CDP-8DEB;
 	)
-       ((=ucs@unicode	    . #x59BB)	; &AJ1-02106;
-	(=adobe-japan1-0    . 02106)	; &AJ1-02106;
+       ((==ucs@unicode	    . #x59BB)	; &g2-AJ1-02106;
+	(==adobe-japan1-0   . 02106)	; &g2-AJ1-02106;
 	))
       (==daikanwa	  . 48577)	; &g2-M-48577;
       )
      ((==ucs@iso	  . #x2019C)	; &g2-IU-0002019C;
       (==cns11643-7	  . #x4623)	; &g2-IU-0002019C; [38-03]
       (->subsumptive
+       ((===cns11643-7	    . #x4623)	; &R-C7-4623; [38-03]
+	)
        ((===ucs@iso	    . #x2019C)	; &R-U-0002019C;
 	)
-       ((===cns11643-7	    . #x4623)	; &R-C7-4623; [38-03]
+       ((=hanziku-1	    . #xE2BA)	; &HZK01-E2BA;
 	))
       ))
     ))
@@ -4689,6 +4818,14 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 20)
     (total-strokes	 . 22)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4EA0)	; 亠
+      )
+     ((=ucs@unicode	  . #x820B)	; &UU+820B;
+      ))
     (=ucs@unicode	. #x4EB9)	; &MJ006491;
     (=mj		. 006491)	; &MJ006491;
     (=adobe-japan1-4	. 14309)	; &I-AJ1-14309;
@@ -4709,14 +4846,6 @@
 	)
        ((=ucs		    . #xE0101)	; 󠄁
 	))
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x4EA0)	; 亠
-	)
-       ((=ucs@unicode	    . #x820B)	; &UU+820B;
-	))
       (==ucs@unicode	  . #x4EB9)	; &g2-MJ006491;
       (==mj		  . 006491)	; &g2-MJ006491;
       (==adobe-japan1-4	  . 14309)	; &g2-MJ006491;