X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R116-Cave.el;h=2ce4fe0b684d4b577ad67723f0cfbfe0b5f0c094;hb=c99f49d3680b63a393f2c10c39a7a8481f305dcb;hp=b584bb88eeae6ff73997d19f4e786720343edb0f;hpb=aa9165fbe01914e534449721658f62f48dc61ca4;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el
index b584bb8..2ce4fe0 100644
--- a/lisp/utf-2000/Ideograph-R116-Cave.el
+++ b/lisp/utf-2000/Ideograph-R116-Cave.el
@@ -7,7 +7,7 @@
     (=jis-x0208-1978	. #x376A)	; ø»‚
     (=jis-x0208-1983	. #x376A)	; ø»†±¥
     (=ks-x1001		. #x7A6B)	; ø»Šž„
-    (ideograph-daikanwa . 25406)	; ø¸†Œ¾
+    (=daikanwa		. 25406)	; ø¸†Œ¾
     (=jef-china3	. #x5DCB)	; øº…·‹
     ))
 (define-char
@@ -17,7 +17,9 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
     (=jis-x0208-1990	. #x376A)	; ø½Š—™
+    (=gt-pj-1		. #x376A)	; ý¡€ˆ€˜
     (=ucs@jis		. #x7A74)	; ø½Š—™
+    (=gt		. 32792)	; ý¡€ˆ€˜
     ))
 (define-char
   '((morohashi-daikanwa	25406 0 1)
@@ -30,36 +32,78 @@
     (=ucs		. #x7A74)	; ç©´
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x25922)	; 𥤢
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 0)
+    (total-strokes	 . 5)
+    (=gt-pj-5		. #x5762)	; ý¡€ˆ€—
+    (=daikanwa		. 49412)	; ø¸Œ„„
+    (=gt		. 32791)	; ý¡€ˆ€—
+    ))
+(define-char
+  '((morohashi-daikanwa	49412 0 0)
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
-    (chinese-cns11643-6 . #x2337)	; ø»›¸‚
-    (ideograph-daikanwa . 49412)	; ø¸Œ„„
+    (=cns11643-6	. #x2337)	; ø»›¸‚
     (=ucs		. #x25922)	; 𥤢
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A75)	; 穵
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 1)
     (total-strokes	 . 6)
     (=jis-x0212		. #x514F)	; ø»‹«ž
-    (=cns11643-2	. #x2268)	; ø»“…
     (=jis-x0213-2-2000	. #x732B)	; ø»¦•¦
-    (ideograph-daikanwa . 25407)	; ø¸†Œ¿
+    (=gt-pj-5		. #x5763)	; ý¡€ˆ€™
+    (=daikanwa		. 25407)	; ø¸†Œ¿
+    (=ucs@jis		. #x7A75)	; ø»‹«ž
+    (=gt		. 32793)	; ý¡€ˆ€™
+    ))
+(define-char
+  '((=>ucs		. #x7A75)	; 穵
+    (morohashi-daikanwa	25407 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 1)
+    (total-strokes	 . 6)
+    (=cns11643-2	. #x2268)	; ø»“…
+    ))
+(define-char
+  '((morohashi-daikanwa	25407 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 1)
+    (total-strokes	 . 6)
     (=ucs		. #x7A75)	; 穵
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A76)	; 究
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 2)
     (total-strokes	 . 7)
     (shinjigen-2	. 5679)
-    (=gb2312		. #x3E3F)	; ø»„±ˆ
     (=jis-x0208		. #x3566)	; ø½Š”™
     (=ks-x1001		. #x4F3C)	; ø»‰ž‹
-    (=iso-ir165		. #x3E3F)	; ø»™˜
-    (=cns11643-1	. #x4B36)	; ø»’€
-    (=gt-pj-1		. #x3566)	; 究
-    (ideograph-daikanwa . 25409)	; ø¸†
+    (=gt-pj-1		. #x3566)	; ý¡€ˆ€›
+    (=daikanwa		. 25409)	; ø¸†
     (=gt-k		. 02520)	; ý¡„€§˜
+    (=ucs@jis		. #x7A76)	; ø½Š”™
+    (=gt		. 32795)	; ý¡€ˆ€›
+    ))
+(define-char
+  '((=>ucs		. #x7A76)	; 究
+    (morohashi-daikanwa	25409 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 2)
+    (total-strokes	 . 7)
+    (=cns11643-1	. #x4B36)	; ø»’€
+    ))
+(define-char
+  '((morohashi-daikanwa	25409 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 2)
+    (total-strokes	 . 7)
+    (=gb2312		. #x3E3F)	; ø»„±ˆ
+    (=iso-ir165		. #x3E3F)	; ø»™˜
     (=ucs		. #x7A76)	; 究
     ))
 (define-char
@@ -91,30 +135,61 @@
     (=ucs		. #x25924)	; 𥤤
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A78)	; 穸
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (=gb2312		. #x7136)	; ø»…»¹
     (=jis-x0212		. #x5150)	; ø»‹«Ÿ
-    (=iso-ir165		. #x7136)	; ø»Ž¤‰
-    (=cns11643-2	. #x2845)	; ø»“—–
     (=jis-x0213-2-2000	. #x732C)	; ø»¦•§
-    (ideograph-daikanwa . 25413)	; ø¸†…
+    (=daikanwa		. 25413)	; ø¸†…
+    (=ucs@jis		. #x7A78)	; ø»‹«Ÿ
+    ))
+(define-char
+  '((=>ucs		. #x7A78)	; 穸
+    (morohashi-daikanwa	25413 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 3)
+    (total-strokes	 . 8)
+    (=cns11643-2	. #x2845)	; ø»“—–
+    ))
+(define-char
+  '((morohashi-daikanwa	25413 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 3)
+    (total-strokes	 . 8)
+    (=gb2312		. #x7136)	; ø»…»¹
+    (=iso-ir165		. #x7136)	; ø»Ž¤‰
     (=ucs		. #x7A78)	; 穸
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A79)	; 穹
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
     (shinjigen-2	. 5680)
-    (=gb2312		. #x7137)	; ø»…»º
     (=jis-x0208		. #x6356)	; ø½‹—­
     (=ks-x1001		. #x4F62)	; ø»‰ž±
-    (=iso-ir165		. #x7137)	; ø»Ž¤Š
-    (=cns11643-1	. #x4F29)	; ø»’†ˆ
-    (=gt-pj-1		. #x6356)	; 穹
-    (ideograph-daikanwa . 25414)	; ø¸††
+    (=gt-pj-1		. #x6356)	; ý¡€ˆ€¢
+    (=daikanwa		. 25414)	; ø¸††
     (=gt-k		. 03904)	; ý¡„€½€
+    (=ucs@jis		. #x7A79)	; ø½‹—­
+    (=gt		. 32802)	; ý¡€ˆ€¢
+    ))
+(define-char
+  '((=>ucs		. #x7A79)	; 穹
+    (morohashi-daikanwa	25414 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 3)
+    (total-strokes	 . 8)
+    (=cns11643-1	. #x4F29)	; ø»’†ˆ
+    ))
+(define-char
+  '((morohashi-daikanwa	25414 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 3)
+    (total-strokes	 . 8)
+    (=gb2312		. #x7137)	; ø»…»º
+    (=iso-ir165		. #x7137)	; ø»Ž¤Š
     (=ucs		. #x7A79)	; 穹
     ))
 (define-char
@@ -125,10 +200,11 @@
     (shinjigen-2	. 5681)
     (=jis-x0208		. #x3675)	; ø½Š–†
     (=ks-x1001		. #x4D76)	; ø»‰œ‰
-    (=gt-pj-1		. #x3675)	; ø½Š–†
-    (ideograph-daikanwa . 25415)	; ø¸†‡
+    (=gt-pj-1		. #x3675)	; ý¡€ˆ€¤
+    (=daikanwa		. 25415)	; ø¸†‡
     (=gt-k		. 03682)	; ý¡„€¹¢
     (=ucs@jis		. #x7A7A)	; ø½Š–†
+    (=gt		. 32804)	; ý¡€ˆ€¤
     ))
 (define-char
   '((=>ucs		. #x7A7A)	; 空
@@ -160,7 +236,7 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
     (=cns11643-2	. #x2846)	; ø»“——
-    (ideograph-daikanwa . 25417)	; ø¸†‰
+    (=daikanwa		. 25417)	; ø¸†‰
     (=ucs		. #x7A7B)	; ç©»
     ))
 (define-char
@@ -170,10 +246,11 @@
     (total-strokes	 . 8)
     (shinjigen-2	. 5683)
     (=jis-x0208		. #x464D)	; ø½Š¬¾
-    (=gt-pj-1		. #x464D)	; ø½Š¬¾
-    (ideograph-daikanwa . 25424)	; ø¸†
+    (=gt-pj-1		. #x464D)	; ý¡€ˆ€«
+    (=daikanwa		. 25424)	; ø¸†
     (=gt-k		. 03789)	; ý¡„€»
     (=ucs@jis		. #x7A81)	; ø½Š¬¾
+    (=gt		. 32811)	; ý¡€ˆ€«
     ))
 (define-char
   '((=>ucs@jis		. #x7A81)	; ø½Š¬¾
@@ -189,14 +266,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (ideograph-daikanwa . 25428)	; ø¸†”
+    (=daikanwa		. 25428)	; ø¸†”
     ))
 (define-char
   '((morohashi-daikanwa	25428 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2D4E)	; ø»œ‡…
+    (=cns11643-6	. #x2D4E)	; ø»œ‡…
     (=ucs		. #x4192)	; 䆒
     ))
 (define-char
@@ -224,35 +301,35 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2D4D)	; ø»œ‡„
+    (=cns11643-6	. #x2D4D)	; ø»œ‡„
     (=ucs		. #x2592A)	; 𥤪
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2D4C)	; ø»œ‡ƒ
+    (=cns11643-6	. #x2D4C)	; ø»œ‡ƒ
     (=ucs		. #x2592B)	; 𥤫
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2D4F)	; ø»œ‡†
+    (=cns11643-6	. #x2D4F)	; ø»œ‡†
     (=ucs		. #x2592D)	; 𥤭
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2D4B)	; ø»œ‡‚
+    (=cns11643-6	. #x2D4B)	; ø»œ‡‚
     (=ucs		. #x25930)	; 𥤰
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25429)	; ø¸†•
+    (=daikanwa		. 25429)	; ø¸†•
     (=ucs		. #x7A7C)	; 穼
     ))
 (define-char
@@ -264,14 +341,31 @@
     (=cns11643-3	. #x2E44)	; ø»•ª
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A7D)	; 穽
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
     (shinjigen-2	. 5685)
     (=jis-x0208		. #x6357)	; ø½‹—®
     (=ks-x1001		. #x6F70)	; ø»Š¿
+    (=gt-pj-1		. #x6357)	; ý¡€ˆ€¸
+    (=daikanwa		. 25433)	; ø¸†™
+    (=ucs@jis		. #x7A7D)	; ø½‹—®
+    (=gt		. 32824)	; ý¡€ˆ€¸
+    ))
+(define-char
+  '((=>ucs		. #x7A7D)	; 穽
+    (morohashi-daikanwa	25433 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
     (=cns11643-3	. #x2E47)	; ø»•ª
-    (ideograph-daikanwa . 25433)	; ø¸†™
+    ))
+(define-char
+  '((morohashi-daikanwa	25433 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
     (=ucs		. #x7A7D)	; 穽
     ))
 (define-char
@@ -280,7 +374,7 @@
     (total-strokes	 . 9)
     (=jis-x0212		. #x5151)	; ø»‹« 
     (=cns11643-2	. #x2C61)	; ø»“ª
-    (ideograph-daikanwa . 25435)	; ø¸†›
+    (=daikanwa		. 25435)	; ø¸†›
     (=ucs		. #x7A7E)	; 穾
     ))
 (define-char
@@ -288,7 +382,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25436)	; ø¸†œ
+    (=daikanwa		. 25436)	; ø¸†œ
     ))
 (define-char
   '((=>ucs		. #x7A7F)	; ç©¿
@@ -315,10 +409,11 @@
     (total-strokes	 . 9)
     (=jis-x0208		. #x407C)	; ø½Š¤¹
     (=ks-x1001		. #x743E)	; ø»Š”£
-    (=gt-pj-1		. #x407C)	; ø½Š¤¹
+    (=gt-pj-1		. #x407C)	; ý¡€ˆš
     (=gt-k		. 06486)	; ý¡„¥–
     (=jef-china3	. #x5DD7)	; øº…·—
     (=ucs@jis		. #x7A7F)	; ø½Š¤¹
+    (=gt		. 32858)	; ý¡€ˆš
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
@@ -328,7 +423,7 @@
     (=jis-x0212		. #x5152)	; ø»‹«¡
     (=iso-ir165		. #x7138)	; ø»Ž¤‹
     (=cns11643-2	. #x2C60)	; ø»“©
-    (ideograph-daikanwa . 25438)	; ø¸†ž
+    (=daikanwa		. 25438)	; ø¸†ž
     (=ucs		. #x7A80)	; 窀
     ))
 (define-char
@@ -340,7 +435,7 @@
     (total-strokes	 . 9)
     (=ks-x1001		. #x544D)	; ø»‰¥²
     (=jis-x0213-1-2000	. #x7951)	; ø»¤”¼
-    (ideograph-daikanwa . 25439)	; ø¸†Ÿ
+    (=daikanwa		. 25439)	; ø¸†Ÿ
     (=jef-china3	. #x5DCD)	; øº…·
     (=ucs@ks		. #x7A81)	; 突
     (=ucs		. #xFA55)	; 突
@@ -372,7 +467,7 @@
     (=jis-x0212		. #x5153)	; ø»‹«¢
     (=cns11643-3	. #x2E49)	; ø»•ª’
     (=jis-x0213-2-2000	. #x732D)	; ø»¦•¨
-    (ideograph-daikanwa . 25440)	; ø¸† 
+    (=daikanwa		. 25440)	; ø¸† 
     (=ucs		. #x7A82)	; 窂
     ))
 (define-char
@@ -380,14 +475,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25441)	; ø¸†¡
+    (=daikanwa		. 25441)	; ø¸†¡
     ))
 (define-char
   '((morohashi-daikanwa	25441 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x3359)	; ø»œ„
+    (=cns11643-6	. #x3359)	; ø»œ„
     (=ucs		. #x25935)	; 𥤵
     ))
 (define-char
@@ -395,14 +490,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25442)	; ø¸†¢
+    (=daikanwa		. 25442)	; ø¸†¢
     ))
 (define-char
   '((morohashi-daikanwa	25442 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x335B)	; ø»œ†
+    (=cns11643-6	. #x335B)	; ø»œ†
     (=ucs		. #x25936)	; 𥤶
     ))
 (define-char
@@ -410,14 +505,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25443)	; ø¸†£
+    (=daikanwa		. 25443)	; ø¸†£
     ))
 (define-char
   '((morohashi-daikanwa	25443 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x3358)	; ø»œƒ
+    (=cns11643-6	. #x3358)	; ø»œƒ
     (=ucs		. #x25937)	; 𥤷
     ))
 (define-char
@@ -425,7 +520,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25444)	; ø¸†¤
+    (=daikanwa		. 25444)	; ø¸†¤
     ))
 (define-char
   '((morohashi-daikanwa	25444 0 0)
@@ -440,7 +535,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25445)	; ø¸†¥
+    (=daikanwa		. 25445)	; ø¸†¥
     ))
 (define-char
   '((morohashi-daikanwa	25445 0 0)
@@ -455,7 +550,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25446)	; ø¸†¦
+    (=daikanwa		. 25446)	; ø¸†¦
     ))
 (define-char
   '((morohashi-daikanwa	25446 0 0)
@@ -470,7 +565,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25447)	; ø¸†§
+    (=daikanwa		. 25447)	; ø¸†§
     ))
 (define-char
   '((morohashi-daikanwa	25447 0 0)
@@ -485,14 +580,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25448)	; ø¸†¨
+    (=daikanwa		. 25448)	; ø¸†¨
     ))
 (define-char
   '((morohashi-daikanwa	25448 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x335A)	; ø»œ…
+    (=cns11643-6	. #x335A)	; ø»œ…
     (=ucs		. #x2593C)	; 𥤼
     ))
 (define-char
@@ -500,14 +595,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25449)	; ø¸†©
+    (=daikanwa		. 25449)	; ø¸†©
     ))
 (define-char
   '((morohashi-daikanwa	25449 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x335C)	; ø»œ‡
+    (=cns11643-6	. #x335C)	; ø»œ‡
     (=ucs		. #x2593D)	; 𥤽
     ))
 (define-char
@@ -515,7 +610,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25450)	; ø¸†ª
+    (=daikanwa		. 25450)	; ø¸†ª
     ))
 (define-char
   '((morohashi-daikanwa	25450 0 0)
@@ -530,14 +625,19 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x335D)	; ø»œˆ
+    (=cns11643-6	. #x335D)	; ø»œˆ
     ))
 (define-char
   '((=>ucs		. #x7A83)	; 窃
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 25453)	; ø¸†­
+    (shinjigen-2	. 5687)
+    (=jis-x0208		. #x4060)	; ø½Š¤
+    (=gt-pj-1		. #x4060)	; ý¡€ˆ€º
+    (=daikanwa		. 25453)	; ø¸†­
+    (=ucs@jis		. #x7A83)	; ø½Š¤
+    (=gt		. 32826)	; ý¡€ˆ€º
     ))
 (define-char
   '((=>ucs		. #x7A83)	; 窃
@@ -545,9 +645,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (shinjigen-2	. 5687)
-    (=jis-x0208		. #x4060)	; ø½Š¤
-    (=ucs@jis		. #x7A83)	; ø½Š¤
+    (=cns11643-3	. #x2E48)	; ø»•ª‘
     ))
 (define-char
   '((morohashi-daikanwa	25453 0 1)
@@ -556,7 +654,6 @@
     (total-strokes	 . 9)
     (=gb2312		. #x4754)	; ø»„¾«
     (=iso-ir165		. #x4754)	; ø»¦»
-    (=cns11643-3	. #x2E48)	; ø»•ª‘
     (=ucs		. #x7A83)	; 窃
     ))
 (define-char
@@ -602,18 +699,34 @@
     (=ucs		. #x2593F)	; 𥤿
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A84)	; 窄
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (shinjigen-2	. 5691)
-    (=gb2312		. #x552D)	; ø»…’¨
     (=jis-x0208		. #x3A75)	; ø½Š›¾
     (=ks-x1001		. #x7338)	; ø»Š’¿
-    (=iso-ir165		. #x552D)	; ø»º¸
-    (=cns11643-1	. #x5739)	; ø»’’ˆ
-    (=gt-pj-1		. #x3A75)	; 窄
-    (ideograph-daikanwa . 25455)	; ø¸†¯
+    (=gt-pj-1		. #x3A75)	; ý¡€ˆ”
+    (=daikanwa		. 25455)	; ø¸†¯
     (=gt-k		. 06438)	; ý¡„¤¦
+    (=ucs@jis		. #x7A84)	; ø½Š›¾
+    (=gt		. 32852)	; ý¡€ˆ”
+    ))
+(define-char
+  '((=>ucs		. #x7A84)	; 窄
+    (morohashi-daikanwa	25455 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=cns11643-1	. #x5739)	; ø»’’ˆ
+    ))
+(define-char
+  '((morohashi-daikanwa	25455 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=gb2312		. #x552D)	; ø»…’¨
+    (=iso-ir165		. #x552D)	; ø»º¸
     (=ucs		. #x7A84)	; 窄
     ))
 (define-char
@@ -624,7 +737,7 @@
     (=iso-ir165		. #x7D70)	; ø»Ž¶«
     (=cns11643-2	. #x315B)	; ø»“¤º
     (=jis-x0213-1-2000	. #x7952)	; ø»¤”½
-    (ideograph-daikanwa . 25458)	; ø¸†²
+    (=daikanwa		. 25458)	; ø¸†²
     (=ucs		. #x7A85)	; 窅
     ))
 (define-char
@@ -633,7 +746,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=jis-x0212		. #x5155)	; ø»‹«¤
-    (ideograph-daikanwa . 25459)	; ø¸†³
+    (=daikanwa		. 25459)	; ø¸†³
     (=jef-china3	. #x5DCE)	; øº…·Ž
     (=ucs@jis		. #x7A86)	; ø»‹«¤
     ))
@@ -655,32 +768,77 @@
     (=ucs		. #x7A86)	; 窆
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A87)	; 窇
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=daikanwa		. 25461)	; ø¸†µ
+    ))
+(define-char
+  '((=>ucs		. #x7A87)	; 窇
+    (morohashi-daikanwa	25461 0 0)
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=cns11643-2	. #x315F)	; ø»“¤¾
-    (ideograph-daikanwa . 25461)	; ø¸†µ
+    ))
+(define-char
+  '((morohashi-daikanwa	25461 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
     (=ucs		. #x7A87)	; 窇
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A88)	; 窈
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (shinjigen-2	. 5695)
-    (=gb2312		. #x713A)	; ø»…»½
     (=jis-x0208		. #x6358)	; ø½‹—¯
     (=ks-x1001		. #x6921)	; ø»Šƒ¼
-    (=iso-ir165		. #x713A)	; ø»Ž¤
+    (=gt-pj-1		. #x6358)	; ý¡€ˆ¦
+    (=daikanwa		. 25463)	; ø¸†·
+    (=ucs@jis		. #x7A88)	; ø½‹—¯
+    (=gt		. 32870)	; ý¡€ˆ¦
+    ))
+(define-char
+  '((=>ucs		. #x7A88)	; 窈
+    (morohashi-daikanwa	25463 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
     (=cns11643-1	. #x573A)	; ø»’’‰
-    (ideograph-daikanwa . 25463)	; ø¸†·
+    ))
+(define-char
+  '((morohashi-daikanwa	25463 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=gb2312		. #x713A)	; ø»…»½
+    (=iso-ir165		. #x713A)	; ø»Ž¤
     (=ucs		. #x7A88)	; 窈
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A89)	; 窉
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=daikanwa		. 25464)	; ø¸†¸
+    ))
+(define-char
+  '((=>ucs		. #x7A89)	; 窉
+    (morohashi-daikanwa	25464 0 0)
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=cns11643-2	. #x315A)	; ø»“¤¹
-    (ideograph-daikanwa . 25464)	; ø¸†¸
+    ))
+(define-char
+  '((morohashi-daikanwa	25464 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
     (=ucs		. #x7A89)	; 窉
     ))
 (define-char
@@ -688,7 +846,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (ideograph-daikanwa . 25467)	; ø¸†»
+    (=daikanwa		. 25467)	; ø¸†»
     ))
 (define-char
   '((morohashi-daikanwa	25467 0 1)
@@ -722,7 +880,7 @@
     (total-strokes	 . 10)
     (=jis-x0212		. #x5157)	; ø»‹«¦
     (=cns11643-2	. #x315C)	; ø»“¤»
-    (ideograph-daikanwa . 25469)	; ø¸†½
+    (=daikanwa		. 25469)	; ø¸†½
     (=ucs		. #x7A8B)	; 窋
     ))
 (define-char
@@ -730,7 +888,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=cns11643-2	. #x315D)	; ø»“¤¼
-    (ideograph-daikanwa . 25470)	; ø¸†¾
+    (=daikanwa		. 25470)	; ø¸†¾
     (=ucs		. #x7A8C)	; 窌
     ))
 (define-char
@@ -738,14 +896,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (ideograph-daikanwa . 49413)	; ø¸Œ„…
+    (=daikanwa		. 49413)	; ø¸Œ„…
     ))
 (define-char
   '((morohashi-daikanwa	49413 0 9)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3A49)	; ø»œš†
+    (=cns11643-6	. #x3A49)	; ø»œš†
     (=ucs		. #x2595E)	; 𥥞
     ))
 (define-char
@@ -835,7 +993,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3A4C)	; ø»œš‰
+    (=cns11643-6	. #x3A4C)	; ø»œš‰
     (=ucs		. #x2594E)	; 𥥎
     ))
 (define-char
@@ -863,14 +1021,14 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3A4A)	; ø»œš‡
+    (=cns11643-6	. #x3A4A)	; ø»œš‡
     (=ucs		. #x25952)	; 𥥒
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3A48)	; ø»œš…
+    (=cns11643-6	. #x3A48)	; ø»œš…
     (=ucs		. #x25953)	; 𥥓
     ))
 (define-char
@@ -891,7 +1049,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3A4B)	; ø»œšˆ
+    (=cns11643-6	. #x3A4B)	; ø»œšˆ
     (=ucs		. #x2595B)	; 𥥛
     ))
 (define-char
@@ -899,7 +1057,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=cns11643-2	. #x376B)	; ø»“­¾
-    (ideograph-daikanwa . 25489)	; ø¸†Ž‘
+    (=daikanwa		. 25489)	; ø¸†Ž‘
     (=ucs		. #x7A8F)	; 窏
     ))
 (define-char
@@ -909,7 +1067,7 @@
     (total-strokes	 . 11)
     (=jis-x0212		. #x5158)	; ø»‹«§
     (=jis-x0213-2-2000	. #x732F)	; ø»¦•ª
-    (ideograph-daikanwa . 25490)	; ø¸†Ž’
+    (=daikanwa		. 25490)	; ø¸†Ž’
     (=jef-china3	. #x5DD0)	; øº…·
     (=ucs@jis		. #x7A90)	; ø»‹«§
     ))
@@ -934,7 +1092,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=jis-x0212		. #x5159)	; ø»‹«¨
-    (ideograph-daikanwa . 25491)	; ø¸†Ž“
+    (=daikanwa		. 25491)	; ø¸†Ž“
     (=jef-china3	. #x5DD1)	; øº…·‘
     (=ucs@jis		. #x7A91)	; ø»‹«¨
     ))
@@ -956,31 +1114,63 @@
     (=ucs		. #x7A91)	; 窑
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A92)	; 窒
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (shinjigen-2	. 5702)
-    (=gb2312		. #x564F)	; ø»…”¨
     (=jis-x0208		. #x4362)	; ø½Š¨¹
     (=ks-x1001		. #x7272)	; ø»Š’›
-    (=iso-ir165		. #x564F)	; ø»¼¸
-    (=cns11643-1	. #x5C44)	; ø»’™©
-    (=gt-pj-1		. #x4362)	; 窒
-    (ideograph-daikanwa . 25493)	; ø¸†Ž•
+    (=gt-pj-1		. #x4362)	; ý¡€ˆ‚‚
+    (=daikanwa		. 25493)	; ø¸†Ž•
     (=gt-k		. 07826)	; ý¡„º’
+    (=ucs@jis		. #x7A92)	; ø½Š¨¹
+    (=gt		. 32898)	; ý¡€ˆ‚‚
+    ))
+(define-char
+  '((=>ucs		. #x7A92)	; 窒
+    (morohashi-daikanwa	25493 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=cns11643-1	. #x5C44)	; ø»’™©
+    ))
+(define-char
+  '((morohashi-daikanwa	25493 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=gb2312		. #x564F)	; ø»…”¨
+    (=iso-ir165		. #x564F)	; ø»¼¸
     (=ucs		. #x7A92)	; 窒
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A93)	; 窓
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (shinjigen-2	. 5697)
     (=jis-x0208		. #x416B)	; ø½Š¦†
     (=ks-x1001		. #x736B)	; ø»Š“²
-    (=cns11643-3	. #x3771)	; ø»•¸ˆ
-    (=gt-pj-1		. #x416B)	; 窓
-    (ideograph-daikanwa . 25494)	; ø¸†Ž–
+    (=gt-pj-1		. #x416B)	; ý¡€ˆ¿
+    (=daikanwa		. 25494)	; ø¸†Ž–
     (=gt-k		. 07817)	; ý¡„º‰
+    (=ucs@jis		. #x7A93)	; ø½Š¦†
+    (=gt		. 32895)	; ý¡€ˆ¿
+    ))
+(define-char
+  '((=>ucs		. #x7A93)	; 窓
+    (morohashi-daikanwa	25494 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=cns11643-3	. #x3771)	; ø»•¸ˆ
+    ))
+(define-char
+  '((morohashi-daikanwa	25494 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
     (=ucs		. #x7A93)	; 窓
     ))
 (define-char
@@ -989,7 +1179,7 @@
     (total-strokes	 . 11)
     (=jis-x0212		. #x515A)	; ø»‹«©
     (=cns11643-2	. #x376C)	; ø»“­¿
-    (ideograph-daikanwa . 25495)	; ø¸†Ž—
+    (=daikanwa		. 25495)	; ø¸†Ž—
     (=ucs		. #x7A94)	; 窔
     ))
 (define-char
@@ -1000,20 +1190,36 @@
     (=jis-x0208-1978	. #x635A)	; ø»ƒµ
     (=jis-x0208-1983	. #x635A)	; ø»‡±½
     (=ks-x1001		. #x7057)	; ø»Š„
-    (ideograph-daikanwa . 25496)	; ø¸†Ž˜
+    (=daikanwa		. 25496)	; ø¸†Ž˜
     ))
 (define-char
-  '((morohashi-daikanwa	25496 0 0)
+  '((=>ucs		. #x7A95)	; 窕
+    (morohashi-daikanwa	25496 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (shinjigen-2	. 5703)
-    (=gb2312		. #x713B)	; ø»…»¾
-    (=iso-ir165		. #x713B)	; ø»Ž¤Ž
-    (=cns11643-1	. #x5C45)	; ø»’™ª
     (=jis-x0208-1990	. #x635A)	; ø½‹—±
-    (=gt-pj-1		. #x635A)	; 窕
+    (=gt-pj-1		. #x635A)	; ý¡€ˆ‚ƒ
     (=gt-k		. 07963)	; ý¡„¼›
+    (=ucs@jis		. #x7A95)	; ø½‹—±
+    (=gt		. 32899)	; ý¡€ˆ‚ƒ
+    ))
+(define-char
+  '((=>ucs		. #x7A95)	; 窕
+    (morohashi-daikanwa	25496 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=cns11643-1	. #x5C45)	; ø»’™ª
+    ))
+(define-char
+  '((morohashi-daikanwa	25496 0 2)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=gb2312		. #x713B)	; ø»…»¾
+    (=iso-ir165		. #x713B)	; ø»Ž¤Ž
     (=ucs		. #x7A95)	; 窕
     ))
 (define-char
@@ -1062,7 +1268,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 . #x426F)	; ø»œ¦œ
+    (=cns11643-6	. #x426F)	; ø»œ¦œ
     (=ucs		. #x41A0)	; 䆠
     ))
 (define-char
@@ -1083,21 +1289,21 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 . #x426C)	; ø»œ¦™
+    (=cns11643-6	. #x426C)	; ø»œ¦™
     (=ucs		. #x25962)	; 𥥢
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 . #x426B)	; ø»œ¦˜
+    (=cns11643-6	. #x426B)	; ø»œ¦˜
     (=ucs		. #x25963)	; 𥥣
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 . #x426D)	; ø»œ¦š
+    (=cns11643-6	. #x426D)	; ø»œ¦š
     (=ucs		. #x25964)	; 𥥤
     ))
 (define-char
@@ -1132,7 +1338,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 . #x426E)	; ø»œ¦›
+    (=cns11643-6	. #x426E)	; ø»œ¦›
     (=ucs		. #x25969)	; 𥥩
     ))
 (define-char
@@ -1142,10 +1348,11 @@
     (total-strokes	 . 12)
     (shinjigen-2	. 5706)
     (=jis-x0208		. #x635C)	; ø½‹—³
-    (=gt-pj-1		. #x635C)	; ø½‹—³
-    (ideograph-daikanwa . 25516)	; ø¸†Ž¬
+    (=gt-pj-1		. #x635C)	; ý¡€ˆ‚š
+    (=daikanwa		. 25516)	; ø¸†Ž¬
     (=gt-k		. 09220)	; ý¡„‚„
     (=ucs@jis		. #x7A96)	; ø½‹—³
+    (=gt		. 32922)	; ý¡€ˆ‚š
     ))
 (define-char
   '((=>ucs		. #x7A96)	; 窖
@@ -1170,8 +1377,10 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=jis-x0208		. #x6359)	; ø½‹—°
-    (ideograph-daikanwa . 25517)	; ø¸†Ž­
+    (=gt-pj-1		. #x6359)	; ý¡€ˆ‚¨
+    (=daikanwa		. 25517)	; ø¸†Ž­
     (=ucs@jis		. #x7A97)	; ø½‹—°
+    (=gt		. 32936)	; ý¡€ˆ‚¨
     ))
 (define-char
   '((morohashi-daikanwa	25517 0 1)
@@ -1191,18 +1400,34 @@
     (=cns11643-1	. #x6127)	; ø»’ ¢
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A98)	; 窘
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (shinjigen-2	. 5705)
-    (=gb2312		. #x3E3D)	; ø»„±†
     (=jis-x0208		. #x635B)	; ø½‹—²
     (=ks-x1001		. #x4F57)	; ø»‰ž¦
-    (=iso-ir165		. #x3E3D)	; ø»™–
-    (=cns11643-1	. #x6126)	; ø»’ ¡
-    (=gt-pj-1		. #x635B)	; 窘
-    (ideograph-daikanwa . 25519)	; ø¸†Ž¯
+    (=gt-pj-1		. #x635B)	; ý¡€ˆ‚•
+    (=daikanwa		. 25519)	; ø¸†Ž¯
     (=gt-k		. 09219)	; ý¡„‚ƒ
+    (=ucs@jis		. #x7A98)	; ø½‹—²
+    (=gt		. 32917)	; ý¡€ˆ‚•
+    ))
+(define-char
+  '((=>ucs		. #x7A98)	; 窘
+    (morohashi-daikanwa	25519 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=cns11643-1	. #x6126)	; ø»’ ¡
+    ))
+(define-char
+  '((morohashi-daikanwa	25519 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=gb2312		. #x3E3D)	; ø»„±†
+    (=iso-ir165		. #x3E3D)	; ø»™–
     (=ucs		. #x7A98)	; 窘
     ))
 (define-char
@@ -1210,7 +1435,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25520)	; ø¸†Ž°
+    (=daikanwa		. 25520)	; ø¸†Ž°
     (=jef-china3	. #x5DD2)	; øº…·’
     ))
 (define-char
@@ -1232,7 +1457,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25522)	; ø¸†Ž²
+    (=daikanwa		. 25522)	; ø¸†Ž²
     (=ucs		. #x7A9A)	; 窚
     ))
 (define-char
@@ -1248,7 +1473,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25523)	; ø¸†Ž³
+    (=daikanwa		. 25523)	; ø¸†Ž³
     ))
 (define-char
   '((morohashi-daikanwa	25523 0 0)
@@ -1263,7 +1488,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25524)	; ø¸†Ž´
+    (=daikanwa		. 25524)	; ø¸†Ž´
     ))
 (define-char
   '((=>ucs		. #x2597E)	; 𥥾
@@ -1285,7 +1510,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25525)	; ø¸†Žµ
+    (=daikanwa		. 25525)	; ø¸†Žµ
     ))
 (define-char
   '((morohashi-daikanwa	25525 0 0)
@@ -1300,7 +1525,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25526)	; ø¸†Ž¶
+    (=daikanwa		. 25526)	; ø¸†Ž¶
     (=jef-china3	. #x4AC6)	; øº„«†
     ))
 (define-char
@@ -1308,7 +1533,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C50)	; ø»œ´©
+    (=cns11643-6	. #x4C50)	; ø»œ´©
     (=ucs		. #x25980)	; 𥦀
     ))
 (define-char
@@ -1316,14 +1541,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25528)	; ø¸†Ž¸
+    (=daikanwa		. 25528)	; ø¸†Ž¸
     ))
 (define-char
   '((morohashi-daikanwa	25528 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C51)	; ø»œ´ª
+    (=cns11643-6	. #x4C51)	; ø»œ´ª
     (=ucs		. #x25982)	; 𥦂
     ))
 (define-char
@@ -1331,7 +1556,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25529)	; ø¸†Ž¹
+    (=daikanwa		. 25529)	; ø¸†Ž¹
     ))
 (define-char
   '((morohashi-daikanwa	25529 0 1)
@@ -1346,14 +1571,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25530)	; ø¸†Žº
+    (=daikanwa		. 25530)	; ø¸†Žº
     ))
 (define-char
   '((morohashi-daikanwa	25530 0 1)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C4B)	; ø»œ´¤
+    (=cns11643-6	. #x4C4B)	; ø»œ´¤
     (=ucs		. #x25984)	; 𥦄
     ))
 (define-char
@@ -1361,7 +1586,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25531)	; ø¸†Ž»
+    (=daikanwa		. 25531)	; ø¸†Ž»
     ))
 (define-char
   '((morohashi-daikanwa	25531 0 1)
@@ -1376,7 +1601,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25533)	; ø¸†Ž½
+    (=daikanwa		. 25533)	; ø¸†Ž½
     ))
 (define-char
   '((morohashi-daikanwa	25533 0 0)
@@ -1391,14 +1616,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25534)	; ø¸†Ž¾
+    (=daikanwa		. 25534)	; ø¸†Ž¾
     ))
 (define-char
   '((morohashi-daikanwa	25534 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C4C)	; ø»œ´¥
+    (=cns11643-6	. #x4C4C)	; ø»œ´¥
     (=ucs		. #x25988)	; 𥦈
     ))
 (define-char
@@ -1406,7 +1631,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25536)	; ø¸†€
+    (=daikanwa		. 25536)	; ø¸†€
     ))
 (define-char
   '((morohashi-daikanwa	25536 0 0)
@@ -1421,7 +1646,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25537)	; ø¸†
+    (=daikanwa		. 25537)	; ø¸†
     ))
 (define-char
   '((morohashi-daikanwa	25537 0 0)
@@ -1436,14 +1661,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C49)	; ø»œ´¢
+    (=cns11643-6	. #x4C49)	; ø»œ´¢
     ))
 (define-char
   '((=>ucs		. #x2598C)	; 𥦌
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25538)	; ø¸†‚
+    (=daikanwa		. 25538)	; ø¸†‚
     ))
 (define-char
   '((morohashi-daikanwa	25538 0 0)
@@ -1458,7 +1683,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25539)	; ø¸†ƒ
+    (=daikanwa		. 25539)	; ø¸†ƒ
     ))
 (define-char
   '((morohashi-daikanwa	25539 0 0)
@@ -1473,14 +1698,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25540)	; ø¸†„
+    (=daikanwa		. 25540)	; ø¸†„
     ))
 (define-char
   '((morohashi-daikanwa	25540 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C53)	; ø»œ´¬
+    (=cns11643-6	. #x4C53)	; ø»œ´¬
     (=ucs		. #x41A4)	; 䆤
     ))
 (define-char
@@ -1488,7 +1713,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25541)	; ø¸†…
+    (=daikanwa		. 25541)	; ø¸†…
     ))
 (define-char
   '((morohashi-daikanwa	25541 0 0)
@@ -1503,14 +1728,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25542)	; ø¸††
+    (=daikanwa		. 25542)	; ø¸††
     ))
 (define-char
   '((morohashi-daikanwa	25542 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C4F)	; ø»œ´¨
+    (=cns11643-6	. #x4C4F)	; ø»œ´¨
     (=ucs		. #x2598E)	; 𥦎
     ))
 (define-char
@@ -1518,7 +1743,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25543)	; ø¸†‡
+    (=daikanwa		. 25543)	; ø¸†‡
     ))
 (define-char
   '((morohashi-daikanwa	25543 0 0)
@@ -1532,7 +1757,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25544)	; ø¸†ˆ
+    (=daikanwa		. 25544)	; ø¸†ˆ
     (=ucs		. #x7A9B)	; 窛
     ))
 (define-char
@@ -1548,7 +1773,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25545)	; ø¸†‰
+    (=daikanwa		. 25545)	; ø¸†‰
     ))
 (define-char
   '((morohashi-daikanwa	25545 0 0)
@@ -1563,21 +1788,21 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25546)	; ø¸†Š
+    (=daikanwa		. 25546)	; ø¸†Š
     ))
 (define-char
   '((morohashi-daikanwa	25546 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C4D)	; ø»œ´¦
+    (=cns11643-6	. #x4C4D)	; ø»œ´¦
     (=ucs		. #x25991)	; 𥦑
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 25547)	; ø¸†‹
+    (=daikanwa		. 25547)	; ø¸†‹
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
@@ -1639,14 +1864,14 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C4E)	; ø»œ´§
+    (=cns11643-6	. #x4C4E)	; ø»œ´§
     (=ucs		. #x25979)	; 𥥹
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C4A)	; ø»œ´£
+    (=cns11643-6	. #x4C4A)	; ø»œ´£
     (=ucs		. #x2597A)	; 𥥺
     ))
 (define-char
@@ -1660,7 +1885,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4C52)	; ø»œ´«
+    (=cns11643-6	. #x4C52)	; ø»œ´«
     (=ucs		. #x2597C)	; 𥥼
     ))
 (define-char
@@ -1689,7 +1914,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25548)	; ø¸†Œ
+    (=daikanwa		. 25548)	; ø¸†Œ
     ))
 (define-char
   '((morohashi-daikanwa	25548 0 0)
@@ -1704,14 +1929,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25549)	; ø¸†
+    (=daikanwa		. 25549)	; ø¸†
     ))
 (define-char
   '((morohashi-daikanwa	25549 0 1)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5629)	; ø»‚®
+    (=cns11643-6	. #x5629)	; ø»‚®
     (=ucs		. #x2599C)	; 𥦜
     ))
 (define-char
@@ -1719,7 +1944,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25550)	; ø¸†Ž
+    (=daikanwa		. 25550)	; ø¸†Ž
     ))
 (define-char
   '((morohashi-daikanwa	25550 0 0)
@@ -1735,7 +1960,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=jis-x0212		. #x515B)	; ø»‹«ª
-    (ideograph-daikanwa . 25551)	; ø¸†
+    (=daikanwa		. 25551)	; ø¸†
     (=ucs@jis		. #x7A9E)	; ø»‹«ª
     ))
 (define-char
@@ -1747,18 +1972,34 @@
     (=ucs		. #x7A9E)	; 窞
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7A9F)	; 窟
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (shinjigen-2	. 5709)
-    (=gb2312		. #x3F5F)	; ø»„³†
     (=jis-x0208		. #x3722)	; ø½Š–‘
     (=ks-x1001		. #x4F5F)	; ø»‰ž®
-    (=iso-ir165		. #x3F5F)	; ø»›–
-    (=cns11643-1	. #x6564)	; ø»’§—
-    (=gt-pj-1		. #x3722)	; 窟
-    (ideograph-daikanwa . 25552)	; ø¸†
+    (=gt-pj-1		. #x3722)	; ý¡€ˆƒˆ
+    (=daikanwa		. 25552)	; ø¸†
     (=gt-k		. 10200)	; ý¡„‚Ÿ˜
+    (=ucs@jis		. #x7A9F)	; ø½Š–‘
+    (=gt		. 32968)	; ý¡€ˆƒˆ
+    ))
+(define-char
+  '((=>ucs		. #x7A9F)	; 窟
+    (morohashi-daikanwa	25552 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (=cns11643-1	. #x6564)	; ø»’§—
+    ))
+(define-char
+  '((morohashi-daikanwa	25552 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (=gb2312		. #x3F5F)	; ø»„³†
+    (=iso-ir165		. #x3F5F)	; ø»›–
     (=ucs		. #x7A9F)	; 窟
     ))
 (define-char
@@ -1766,7 +2007,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25553)	; ø¸†‘
+    (=daikanwa		. 25553)	; ø¸†‘
     ))
 (define-char
   '((morohashi-daikanwa	25553 0 0)
@@ -1781,7 +2022,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25554)	; ø¸†’
+    (=daikanwa		. 25554)	; ø¸†’
     ))
 (define-char
   '((morohashi-daikanwa	25554 0 0)
@@ -1795,7 +2036,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25555)	; ø¸†“
+    (=daikanwa		. 25555)	; ø¸†“
     (=ucs		. #x41A7)	; 䆧
     ))
 (define-char
@@ -1813,7 +2054,7 @@
     (total-strokes	 . 13)
     (=jis-x0212		. #x515C)	; ø»‹««
     (=jis-x0213-1-2000	. #x7953)	; ø»¤”¾
-    (ideograph-daikanwa . 25556)	; ø¸†”
+    (=daikanwa		. 25556)	; ø¸†”
     (=jef-china3	. #x5DD3)	; øº…·“
     (=ucs@jis		. #x7AA0)	; ø»‹««
     ))
@@ -1839,7 +2080,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25557)	; ø¸†•
+    (=daikanwa		. 25557)	; ø¸†•
     ))
 (define-char
   '((morohashi-daikanwa	25557 0 0)
@@ -1854,7 +2095,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=cns11643-3	. #x4346)	; ø»–‰…
-    (ideograph-daikanwa . 25558)	; ø¸†–
+    (=daikanwa		. 25558)	; ø¸†–
     (=ucs		. #x7AA1)	; 窡
     ))
 (define-char
@@ -1862,7 +2103,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=cns11643-2	. #x4568)	; ø»”‚Ÿ
-    (ideograph-daikanwa . 25559)	; ø¸†—
+    (=daikanwa		. 25559)	; ø¸†—
     (=ucs		. #x7AA2)	; 窢
     ))
 (define-char
@@ -1870,14 +2111,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25560)	; ø¸†˜
+    (=daikanwa		. 25560)	; ø¸†˜
     ))
 (define-char
   '((morohashi-daikanwa	25560 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5622)	; ø»‚§
+    (=cns11643-6	. #x5622)	; ø»‚§
     (=ucs		. #x259A0)	; 𥦠
     ))
 (define-char
@@ -1888,7 +2129,7 @@
     (=iso-ir165		. #x7D72)	; ø»Ž¶­
     (=cns11643-2	. #x4567)	; ø»”‚ž
     (=jis-x0213-2-2000	. #x7330)	; ø»¦•«
-    (ideograph-daikanwa . 25561)	; ø¸†™
+    (=daikanwa		. 25561)	; ø¸†™
     (=ucs		. #x7AA3)	; 窣
     ))
 (define-char
@@ -1896,21 +2137,21 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25562)	; ø¸†š
+    (=daikanwa		. 25562)	; ø¸†š
     ))
 (define-char
   '((morohashi-daikanwa	25562 0 3)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5624)	; ø»‚©
+    (=cns11643-6	. #x5624)	; ø»‚©
     (=ucs		. #x259A1)	; 𥦡
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25563)	; ø¸†›
+    (=daikanwa		. 25563)	; ø¸†›
     (=ucs		. #x7AA4)	; 窤
     ))
 (define-char
@@ -1926,7 +2167,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25566)	; ø¸†ž
+    (=daikanwa		. 25566)	; ø¸†ž
     ))
 (define-char
   '((morohashi-daikanwa	25566 0 1)
@@ -1948,7 +2189,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25567)	; ø¸†Ÿ
+    (=daikanwa		. 25567)	; ø¸†Ÿ
     ))
 (define-char
   '((morohashi-daikanwa	25567 0 0)
@@ -1962,7 +2203,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25568)	; ø¸† 
+    (=daikanwa		. 25568)	; ø¸† 
     (=ucs		. #x41A8)	; 䆨
     ))
 (define-char
@@ -1977,7 +2218,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25569)	; ø¸†¡
+    (=daikanwa		. 25569)	; ø¸†¡
     (=ucs		. #x41A9)	; 䆩
     ))
 (define-char
@@ -1986,21 +2227,21 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5627)	; ø»‚¬
+    (=cns11643-6	. #x5627)	; ø»‚¬
     ))
 (define-char
   '((=>ucs		. #x259A6)	; 𥦦
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25570)	; ø¸†¢
+    (=daikanwa		. 25570)	; ø¸†¢
     ))
 (define-char
   '((morohashi-daikanwa	25570 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5628)	; ø»‚­
+    (=cns11643-6	. #x5628)	; ø»‚­
     (=ucs		. #x259A6)	; 𥦦
     ))
 (define-char
@@ -2008,14 +2249,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25571)	; ø¸†£
+    (=daikanwa		. 25571)	; ø¸†£
     ))
 (define-char
   '((morohashi-daikanwa	25571 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x562B)	; ø»‚°
+    (=cns11643-6	. #x562B)	; ø»‚°
     (=ucs		. #x259A7)	; 𥦧
     ))
 (define-char
@@ -2023,7 +2264,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25572)	; ø¸†¤
+    (=daikanwa		. 25572)	; ø¸†¤
     ))
 (define-char
   '((morohashi-daikanwa	25572 0 0)
@@ -2038,14 +2279,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25573)	; ø¸†¥
+    (=daikanwa		. 25573)	; ø¸†¥
     ))
 (define-char
   '((morohashi-daikanwa	25573 0 1)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5626)	; ø»‚«
+    (=cns11643-6	. #x5626)	; ø»‚«
     (=ucs		. #x259A9)	; 𥦩
     ))
 (define-char
@@ -2053,7 +2294,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 25574)	; ø¸†¦
+    (=daikanwa		. 25574)	; ø¸†¦
     ))
 (define-char
   '((=>ucs		. #x259AA)	; 𥦪
@@ -2061,7 +2302,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5625)	; ø»‚ª
+    (=cns11643-6	. #x5625)	; ø»‚ª
     ))
 (define-char
   '((morohashi-daikanwa	25574 0 1)
@@ -2075,14 +2316,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 49414)	; ø¸Œ„†
+    (=daikanwa		. 49414)	; ø¸Œ„†
     ))
 (define-char
   '((morohashi-daikanwa	49414 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x562A)	; ø»‚¯
+    (=cns11643-6	. #x562A)	; ø»‚¯
     (=ucs		. #x259B5)	; 𥦵
     ))
 (define-char
@@ -2108,7 +2349,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5623)	; ø»‚¨
+    (=cns11643-6	. #x5623)	; ø»‚¨
     (=ucs		. #x259B2)	; 𥦲
     ))
 (define-char
@@ -2116,14 +2357,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25576)	; ø¸†¨
+    (=daikanwa		. 25576)	; ø¸†¨
     ))
 (define-char
   '((morohashi-daikanwa	25576 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5F78)	; ø»‘‹
+    (=cns11643-6	. #x5F78)	; ø»‘‹
     (=ucs		. #x41AB)	; 䆫
     ))
 (define-char
@@ -2131,7 +2372,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25577)	; ø¸†©
+    (=daikanwa		. 25577)	; ø¸†©
     ))
 (define-char
   '((=>ucs		. #x259B8)	; 𥦸
@@ -2154,7 +2395,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
     (=cns11643-2	. #x4C51)	; ø»”Œš
-    (ideograph-daikanwa . 25578)	; ø¸†ª
+    (=daikanwa		. 25578)	; ø¸†ª
     ))
 (define-char
   '((morohashi-daikanwa	25578 0 1)
@@ -2173,9 +2414,18 @@
     (shinjigen-2	. 5710)
     (=jis-x0208		. #x635D)	; ø½‹—´
     (=ks-x1001		. #x6840)	; ø»Š‚½
-    (=cns11643-1	. #x6A24)	; ø»’­­
-    (ideograph-daikanwa . 25579)	; ø¸†«
+    (=gt-pj-1		. #x635D)	; ý¡€ˆƒ 
+    (=daikanwa		. 25579)	; ø¸†«
     (=ucs@jis		. #x7AA9)	; ø½‹—´
+    (=gt		. 32992)	; ý¡€ˆƒ 
+    ))
+(define-char
+  '((=>ucs		. #x7AA9)	; 窩
+    (morohashi-daikanwa	25579 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=cns11643-1	. #x6A24)	; ø»’­­
     ))
 (define-char
   '((morohashi-daikanwa	25579 0 4)
@@ -2186,15 +2436,32 @@
     (=ucs		. #x7AA9)	; 窩
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7AAA)	; 窪
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
     (shinjigen-2	. 4449)
     (=jis-x0208		. #x3726)	; ø½Š–•
     (=ks-x1001		. #x6841)	; ø»Š‚¾
+    (=gt-pj-1		. #x3726)	; ý¡€ˆƒµ
+    (=daikanwa		. 25580)	; ø¸†¬
+    (=ucs@jis		. #x7AAA)	; ø½Š–•
+    (=gt		. 33013)	; ý¡€ˆƒµ
+    ))
+(define-char
+  '((=>ucs		. #x7AAA)	; 窪
+    (morohashi-daikanwa	25580 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
     (=cns11643-1	. #x6A23)	; ø»’­¬
+    ))
+(define-char
+  '((morohashi-daikanwa	25580 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
     (=gb12345		. #x4D5D)	; 窪
-    (ideograph-daikanwa . 25580)	; ø¸†¬
     (=ucs		. #x7AAA)	; 窪
     ))
 (define-char
@@ -2202,7 +2469,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25581)	; ø¸†­
+    (=daikanwa		. 25581)	; ø¸†­
     ))
 (define-char
   '((morohashi-daikanwa	25581 0 1)
@@ -2219,7 +2486,7 @@
     (total-strokes	 . 14)
     (=jis-x0212		. #x515E)	; ø»‹«­
     (=jis-x0213-2-2000	. #x7331)	; ø»¦•¬
-    (ideograph-daikanwa . 25582)	; ø¸†®
+    (=daikanwa		. 25582)	; ø¸†®
     (=ucs@jis		. #x7AAC)	; ø»‹«­
     ))
 (define-char
@@ -2244,14 +2511,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25583)	; ø¸†¯
+    (=daikanwa		. 25583)	; ø¸†¯
     ))
 (define-char
   '((morohashi-daikanwa	25583 0 1)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5F77)	; ø»‘Š
+    (=cns11643-6	. #x5F77)	; ø»‘Š
     (=ucs		. #x259B9)	; 𥦹
     ))
 (define-char
@@ -2259,7 +2526,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25584)	; ø¸†°
+    (=daikanwa		. 25584)	; ø¸†°
     ))
 (define-char
   '((morohashi-daikanwa	25584 0 0)
@@ -2274,14 +2541,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25585)	; ø¸†±
+    (=daikanwa		. 25585)	; ø¸†±
     ))
 (define-char
   '((morohashi-daikanwa	25585 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5F76)	; ø»‘‰
+    (=cns11643-6	. #x5F76)	; ø»‘‰
     (=ucs		. #x259BB)	; 𥦻
     ))
 (define-char
@@ -2289,14 +2556,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25586)	; ø¸†²
+    (=daikanwa		. 25586)	; ø¸†²
     ))
 (define-char
   '((morohashi-daikanwa	25586 0 1)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5F72)	; ø»‘…
+    (=cns11643-6	. #x5F72)	; ø»‘…
     (=ucs		. #x259BC)	; 𥦼
     ))
 (define-char
@@ -2304,14 +2571,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25587)	; ø¸†³
+    (=daikanwa		. 25587)	; ø¸†³
     ))
 (define-char
   '((morohashi-daikanwa	25587 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5F74)	; ø»‘‡
+    (=cns11643-6	. #x5F74)	; ø»‘‡
     (=ucs		. #x259BD)	; 𥦽
     ))
 (define-char
@@ -2319,7 +2586,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25588)	; ø¸†´
+    (=daikanwa		. 25588)	; ø¸†´
     ))
 (define-char
   '((=>ucs		. #x259BE)	; 𥦾
@@ -2327,7 +2594,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5F73)	; ø»‘†
+    (=cns11643-6	. #x5F73)	; ø»‘†
     ))
 (define-char
   '((morohashi-daikanwa	25588 0 2)
@@ -2341,7 +2608,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25589)	; ø¸†µ
+    (=daikanwa		. 25589)	; ø¸†µ
     ))
 (define-char
   '((morohashi-daikanwa	25589 0 1)
@@ -2363,14 +2630,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25591)	; ø¸†·
+    (=daikanwa		. 25591)	; ø¸†·
     ))
 (define-char
   '((morohashi-daikanwa	25591 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5F71)	; ø»‘„
+    (=cns11643-6	. #x5F71)	; ø»‘„
     (=ucs		. #x259CA)	; 𥧊
     ))
 (define-char
@@ -2378,7 +2645,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 25592)	; ø¸†¸
+    (=daikanwa		. 25592)	; ø¸†¸
     ))
 (define-char
   '((morohashi-daikanwa	25592 0 0)
@@ -2406,14 +2673,14 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5F79)	; ø»‘Œ
+    (=cns11643-6	. #x5F79)	; ø»‘Œ
     (=ucs		. #x259C5)	; 𥧅
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5F75)	; ø»‘ˆ
+    (=cns11643-6	. #x5F75)	; ø»‘ˆ
     ))
 (define-char
   '((=>ucs		. #x7AAE)	; 窮
@@ -2422,42 +2689,77 @@
     (total-strokes	 . 15)
     (shinjigen-2	. 5712)
     (=ks-x1001		. #x4F63)	; ø»‰ž²
-    (=cns11643-1	. #x6E2C)	; ø»’³­
     (=jis-x0208-1990	. #x3567)	; ø½Š”š
-    (=gt-pj-1		. #x3567)	; ø»‰ž²
-    (ideograph-daikanwa . 25593)	; ø¸†¹
+    (=gt-pj-1		. #x3567)	; ý¡€ˆƒ¼
+    (=daikanwa		. 25593)	; ø¸†¹
     (=gt-k		. 11899)	; ý¡„‚¹»
     (=ucs@jis		. #x7AAE)	; ø»‰ž²
+    (=gt		. 33020)	; ý¡€ˆƒ¼
     ))
 (define-char
-  '((morohashi-daikanwa	25593 0 1)
+  '((=>ucs		. #x7AAE)	; 窮
+    (morohashi-daikanwa	25593 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (=cns11643-1	. #x6E2C)	; ø»’³­
+    ))
+(define-char
+  '((=>ucs		. #x7AAE)	; 窮
+    (morohashi-daikanwa	25593 0 1)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
     (=jis-x0208-1978	. #x3567)	; ø»‚šž
     (=jis-x0208-1983	. #x3567)	; ø»†®¦
+    ))
+(define-char
+  '((morohashi-daikanwa	25593 0 2)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
     (=gb12345		. #x476E)	; 窮
     (=ucs		. #x7AAE)	; 窮
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7AAF)	; 窯
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
     (shinjigen-2	. 5715)
     (=jis-x0208		. #x4D52)	; ø½Š·•
     (=ks-x1001		. #x6922)	; ø»Šƒ½
+    (=gt-pj-1		. #x4D52)	; ý¡€ˆ„‘
+    (=daikanwa		. 25594)	; ø¸†º
+    (=ucs@jis		. #x7AAF)	; ø½Š·•
+    (=gt		. 33041)	; ý¡€ˆ„‘
+    ))
+(define-char
+  '((=>ucs		. #x7AAF)	; 窯
+    (morohashi-daikanwa	25594 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
     (=cns11643-1	. #x6E2B)	; ø»’³¬
-    (ideograph-daikanwa . 25594)	; ø¸†º
+    ))
+(define-char
+  '((morohashi-daikanwa	25594 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
     (=ucs		. #x7AAF)	; 窯
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7AB0)	; 窰
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
     (shinjigen-2	. 5716)
     (=jis-x0208		. #x635F)	; ø½‹—¶
-    (ideograph-daikanwa . 25595)	; ø¸†»
-    (=ucs		. #x7AB0)	; 窰
+    (=gt-pj-1		. #x635F)	; ý¡€ˆ„’
+    (=daikanwa		. 25595)	; ø¸†»
+    (=ucs@jis		. #x7AB0)	; ø½‹—¶
+    (=gt		. 33042)	; ý¡€ˆ„’
     ))
 (define-char
   '((=>ucs		. #x7AB0)	; 窰
@@ -2468,25 +2770,32 @@
     (=cns11643-3	. #x4D5B)	; ø»–˜†
     ))
 (define-char
+  '((morohashi-daikanwa	25595 0 5)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (=ucs		. #x7AB0)	; 窰
+    ))
+(define-char
   '((=>ucs		. #x259D0)	; 𥧐
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25596)	; ø¸†¼
+    (=daikanwa		. 25596)	; ø¸†¼
     ))
 (define-char
   '((morohashi-daikanwa	25596 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (chinese-cns11643-7 . #x263B)	; ø»ž†¤
+    (=cns11643-7	. #x263B)	; ø»ž†¤
     (=ucs		. #x259D0)	; 𥧐
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25597)	; ø¸†½
+    (=daikanwa		. 25597)	; ø¸†½
     (=ucs		. #x7AB1)	; 窱
     ))
 (define-char
@@ -2502,14 +2811,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25598)	; ø¸†¾
+    (=daikanwa		. 25598)	; ø¸†¾
     ))
 (define-char
   '((=>ucs		. #x259D2)	; 𥧒
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25599)	; ø¸†¿
+    (=daikanwa		. 25599)	; ø¸†¿
     ))
 (define-char
   '((morohashi-daikanwa	25599 0 5)
@@ -2524,7 +2833,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25600)	; ø¸†€
+    (=daikanwa		. 25600)	; ø¸†€
     ))
 (define-char
   '((morohashi-daikanwa	25600 0 0)
@@ -2539,7 +2848,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25601)	; ø¸†
+    (=daikanwa		. 25601)	; ø¸†
     ))
 (define-char
   '((morohashi-daikanwa	25601 0 1)
@@ -2574,7 +2883,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25602)	; ø¸†‚
+    (=daikanwa		. 25602)	; ø¸†‚
     ))
 (define-char
   '((morohashi-daikanwa	25602 0 0)
@@ -2590,7 +2899,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
     (=jis-x0213-2-2000	. #x7332)	; ø»¦•­
-    (ideograph-daikanwa . 25603)	; ø¸†ƒ
+    (=daikanwa		. 25603)	; ø¸†ƒ
     (=ucs@jis		. #x259D4)	; ø»¦•­
     ))
 (define-char
@@ -2606,7 +2915,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25604)	; ø¸†„
+    (=daikanwa		. 25604)	; ø¸†„
     ))
 (define-char
   '((morohashi-daikanwa	25604 0 1)
@@ -2628,14 +2937,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25605)	; ø¸†…
+    (=daikanwa		. 25605)	; ø¸†…
     ))
 (define-char
   '((morohashi-daikanwa	25605 0 2)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (chinese-cns11643-7 . #x263A)	; ø»ž†£
+    (=cns11643-7	. #x263A)	; ø»ž†£
     (=ucs		. #x259D6)	; 𥧖
     ))
 (define-char
@@ -2643,7 +2952,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25606)	; ø¸††
+    (=daikanwa		. 25606)	; ø¸††
     ))
 (define-char
   '((morohashi-daikanwa	25606 0 2)
@@ -2658,7 +2967,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25607)	; ø¸†‡
+    (=daikanwa		. 25607)	; ø¸†‡
     ))
 (define-char
   '((morohashi-daikanwa	25607 0 9)
@@ -2673,7 +2982,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25608)	; ø¸†ˆ
+    (=daikanwa		. 25608)	; ø¸†ˆ
     ))
 (define-char
   '((morohashi-daikanwa	25608 0 0)
@@ -2688,7 +2997,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25609)	; ø¸†‰
+    (=daikanwa		. 25609)	; ø¸†‰
     ))
 (define-char
   '((morohashi-daikanwa	25609 0 0)
@@ -2703,7 +3012,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25610)	; ø¸†Š
+    (=daikanwa		. 25610)	; ø¸†Š
     ))
 (define-char
   '((morohashi-daikanwa	25610 0 0)
@@ -2725,7 +3034,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25611)	; ø¸†‹
+    (=daikanwa		. 25611)	; ø¸†‹
     ))
 (define-char
   '((morohashi-daikanwa	25611 0 0)
@@ -2740,7 +3049,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25612)	; ø¸†Œ
+    (=daikanwa		. 25612)	; ø¸†Œ
     ))
 (define-char
   '((morohashi-daikanwa	25612 0 0)
@@ -2755,7 +3064,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25613)	; ø¸†
+    (=daikanwa		. 25613)	; ø¸†
     ))
 (define-char
   '((=>ucs		. #x259DC)	; 𥧜
@@ -2763,7 +3072,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (chinese-cns11643-7 . #x2639)	; ø»ž†¢
+    (=cns11643-7	. #x2639)	; ø»ž†¢
     ))
 (define-char
   '((morohashi-daikanwa	25613 0 1)
@@ -2777,7 +3086,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25614)	; ø¸†Ž
+    (=daikanwa		. 25614)	; ø¸†Ž
     ))
 (define-char
   '((morohashi-daikanwa	25614 0 0)
@@ -2792,7 +3101,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25615)	; ø¸†
+    (=daikanwa		. 25615)	; ø¸†
     ))
 (define-char
   '((morohashi-daikanwa	25615 0 0)
@@ -2814,7 +3123,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25616)	; ø¸†
+    (=daikanwa		. 25616)	; ø¸†
     ))
 (define-char
   '((morohashi-daikanwa	25616 0 0)
@@ -2829,7 +3138,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25617)	; ø¸†‘
+    (=daikanwa		. 25617)	; ø¸†‘
     ))
 (define-char
   '((morohashi-daikanwa	25617 0 0)
@@ -2843,7 +3152,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 25618)	; ø¸†’
+    (=daikanwa		. 25618)	; ø¸†’
     (=ucs		. #x7AB4)	; 窴
     ))
 (define-char
@@ -2866,7 +3175,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25619)	; ø¸†“
+    (=daikanwa		. 25619)	; ø¸†“
     ))
 (define-char
   '((morohashi-daikanwa	25619 0 0)
@@ -2881,7 +3190,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25620)	; ø¸†”
+    (=daikanwa		. 25620)	; ø¸†”
     ))
 (define-char
   '((morohashi-daikanwa	25620 0 0)
@@ -2896,7 +3205,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25622)	; ø¸†–
+    (=daikanwa		. 25622)	; ø¸†–
     ))
 (define-char
   '((morohashi-daikanwa	25622 0 0)
@@ -2911,7 +3220,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25623)	; ø¸†—
+    (=daikanwa		. 25623)	; ø¸†—
     ))
 (define-char
   '((morohashi-daikanwa	25623 0 0)
@@ -2926,7 +3235,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25624)	; ø¸†˜
+    (=daikanwa		. 25624)	; ø¸†˜
     ))
 (define-char
   '((morohashi-daikanwa	25624 0 2)
@@ -2941,7 +3250,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25625)	; ø¸†™
+    (=daikanwa		. 25625)	; ø¸†™
     ))
 (define-char
   '((morohashi-daikanwa	25625 0 0)
@@ -2959,38 +3268,63 @@
     (=cns11643-4	. #x5226)	; ø»˜¨«
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7AB5)	; 窵
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
     (=jis-x0212		. #x5160)	; ø»‹«¯
+    (=daikanwa		. 25626)	; ø¸†š
+    (=ucs@jis		. #x7AB5)	; ø»‹«¯
+    ))
+(define-char
+  '((=>ucs		. #x7AB5)	; 窵
+    (morohashi-daikanwa	25626 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
     (=cns11643-2	. #x587E)	; ø»”ž¯
-    (ideograph-daikanwa . 25626)	; ø¸†š
+    ))
+(define-char
+  '((morohashi-daikanwa	25626 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
     (=ucs		. #x7AB5)	; 窵
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7AB6)	; 窶
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
     (shinjigen-2	. 1861)
     (=jis-x0208		. #x6360)	; ø½‹—·
-    (=gb12345		. #x7140)	; 窶
-    (ideograph-daikanwa . 25628)	; ø¸†œ
-    (=ucs		. #x7AB6)	; 窶
+    (=gt-pj-1		. #x6360)	; ý¡€ˆ…‚
+    (=daikanwa		. 25628)	; ø¸†œ
+    (=ucs@jis		. #x7AB6)	; ø½‹—·
+    (=gt		. 33090)	; ý¡€ˆ…‚
     ))
 (define-char
   '((=>ucs		. #x7AB6)	; 窶
-    (morohashi-daikanwa	25628 0 1)
+    (morohashi-daikanwa	25628 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
     (=cns11643-2	. #x587C)	; ø»”ž­
     ))
 (define-char
+  '((morohashi-daikanwa	25628 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=gb12345		. #x7140)	; 窶
+    (=ucs		. #x7AB6)	; 窶
+    ))
+(define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
     (=cns11643-2	. #x5922)	; ø»”ž±
-    (ideograph-daikanwa . 25629)	; ø¸†
+    (=daikanwa		. 25629)	; ø¸†
     (=ucs		. #x7AB7)	; 窷
     ))
 (define-char
@@ -2999,7 +3333,7 @@
     (total-strokes	 . 16)
     (=iso-ir165		. #x7D73)	; ø»Ž¶®
     (=cns11643-2	. #x587D)	; ø»”ž®
-    (ideograph-daikanwa . 25631)	; ø¸†Ÿ
+    (=daikanwa		. 25631)	; ø¸†Ÿ
     (=ucs		. #x7AB8)	; 窸
     ))
 (define-char
@@ -3009,7 +3343,7 @@
     (total-strokes	 . 16)
     (=jis-x0212		. #x5161)	; ø»‹«°
     (=jis-x0213-2-2000	. #x7334)	; ø»¦•¯
-    (ideograph-daikanwa . 25632)	; ø¸† 
+    (=daikanwa		. 25632)	; ø¸† 
     (=jef-china3	. #x5DD5)	; øº…·•
     (=ucs@jis		. #x7AB9)	; ø»‹«°
     ))
@@ -3029,15 +3363,32 @@
     (=ucs		. #x7AB9)	; 窹
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7ABA)	; 窺
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
     (shinjigen-2	. 5718)
     (=jis-x0208		. #x312E)	; ø½Š©
     (=ks-x1001		. #x502A)	; ø»‰Ÿ—
+    (=gt-pj-1		. #x312E)	; ý¡€ˆ„›
+    (=daikanwa		. 25633)	; ø¸†¡
+    (=ucs@jis		. #x7ABA)	; ø½Š©
+    (=gt		. 33051)	; ý¡€ˆ„›
+    ))
+(define-char
+  '((=>ucs		. #x7ABA)	; 窺
+    (morohashi-daikanwa	25633 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
     (=cns11643-1	. #x715D)	; ø»’¸¸
+    ))
+(define-char
+  '((morohashi-daikanwa	25633 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
     (=gb12345		. #x3F7A)	; 窺
-    (ideograph-daikanwa . 25633)	; ø¸†¡
     (=ucs		. #x7ABA)	; 窺
     ))
 (define-char
@@ -3047,7 +3398,7 @@
     (total-strokes	 . 16)
     (=jis-x0212		. #x5162)	; ø»‹«±
     (=jis-x0213-1-2000	. #x7956)	; ø»¤•
-    (ideograph-daikanwa . 25635)	; ø¸†£
+    (=daikanwa		. 25635)	; ø¸†£
     (=jef-china3	. #x5DD6)	; øº…·–
     (=ucs@jis		. #x7ABB)	; ø»‹«±
     ))
@@ -3071,14 +3422,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25636)	; ø¸†¤
+    (=daikanwa		. 25636)	; ø¸†¤
     ))
 (define-char
   '((morohashi-daikanwa	25636 0 9)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (chinese-cns11643-7 . #x3070)	; ø»ž–…
+    (=cns11643-7	. #x3070)	; ø»ž–…
     (=ucs		. #x259F3)	; 𥧳
     ))
 (define-char
@@ -3086,7 +3437,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25638)	; ø¸†¦
+    (=daikanwa		. 25638)	; ø¸†¦
     ))
 (define-char
   '((morohashi-daikanwa	25638 0 0)
@@ -3101,7 +3452,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25639)	; ø¸†§
+    (=daikanwa		. 25639)	; ø¸†§
     ))
 (define-char
   '((morohashi-daikanwa	25639 0 0)
@@ -3116,14 +3467,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25640)	; ø¸†¨
+    (=daikanwa		. 25640)	; ø¸†¨
     ))
 (define-char
   '((morohashi-daikanwa	25640 0 2)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (chinese-cns11643-7 . #x306F)	; ø»ž–„
+    (=cns11643-7	. #x306F)	; ø»ž–„
     (=ucs		. #x41B3)	; 䆳
     ))
 (define-char
@@ -3131,7 +3482,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25641)	; ø¸†©
+    (=daikanwa		. 25641)	; ø¸†©
     ))
 (define-char
   '((morohashi-daikanwa	25641 0 0)
@@ -3146,7 +3497,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25642)	; ø¸†ª
+    (=daikanwa		. 25642)	; ø¸†ª
     ))
 (define-char
   '((morohashi-daikanwa	25642 0 0)
@@ -3168,7 +3519,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25643)	; ø¸†«
+    (=daikanwa		. 25643)	; ø¸†«
     ))
 (define-char
   '((morohashi-daikanwa	25643 0 0)
@@ -3183,7 +3534,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25644)	; ø¸†¬
+    (=daikanwa		. 25644)	; ø¸†¬
     ))
 (define-char
   '((=>ucs		. #x259F9)	; 𥧹
@@ -3207,7 +3558,7 @@
     (=jis-x0212		. #x5163)	; ø»‹«²
     (=cns11643-4	. #x5227)	; ø»˜¨¬
     (=jis-x0213-2-2000	. #x7335)	; ø»¦•°
-    (ideograph-daikanwa . 25645)	; ø¸†­
+    (=daikanwa		. 25645)	; ø¸†­
     (=ucs		. #x7ABC)	; 窼
     ))
 (define-char
@@ -3215,24 +3566,45 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 25646)	; ø¸†®
+    (=daikanwa		. 25646)	; ø¸†®
     ))
 (define-char
   '((morohashi-daikanwa	25646 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (chinese-cns11643-7 . #x306E)	; ø»ž–ƒ
+    (=cns11643-7	. #x306E)	; ø»ž–ƒ
     (=ucs		. #x259FA)	; 𥧺
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (=cns11643-4	. #x5222)	; ø»˜¨§
     (=ucs		. #x41B1)	; 䆱
     ))
 (define-char
+  '((=>ucs		. #x41B1)	; 䆱
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=cns11643-4	. #x5222)	; ø»˜¨§
+    (=ucs@cns		. #x41B1)	; ø»˜¨§
+    ))
+(define-char
+  '((ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=ucs		. #x41B4)	; 䆴
+    ))
+(define-char
+  '((=>ucs		. #x41B4)	; 䆴
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=jis-x0213-2-2000	. #x7333)	; ø»¦•®
+    (=ucs@jis		. #x41B4)	; ø»¦•®
+    ))
+(define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
@@ -3278,14 +3650,14 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (chinese-cns11643-7 . #x3071)	; ø»ž–†
+    (=cns11643-7	. #x3071)	; ø»ž–†
     (=ucs		. #x25A0A)	; 𥨊
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (chinese-cns11643-7 . #x3072)	; ø»ž–‡
+    (=cns11643-7	. #x3072)	; ø»ž–‡
     (=ucs		. #x25A17)	; 𥨗
     ))
 (define-char
@@ -3293,7 +3665,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25648)	; ø¸†°
+    (=daikanwa		. 25648)	; ø¸†°
     ))
 (define-char
   '((morohashi-daikanwa	25648 0 0)
@@ -3308,7 +3680,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25653)	; ø¸†µ
+    (=daikanwa		. 25653)	; ø¸†µ
     ))
 (define-char
   '((=>ucs		. #x25A0D)	; 𥨍
@@ -3330,7 +3702,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25654)	; ø¸†¶
+    (=daikanwa		. 25654)	; ø¸†¶
     ))
 (define-char
   '((morohashi-daikanwa	25654 0 2)
@@ -3346,7 +3718,7 @@
     (total-strokes	 . 17)
     (=iso-ir165		. #x7D74)	; ø»Ž¶¯
     (=jis-x0213-2-2000	. #x7336)	; ø»¦•±
-    (ideograph-daikanwa . 25655)	; ø¸†·
+    (=daikanwa		. 25655)	; ø¸†·
     (=ucs		. #x7ABE)	; 窾
     ))
 (define-char
@@ -3362,7 +3734,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25656)	; ø¸†¸
+    (=daikanwa		. 25656)	; ø¸†¸
     ))
 (define-char
   '((morohashi-daikanwa	25656 0 1)
@@ -3377,7 +3749,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25657)	; ø¸†¹
+    (=daikanwa		. 25657)	; ø¸†¹
     ))
 (define-char
   '((morohashi-daikanwa	25657 0 2)
@@ -3392,7 +3764,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25658)	; ø¸†º
+    (=daikanwa		. 25658)	; ø¸†º
     ))
 (define-char
   '((morohashi-daikanwa	25658 0 1)
@@ -3407,7 +3779,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25659)	; ø¸†»
+    (=daikanwa		. 25659)	; ø¸†»
     ))
 (define-char
   '((morohashi-daikanwa	25659 0 0)
@@ -3418,14 +3790,31 @@
     (=ucs		. #x41B8)	; 䆸
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7ABF)	; 窿
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=gb2312		. #x417E)	; ø»„¶¡
     (=jis-x0208		. #x6363)	; ø½‹—º
-    (=iso-ir165		. #x417E)	; ø»ž±
+    (=gt-pj-1		. #x6363)	; ý¡€ˆ… 
+    (=daikanwa		. 25660)	; ø¸†¼
+    (=ucs@jis		. #x7ABF)	; ø½‹—º
+    (=gt		. 33120)	; ý¡€ˆ… 
+    ))
+(define-char
+  '((=>ucs		. #x7ABF)	; 窿
+    (morohashi-daikanwa	25660 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
     (=cns11643-1	. #x7455)	; ø»’½Š
-    (ideograph-daikanwa . 25660)	; ø¸†¼
+    ))
+(define-char
+  '((morohashi-daikanwa	25660 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=gb2312		. #x417E)	; ø»„¶¡
+    (=iso-ir165		. #x417E)	; ø»ž±
     (=ucs		. #x7ABF)	; 窿
     ))
 (define-char
@@ -3433,7 +3822,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
     (=cns11643-2	. #x5E25)	; ø»”¦Š
-    (ideograph-daikanwa . 25662)	; ø¸†¾
+    (=daikanwa		. 25662)	; ø¸†¾
     (=ucs		. #x7AC0)	; 竀
     ))
 (define-char
@@ -3441,7 +3830,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25663)	; ø¸†¿
+    (=daikanwa		. 25663)	; ø¸†¿
     ))
 (define-char
   '((morohashi-daikanwa	25663 0 0)
@@ -3456,7 +3845,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25664)	; ø¸†‘€
+    (=daikanwa		. 25664)	; ø¸†‘€
     ))
 (define-char
   '((=>ucs		. #x7AC2)	; 竂
@@ -3478,7 +3867,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25665)	; ø¸†‘
+    (=daikanwa		. 25665)	; ø¸†‘
     ))
 (define-char
   '((morohashi-daikanwa	25665 0 0)
@@ -3493,14 +3882,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (chinese-cns11643-7 . #x3A21)	; ø»ž£¢
+    (=cns11643-7	. #x3A21)	; ø»ž£¢
     ))
 (define-char
   '((=>ucs		. #x25A10)	; 𥨐
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25666)	; ø¸†‘‚
+    (=daikanwa		. 25666)	; ø¸†‘‚
     ))
 (define-char
   '((morohashi-daikanwa	25666 0 0)
@@ -3515,7 +3904,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25667)	; ø¸†‘ƒ
+    (=daikanwa		. 25667)	; ø¸†‘ƒ
     ))
 (define-char
   '((morohashi-daikanwa	25667 0 0)
@@ -3530,7 +3919,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25668)	; ø¸†‘„
+    (=daikanwa		. 25668)	; ø¸†‘„
     ))
 (define-char
   '((morohashi-daikanwa	25668 0 1)
@@ -3545,7 +3934,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25669)	; ø¸†‘…
+    (=daikanwa		. 25669)	; ø¸†‘…
     ))
 (define-char
   '((morohashi-daikanwa	25669 0 0)
@@ -3560,14 +3949,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25670)	; ø¸†‘†
+    (=daikanwa		. 25670)	; ø¸†‘†
     ))
 (define-char
   '((morohashi-daikanwa	25670 0 1)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (chinese-cns11643-7 . #x397C)	; ø»ž£Ÿ
+    (=cns11643-7	. #x397C)	; ø»ž£Ÿ
     (=ucs		. #x25A12)	; 𥨒
     ))
 (define-char
@@ -3575,14 +3964,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25671)	; ø¸†‘‡
+    (=daikanwa		. 25671)	; ø¸†‘‡
     ))
 (define-char
   '((morohashi-daikanwa	25671 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (chinese-cns11643-7 . #x397D)	; ø»ž£ 
+    (=cns11643-7	. #x397D)	; ø»ž£ 
     (=ucs		. #x25A13)	; 𥨓
     ))
 (define-char
@@ -3590,14 +3979,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25672)	; ø¸†‘ˆ
+    (=daikanwa		. 25672)	; ø¸†‘ˆ
     ))
 (define-char
   '((morohashi-daikanwa	25672 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (chinese-cns11643-7 . #x397B)	; ø»ž£ž
+    (=cns11643-7	. #x397B)	; ø»ž£ž
     (=ucs		. #x25A14)	; 𥨔
     ))
 (define-char
@@ -3605,7 +3994,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25673)	; ø¸†‘‰
+    (=daikanwa		. 25673)	; ø¸†‘‰
     ))
 (define-char
   '((morohashi-daikanwa	25673 0 0)
@@ -3620,14 +4009,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25674)	; ø¸†‘Š
+    (=daikanwa		. 25674)	; ø¸†‘Š
     ))
 (define-char
   '((morohashi-daikanwa	25674 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (chinese-cns11643-7 . #x397E)	; ø»ž£¡
+    (=cns11643-7	. #x397E)	; ø»ž£¡
     (=ucs		. #x25A16)	; 𥨖
     ))
 (define-char
@@ -3635,7 +4024,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 25677)	; ø¸†‘
+    (=daikanwa		. 25677)	; ø¸†‘
     ))
 (define-char
   '((morohashi-daikanwa	25677 0 0)
@@ -3658,29 +4047,63 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
     (shinjigen-2	. 5723)
-    (ideograph-daikanwa . 25679)	; ø¸†‘
+    (=gt-pj-1		. #x6362)	; ý¡€ˆ…¦
+    (=daikanwa		. 25679)	; ø¸†‘
+    (=gt		. 33126)	; ý¡€ˆ…¦
     ))
 (define-char
-  '((morohashi-daikanwa	25679 0 1)
+  '((morohashi-daikanwa	25679 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=gb12345		. #x345C)	; 竄
+    (=ucs		. #x7AC4)	; 竄
+    ))
+(define-char
+  '((=>ucs		. #x7AC4)	; 竄
+    (morohashi-daikanwa	25679 0 1)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
     (=jis-x0208		. #x6362)	; ø½‹—¹
     (=ks-x1001		. #x7341)	; ø»Š“ˆ
+    (=ucs@jis		. #x7AC4)	; ø½‹—¹
+    ))
+(define-char
+  '((=>ucs		. #x7AC4)	; 竄
+    (morohashi-daikanwa	25679 0 2)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
     (=cns11643-1	. #x7675)	; ø»“€¦
-    (=gb12345		. #x345C)	; 竄
-    (=ucs		. #x7AC4)	; 竄
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7AC5)	; 竅
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
     (shinjigen-2	. 5722)
     (=jis-x0208		. #x6361)	; ø½‹—¸
     (=ks-x1001		. #x502B)	; ø»‰Ÿ˜
+    (=gt-pj-1		. #x6361)	; ý¡€ˆ…¥
+    (=daikanwa		. 25680)	; ø¸†‘
+    (=ucs@jis		. #x7AC5)	; ø½‹—¸
+    (=gt		. 33125)	; ý¡€ˆ…¥
+    ))
+(define-char
+  '((=>ucs		. #x7AC5)	; 竅
+    (morohashi-daikanwa	25680 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
     (=cns11643-1	. #x7676)	; ø»“€§
+    ))
+(define-char
+  '((morohashi-daikanwa	25680 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
     (=gb12345		. #x474F)	; 竅
-    (ideograph-daikanwa . 25680)	; ø¸†‘
     (=ucs		. #x7AC5)	; 竅
     ))
 (define-char
@@ -3688,7 +4111,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (ideograph-daikanwa . 25681)	; ø¸†‘‘
+    (=daikanwa		. 25681)	; ø¸†‘‘
     ))
 (define-char
   '((morohashi-daikanwa	25681 0 0)
@@ -3703,7 +4126,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (ideograph-daikanwa . 25683)	; ø¸†‘“
+    (=daikanwa		. 25683)	; ø¸†‘“
     ))
 (define-char
   '((morohashi-daikanwa	25683 0 0)
@@ -3718,7 +4141,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (ideograph-daikanwa . 25684)	; ø¸†‘”
+    (=daikanwa		. 25684)	; ø¸†‘”
     ))
 (define-char
   '((morohashi-daikanwa	25684 0 1)
@@ -3741,7 +4164,7 @@
     (total-strokes	 . 19)
     (=jis-x0212		. #x5164)	; ø»‹«³
     (=cns11643-4	. #x604B)	; ø»˜½´
-    (ideograph-daikanwa . 25686)	; ø¸†‘–
+    (=daikanwa		. 25686)	; ø¸†‘–
     (=ucs		. #x7AC6)	; 竆
     ))
 (define-char
@@ -3749,7 +4172,7 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
     (=jis-x0213-2-2000	. #x7337)	; ø»¦•²
-    (ideograph-daikanwa . 25687)	; ø¸†‘—
+    (=daikanwa		. 25687)	; ø¸†‘—
     (=ucs		. #x41BF)	; 䆿
     ))
 (define-char
@@ -3765,7 +4188,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (ideograph-daikanwa . 25688)	; ø¸†‘˜
+    (=daikanwa		. 25688)	; ø¸†‘˜
     ))
 (define-char
   '((morohashi-daikanwa	25688 0 0)
@@ -3780,14 +4203,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (ideograph-daikanwa . 25689)	; ø¸†‘™
+    (=daikanwa		. 25689)	; ø¸†‘™
     ))
 (define-char
   '((morohashi-daikanwa	25689 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (chinese-cns11643-7 . #x4844)	; ø»ž¸©
+    (=cns11643-7	. #x4844)	; ø»ž¸©
     (=ucs		. #x25A2B)	; 𥨫
     ))
 (define-char
@@ -3795,14 +4218,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (ideograph-daikanwa . 25690)	; ø¸†‘š
+    (=daikanwa		. 25690)	; ø¸†‘š
     ))
 (define-char
   '((morohashi-daikanwa	25690 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (chinese-cns11643-7 . #x4843)	; ø»ž¸¨
+    (=cns11643-7	. #x4843)	; ø»ž¸¨
     (=ucs		. #x25A2C)	; 𥨬
     ))
 (define-char
@@ -3810,7 +4233,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (ideograph-daikanwa . 25691)	; ø¸†‘›
+    (=daikanwa		. 25691)	; ø¸†‘›
     ))
 (define-char
   '((morohashi-daikanwa	25691 0 0)
@@ -3825,14 +4248,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (ideograph-daikanwa . 25692)	; ø¸†‘œ
+    (=daikanwa		. 25692)	; ø¸†‘œ
     ))
 (define-char
   '((morohashi-daikanwa	25692 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (chinese-cns11643-7 . #x4842)	; ø»ž¸§
+    (=cns11643-7	. #x4842)	; ø»ž¸§
     (=ucs		. #x25A2E)	; 𥨮
     ))
 (define-char
@@ -3854,14 +4277,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (ideograph-daikanwa . 25693)	; ø¸†‘
+    (=daikanwa		. 25693)	; ø¸†‘
     ))
 (define-char
   '((morohashi-daikanwa	25693 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (chinese-cns11643-7 . #x4E64)	; ø»Ÿ½
+    (=cns11643-7	. #x4E64)	; ø»Ÿ½
     (=ucs		. #x25A30)	; 𥨰
     ))
 (define-char
@@ -3869,14 +4292,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (ideograph-daikanwa . 25694)	; ø¸†‘ž
+    (=daikanwa		. 25694)	; ø¸†‘ž
     ))
 (define-char
   '((morohashi-daikanwa	25694 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (chinese-cns11643-7 . #x4E66)	; ø»Ÿ¿
+    (=cns11643-7	. #x4E66)	; ø»Ÿ¿
     (=ucs		. #x25A31)	; 𥨱
     ))
 (define-char
@@ -3887,15 +4310,24 @@
     (shinjigen-2	. 5726)
     (=jis-x0208		. #x6365)	; ø½‹—¼
     (=ks-x1001		. #x5464)	; ø»‰¦‰
-    (ideograph-daikanwa . 25695)	; ø¸†‘Ÿ
+    (=gt-pj-1		. #x6365)	; ý¡€ˆ†
+    (=daikanwa		. 25695)	; ø¸†‘Ÿ
     (=ucs@jis		. #x7AC7)	; ø½‹—¼
+    (=gt		. 33153)	; ý¡€ˆ†
     ))
 (define-char
-  '((morohashi-daikanwa	25695 0 1)
+  '((=>ucs		. #x7AC7)	; 竇
+    (morohashi-daikanwa	25695 0 1)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
     (=cns11643-1	. #x7A22)	; ø»“…‹
+    ))
+(define-char
+  '((morohashi-daikanwa	25695 0 2)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 15)
+    (total-strokes	 . 20)
     (=gb12345		. #x713C)	; 竇
     (=ucs		. #x7AC7)	; 竇
     ))
@@ -3904,7 +4336,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (ideograph-daikanwa . 25697)	; ø¸†‘¡
+    (=daikanwa		. 25697)	; ø¸†‘¡
     ))
 (define-char
   '((morohashi-daikanwa	25697 0 0)
@@ -3919,7 +4351,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (ideograph-daikanwa . 25698)	; ø¸†‘¢
+    (=daikanwa		. 25698)	; ø¸†‘¢
     ))
 (define-char
   '((morohashi-daikanwa	25698 0 0)
@@ -3934,7 +4366,7 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (ideograph-daikanwa . 25699)	; ø¸†‘£
+    (=daikanwa		. 25699)	; ø¸†‘£
     ))
 (define-char
   '((morohashi-daikanwa	25699 0 0)
@@ -3948,37 +4380,64 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (chinese-cns11643-7 . #x4E67)	; ø»Ÿ‚€
+    (=cns11643-7	. #x4E67)	; ø»Ÿ‚€
     (=ucs		. #x25A36)	; 𥨶
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (chinese-cns11643-7 . #x4E65)	; ø»Ÿ¾
+    (=cns11643-7	. #x4E65)	; ø»Ÿ¾
     (=ucs		. #x25A37)	; 𥨷
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7AC8)	; 竈
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 16)
     (total-strokes	 . 21)
     (shinjigen-2	. 5727)
     (=jis-x0208-1978	. #x3376)	; ø»‚—±
     (=jis-x0208-1983	. #x635E)	; ø»‡²
-    (=cns11643-3	. #x5E49)	; ø»–°²
     (=jis-x0208-1990	. #x635E)	; ø½‹—µ
+    (=gt-pj-1		. #x635E)	; ý¡€ˆ†‹
+    (=daikanwa		. 25703)	; ø¸†‘§
+    (=ucs@jis		. #x7AC8)	; ø»‚—±
+    (=gt		. 33163)	; ý¡€ˆ†‹
+    ))
+(define-char
+  '((=>ucs		. #x7AC8)	; 竈
+    (morohashi-daikanwa	25703 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 16)
+    (total-strokes	 . 21)
+    (=cns11643-3	. #x5E49)	; ø»–°²
+    ))
+(define-char
+  '((morohashi-daikanwa	25703 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 16)
+    (total-strokes	 . 21)
     (=gb12345		. #x546E)	; 竈
-    (ideograph-daikanwa . 25703)	; ø¸†‘§
     (=ucs		. #x7AC8)	; 竈
     ))
 (define-char
-  '((morohashi-daikanwa	25703 0 5)
+  '((=>ucs		. #x7AC3)	; 竃
+    (morohashi-daikanwa	25703 0 4)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
     (=jis-x0208-1978	. #x635E)	; ø»ƒ¹
     (=jis-x0208-1983	. #x3376)	; ø»†«¹
     (=jis-x0208-1990	. #x3376)	; ø½Š‘­
+    (=gt-pj-1		. #x3376)	; ý¡€ˆ…”
+    (=ucs@jis		. #x7AC3)	; ø»ƒ¹
+    (=gt		. 33108)	; ý¡€ˆ…”
+    ))
+(define-char
+  '((morohashi-daikanwa	25703 0 5)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
     (=ucs		. #x7AC3)	; 竃
     ))
 (define-char
@@ -3987,14 +4446,14 @@
     (total-strokes	 . 21)
     (=jis-x0212		. #x5165)	; ø»‹«´
     (=cns11643-3	. #x5E48)	; ø»–°±
-    (ideograph-daikanwa . 25705)	; ø¸†‘©
+    (=daikanwa		. 25705)	; ø¸†‘©
     (=ucs		. #x7AC9)	; 竉
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 16)
     (total-strokes	 . 21)
-    (chinese-cns11643-7 . #x542D)	; ø»Ÿ‰º
+    (=cns11643-7	. #x542D)	; ø»Ÿ‰º
     (=ucs		. #x25A35)	; 𥨵
     ))
 (define-char
@@ -4008,7 +4467,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 16)
     (total-strokes	 . 21)
-    (chinese-cns11643-7 . #x542B)	; ø»Ÿ‰¸
+    (=cns11643-7	. #x542B)	; ø»Ÿ‰¸
     (=ucs		. #x25A3C)	; 𥨼
     ))
 (define-char
@@ -4036,7 +4495,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 16)
     (total-strokes	 . 21)
-    (chinese-cns11643-7 . #x542C)	; ø»Ÿ‰¹
+    (=cns11643-7	. #x542C)	; ø»Ÿ‰¹
     (=ucs		. #x25A41)	; 𥩁
     ))
 (define-char
@@ -4047,15 +4506,32 @@
     (=ucs		. #x25A42)	; 𥩂
     ))
 (define-char
-  '((ideographic-radical . 116)	; â½³
+  '((=>ucs		. #x7ACA)	; 竊
+    (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 17)
     (total-strokes	 . 23)
     (shinjigen-2	. 5688)
     (=jis-x0208		. #x6366)	; ø½‹—½
     (=ks-x1001		. #x6F3C)	; ø»Š‹
+    (=gt-pj-1		. #x6366)	; ý¡€ˆ†‘
+    (=daikanwa		. 25713)	; ø¸†‘±
+    (=ucs@jis		. #x7ACA)	; ø½‹—½
+    (=gt		. 33169)	; ý¡€ˆ†‘
+    ))
+(define-char
+  '((=>ucs		. #x7ACA)	; 竊
+    (morohashi-daikanwa	25713 0 0)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 17)
+    (total-strokes	 . 23)
     (=cns11643-1	. #x7C3D)	; ø»“ˆ¢
+    ))
+(define-char
+  '((morohashi-daikanwa	25713 0 1)
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 17)
+    (total-strokes	 . 23)
     (=gb12345		. #x4754)	; 竊
-    (ideograph-daikanwa . 25713)	; ø¸†‘±
     (=ucs		. #x7ACA)	; 竊
     ))
 (define-char
@@ -4069,8 +4545,8 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 18)
     (total-strokes	 . 23)
-    (chinese-cns11643-7 . #x5C2F)	; ø»Ÿ•¬
-    (ideograph-daikanwa . 49416)	; ø¸Œ„ˆ
+    (=cns11643-7	. #x5C2F)	; ø»Ÿ•¬
+    (=daikanwa		. 49416)	; ø¸Œ„ˆ
     (=ucs		. #x25A4B)	; 𥩋
     ))
 (define-char
@@ -4085,14 +4561,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 19)
     (total-strokes	 . 24)
-    (ideograph-daikanwa . 49417)	; ø¸Œ„‰
+    (=daikanwa		. 49417)	; ø¸Œ„‰
     ))
 (define-char
   '((morohashi-daikanwa	49417 0 0)
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 19)
     (total-strokes	 . 24)
-    (chinese-cns11643-7 . #x5F29)	; ø»Ÿš€
+    (=cns11643-7	. #x5F29)	; ø»Ÿš€
     (=ucs		. #x25A50)	; 𥩐
     ))
 (define-char
@@ -4106,7 +4582,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 20)
     (total-strokes	 . 25)
-    (chinese-cns11643-7 . #x612A)	; ø»Ÿœ½
+    (=cns11643-7	. #x612A)	; ø»Ÿœ½
     (=ucs		. #x25A4E)	; 𥩎
     ))
 (define-char
@@ -4120,7 +4596,7 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 21)
     (total-strokes	 . 26)
-    (chinese-cns11643-7 . #x624A)	; ø»Ÿž»
+    (=cns11643-7	. #x624A)	; ø»Ÿž»
     (=ucs		. #x25A53)	; 𥩓
     ))
 (define-char