X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R011-Enter.el;h=108855ea7fdce9adfd009003c6c8ce2418b3d60a;hb=6f8a91966f78f32c2150f434d378f7ac4d858bc0;hp=4e28931c8fc61fe14a951e034e1bb021150066f8;hpb=5bf45fe9c842c80b1802fd43cac1600aaabdb965;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el
index 4e28931..108855e 100644
--- a/lisp/utf-2000/Ideograph-R011-Enter.el
+++ b/lisp/utf-2000/Ideograph-R011-Enter.el
@@ -5,26 +5,25 @@
     (total-strokes	 . 2)
     (shinjigen-1	. 480)
     (shinjigen-2	. 480)
-    (japanese-jisx0208-1978	. #x467E)	; ø»‚³³
-    (japanese-jisx0208		. #x467E)	; ø»‡‡»
-    (korean-ksc5601		. #x6C7D)	; ø»Š‰²
-    (japanese-jisx0208-1990	. #x467E)	; ø½Š­¯
-    (ideograph-daikanwa		. 01415)	; ø¸€–‡
-    (mojikyo			. 001415)	; ý €€–‡
+    (=jis-x0208		. #x467E)	; ø½Š­¯
+    (korean-ksc5601	. #x6C7D)	; ø»Š‰²
+    (=gt-pj-1		. #x467E)	; ø½Š­¯
+    (chinese-big5	. #xA44A)	; ý¢€Š‘Š
+    (ideograph-daikanwa . 01415)	; ø¸€–‡
+    (=gt-k		. 00050)	; ý¡„€€²
+    (=ucs@jis		. #x5165)	; ø½Š­¯
+    (mojikyo		. 001415)	; ý €€–‡
     ))
 (define-char
   '((morohashi-daikanwa	1415 0 0)
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 102)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 102 1)
     (chinese-gb2312	. #x486B)	; ø»…€ 
-    (chinese-isoir165	. #x486B)	; ø»¨°
+    (=iso-ir165		. #x486B)	; ø»¨°
     (chinese-cns11643-1 . #x442B)	; ø»‘¶€
-    (chinese-big5	. #xA44A)	; øºŸ¢¡
-    (ucs		. #x5165)	; 入
+    (=ucs		. #x5165)	; 入
     ))
 (define-char
   '((=>ucs		. #x204DB)	; 𠓛
@@ -32,24 +31,23 @@
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
     (<-wrong-ideograph
-     (:sources	(seiji-tsuu morohashi-daikanwa)
-      :char	((ideograph-daikanwa . 00345)	; ø¸€…™
+     (:char	((ideograph-daikanwa . 00345)	; ø¸€…™
 		 )
-      ))
+      :sources	(seiji-tsuu morohashi-daikanwa)))
+    (hanyu-dazidian	1 102 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       ))
-    (ideograph-daikanwa		. 01416)	; ø¸€–ˆ
-    (ideograph-hanziku-1	. #xB8E0)	; ý¢€›£ 
-    (mojikyo			. 001416)	; ý €€–ˆ
+    (ideograph-daikanwa . 01416)	; ø¸€–ˆ
+    (=hanziku-1		. #xB8E0)	; ý¢€›£ 
+    (mojikyo		. 001416)	; ý €€–ˆ
     ))
 (define-char
   '((morohashi-daikanwa	1416 0 0)
@@ -58,14 +56,14 @@
     (total-strokes	 . 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       ))
     (chinese-cns11643-6 . #x2136)	; ø»›µ…
-    (ucs		. #x204DB)	; 𠓛
+    (=ucs		. #x204DB)	; 𠓛
     ))
 (define-char
   '((=>ucs		. #x5166)	; 兦
@@ -74,37 +72,51 @@
     (total-strokes	 . 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
-      (ucs		  . #x2FFA)	; ⿺
+      (=ucs		  . #x2FFA)	; ⿺
       )
-     ((ucs		  . #x200CA)	; 𠃊
+     ((=ucs		  . #x200CA)	; 𠃊
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       ))
     (japanese-jisx0212	. #x326E)	; ø»Š¾›
     (ideograph-daikanwa . 01417)	; ø¸€–‰
+    (=ucs@jis		. #x5166)	; ø»Š¾›
     (mojikyo		. 001417)	; ý €€–‰
     ))
 (define-char
-  '((morohashi-daikanwa	1417 0 0)
+  '((=>ucs		. #x5166)	; 兦
+    (morohashi-daikanwa	1417 0 0)
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 8)
-    (hanyu-dazidian-page . 8)
-    (hanyu-dazidian-char . 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
-      (ucs		  . #x2FFA)	; ⿺
+      (=ucs		  . #x2FFA)	; ⿺
       )
-     ((ucs		  . #x200CA)	; 𠃊
+     ((=ucs		  . #x200CA)	; 𠃊
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       ))
     (chinese-cns11643-3 . #x2134)	; ø»•–·
-    (ucs		. #x5166)	; 兦
+    ))
+(define-char
+  '((morohashi-daikanwa	1417 0 1)
+    (ideographic-radical . 11)	; ⼊
+    (ideographic-strokes . 1)
+    (total-strokes	 . 3)
+    (hanyu-dazidian	8 8 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (=ucs		  . #x2FFA)	; ⿺
+      )
+     ((=ucs		  . #x200CA)	; 𠃊
+      )
+     ((=ucs		  . #x5165)	; 入
+      ))
+    (=hanziku-12	. #xEB63)	; ý¢ƒŽ­£
+    (=ucs		. #x5166)	; 兦
     ))
 (define-char
   '((=>ucs		. #x5167)	; 內
@@ -113,8 +125,9 @@
     (total-strokes	 . 4)
     (shinjigen-1	. 482)
     (shinjigen-2	. 482)
+    (chinese-big5	. #xA4BA)	; ý¢€Š’º
     (ideograph-daikanwa . 01418)	; ø¸€–Š
-    (china3-jef		. #x43DE)	; øº„ž
+    (=jef-china3	. #x43DE)	; øº„ž
     (mojikyo		. 001418)	; ý €€–Š
     ))
 (define-char
@@ -122,11 +135,11 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (hanyu-dazidian	1 97 2)
     (shinjigen-1	. 482)
     (shinjigen-2	. 482)
     (chinese-cns11643-1 . #x4479)	; ø»‘·Ž
-    (chinese-big5	. #xA4BA)	; øºŸ£¯
-    (ucs		. #x5167)	; 內
+    (=ucs		. #x5167)	; 內
     ))
 (define-char
   '((=>ucs		. #x5167)	; 內
@@ -140,27 +153,23 @@
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 105)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 105 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (ucs		  . #x2FF0)	; â¿°
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       ))
-    (ideograph-daikanwa		. 01419)	; ø¸€–‹
-    (ideograph-hanziku-1	. #xB9A1)	; ý¢€›¦¡
-    (mojikyo			. 001419)	; ý €€–‹
-    (ucs			. #x204DC)	; 𠓜
+    (ideograph-daikanwa . 01419)	; ø¸€–‹
+    (=hanziku-1		. #xB9A1)	; ý¢€›¦¡
+    (mojikyo		. 001419)	; ý €€–‹
+    (=ucs		. #x204DC)	; 𠓜
     ))
 (define-char
   '((=>ucs		. #x204DC)	; 𠓜
@@ -170,11 +179,11 @@
     (total-strokes	 . 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (ucs		  . #x2FF0)	; â¿°
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       ))
     (chinese-cns11643-5 . #x2136)	; ø»™«
     ))
@@ -182,21 +191,21 @@
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (hanyu-dazidian	1 103 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x5341)	; 十
+     ((=ucs		  . #x5341)	; 十
       ))
-    (ideograph-daikanwa		. 01420)	; ø¸€–Œ
-    (ideograph-hanziku-1	. #xB944)	; ý¢€›¥„
-    (mojikyo			. 001420)	; ý €€–Œ
-    (ucs			. #x204DD)	; 𠓝
+    (ideograph-daikanwa . 01420)	; ø¸€–Œ
+    (=hanziku-1		. #xB944)	; ý¢€›¥„
+    (mojikyo		. 001420)	; ý €€–Œ
+    (=ucs		. #x204DD)	; 𠓝
     ))
 (define-char
   '((=>ucs		. #x204DD)	; 𠓝
@@ -206,11 +215,11 @@
     (total-strokes	 . 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x5341)	; 十
+     ((=ucs		  . #x5341)	; 十
       ))
     (chinese-cns11643-5 . #x2135)	; ø»™«€
     ))
@@ -226,20 +235,20 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (hanyu-dazidian	1 111 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x5DE5)	; å·¥
+     ((=ucs		  . #x5DE5)	; å·¥
       ))
-    (ideograph-daikanwa		. 01422)	; ø¸€–Ž
-    (ideograph-hanziku-1	. #xBAC6)	; ý¢€›«†
-    (mojikyo			. 001422)	; ý €€–Ž
+    (ideograph-daikanwa . 01422)	; ø¸€–Ž
+    (=hanziku-1		. #xBAC6)	; ý¢€›«†
+    (mojikyo		. 001422)	; ý €€–Ž
     ))
 (define-char
   '((morohashi-daikanwa	1422 0 0)
@@ -248,37 +257,34 @@
     (total-strokes	 . 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x5DE5)	; å·¥
+     ((=ucs		  . #x5DE5)	; å·¥
       ))
     (chinese-cns11643-3 . #x2176)	; ø»•—¹
-    (ucs		. #x34B0)	; 㒰
+    (=ucs		. #x34B0)	; 㒰
     ))
 (define-char
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 111)
-    (hanyu-dazidian-char . 8)
+    (hanyu-dazidian	1 111 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x4E5E)	; 乞
+     ((=ucs		  . #x4E5E)	; 乞
       ))
-    (ideograph-daikanwa		. 01423)	; ø¸€–
-    (ideograph-hanziku-1	. #xBACB)	; ý¢€›«‹
-    (mojikyo			. 001423)	; ý €€–
-    (ucs			. #x204DF)	; 𠓟
+    (ideograph-daikanwa . 01423)	; ø¸€–
+    (=hanziku-1		. #xBACB)	; ý¢€›«‹
+    (mojikyo		. 001423)	; ý €€–
+    (=ucs		. #x204DF)	; 𠓟
     ))
 (define-char
   '((=>ucs		. #x204DF)	; 𠓟
@@ -288,11 +294,11 @@
     (total-strokes	 . 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x4E5E)	; 乞
+     ((=ucs		  . #x4E5E)	; 乞
       ))
     (chinese-cns11643-6 . #x2237)	; ø»›¶¤
     ))
@@ -303,20 +309,20 @@
     (total-strokes	 . 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x738B)	; 王
+     ((=ucs		  . #x738B)	; 王
       ))
     (shinjigen-1	. 4876)
     (shinjigen-2	. 4876)
     (korean-ksc5601	. #x6E6F)	; ø»ŠŒ 
+    (chinese-big5	. #xA5FE)	; ý¢€Š—¾
     (ideograph-daikanwa . 01424)	; ø¸€–
-    (china3-jef		. #x43DF)	; øº„Ÿ
+    (=jef-china3	. #x43DF)	; øº„Ÿ
     (mojikyo		. 001424)	; ý €€–
     ))
 (define-char
@@ -325,19 +331,16 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 115)
-    (hanyu-dazidian-char . 8)
+    (hanyu-dazidian	1 115 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x738B)	; 王
+     ((=ucs		  . #x738B)	; 王
       ))
     (chinese-cns11643-1 . #x4740)	; ø»‘º¯
-    (chinese-big5	. #xA5FE)	; øºŸ§
     ))
 (define-char
   '((morohashi-daikanwa	1424 0 1)
@@ -346,41 +349,39 @@
     (total-strokes	 . 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((name*		  . "ideographic component person as roof")
+      (=big5-cdp	  . #x8B5D)	; ý¢€ˆ­
       )
-     ((ucs		  . #x738B)	; 王
+     ((=ucs		  . #x738B)	; 王
       ))
-    (japanese-jisx0208-1978	. #x4134)	; ø»‚«“
-    (chinese-gb2312		. #x482B)	; ø»„¿ 
-    (japanese-jisx0208		. #x4134)	; ø»†¿›
-    (chinese-isoir165		. #x482B)	; ø»§°
-    (japanese-jisx0208-1990	. #x4134)	; ø½Š¥
-    (ucs			. #x5168)	; 全
+    (chinese-gb2312	. #x482B)	; ø»„¿ 
+    (=jis-x0208		. #x4134)	; ø½Š¥
+    (=iso-ir165		. #x482B)	; ø»§°
+    (=gt-pj-1		. #x4134)	; 全
+    (=gt-k		. 01658)	; ý¡„€™º
+    (=ucs		. #x5168)	; 全
     ))
 (define-char
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 116)
-    (hanyu-dazidian-char . 7)
+    (hanyu-dazidian	1 116 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((chinese-big5-cdp	  . #x8DA2)	; ý¢€ˆ¶¢
+     ((=ucs		  . #x6534)	; 攴
       ))
-    (ideograph-daikanwa		. 01425)	; ø¸€–‘
-    (ideograph-hanziku-1	. #xBBCD)	; ý¢€›¯
-    (mojikyo			. 001425)	; ý €€–‘
-    (ucs			. #x204E0)	; 𠓠
+    (ideograph-daikanwa . 01425)	; ø¸€–‘
+    (=hanziku-1		. #xBBCD)	; ý¢€›¯
+    (mojikyo		. 001425)	; ý €€–‘
+    (=ucs		. #x204E0)	; 𠓠
     ))
 (define-char
   '((=>ucs		. #x204E0)	; 𠓠
@@ -390,11 +391,11 @@
     (total-strokes	 . 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((chinese-big5-cdp	  . #x8DA2)	; ý¢€ˆ¶¢
+     ((=ucs		  . #x6534)	; 攴
       ))
     (chinese-cns11643-6 . #x2356)	; ø»›¸¡
     ))
@@ -403,20 +404,20 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 117 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x65E5)	; 日
+     ((=ucs		  . #x65E5)	; 日
       ))
-    (ideograph-daikanwa		. 01426)	; ø¸€–’
-    (ideograph-hanziku-1	. #xBBE9)	; ý¢€›¯©
-    (mojikyo			. 001426)	; ý €€–’
+    (ideograph-daikanwa . 01426)	; ø¸€–’
+    (=hanziku-1		. #xBBE9)	; ý¢€›¯©
+    (mojikyo		. 001426)	; ý €€–’
     ))
 (define-char
   '((morohashi-daikanwa	1426 0 0)
@@ -428,37 +429,34 @@
     (hanyu-dazidian-char . 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x65E5)	; 日
+     ((=ucs		  . #x65E5)	; 日
       ))
     (chinese-cns11643-3 . #x2279)	; ø»•™š
-    (ucs		. #x34B2)	; 㒲
+    (=ucs		. #x34B2)	; 㒲
     ))
 (define-char
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 116)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 116 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x4E93)	; 亓
+     ((=ucs		  . #x4E93)	; 亓
       ))
-    (ideograph-daikanwa		. 01427)	; ø¸€–“
-    (ideograph-hanziku-1	. #xBBC7)	; ý¢€›¯‡
-    (mojikyo			. 001427)	; ý €€–“
-    (ucs			. #x204E1)	; 𠓡
+    (ideograph-daikanwa . 01427)	; ø¸€–“
+    (=hanziku-1		. #xBBC7)	; ý¢€›¯‡
+    (mojikyo		. 001427)	; ý €€–“
+    (=ucs		. #x204E1)	; 𠓡
     ))
 (define-char
   '((=>ucs		. #x204E1)	; 𠓡
@@ -468,11 +466,11 @@
     (total-strokes	 . 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x4E93)	; 亓
+     ((=ucs		  . #x4E93)	; 亓
       ))
     (chinese-cns11643-6 . #x2355)	; ø»›¸ 
     ))
@@ -503,37 +501,32 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 100)
-    (hanyu-dazidian-char . 8)
+    (hanyu-dazidian	1 100 8)
     (chinese-cns11643-3 . #x2455)	; ø»•›²
-    (chinese-big5-cdp	. #x8ABC)	; ý¢€ˆª¼
-    (ucs		. #x34B3)	; 㒳
+    (=big5-cdp		. #x8ABC)	; ý¢€ˆª¼
+    (=ucs		. #x34B3)	; 㒳
     ))
 (define-char
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 128)
-    (hanyu-dazidian-char . 8)
+    (hanyu-dazidian	1 128 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
+      (=ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       )
-     ((ucs		  . #x65E5)	; 日
+     ((=ucs		  . #x65E5)	; 日
       ))
-    (ideograph-daikanwa		. 01431)	; ø¸€–—
-    (ideograph-hanziku-1	. #xBE55)	; ý¢€›¹•
-    (mojikyo			. 001431)	; ý €€–—
-    (ucs			. #x204E4)	; 𠓤
+    (ideograph-daikanwa . 01431)	; ø¸€–—
+    (=hanziku-1		. #xBE55)	; ý¢€›¹•
+    (mojikyo		. 001431)	; ý €€–—
+    (=ucs		. #x204E4)	; 𠓤
     ))
 (define-char
   '((=>ucs		. #x204E4)	; 𠓤
@@ -543,13 +536,13 @@
     (total-strokes	 . 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
+      (=ucs		  . #x2FF3)	; ⿳
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       )
-     ((ucs		  . #x65E5)	; 日
+     ((=ucs		  . #x65E5)	; 日
       ))
     (chinese-cns11643-5 . #x2336)	; ø»™­½
     ))
@@ -558,62 +551,56 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (hanyu-dazidian	1 129 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x51FA)	; 出
+     ((=ucs		  . #x51FA)	; 出
       ))
-    (ideograph-daikanwa		. 01432)	; ø¸€–˜
-    (ideograph-hanziku-1	. #xBE71)	; ý¢€›¹±
-    (mojikyo			. 001432)	; ý €€–˜
+    (ideograph-daikanwa . 01432)	; ø¸€–˜
+    (=hanziku-1		. #xBE71)	; ý¢€›¹±
+    (mojikyo		. 001432)	; ý €€–˜
     ))
 (define-char
   '((morohashi-daikanwa	1432 0 0)
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 129)
-    (hanyu-dazidian-char . 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x51FA)	; 出
+     ((=ucs		  . #x51FA)	; 出
       ))
     (chinese-cns11643-5 . #x2337)	; ø»™­¾
-    (ucs		. #x34B4)	; 㒴
+    (=ucs		. #x34B4)	; 㒴
     ))
 (define-char
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 129)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 129 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x4E4E)	; 乎
+     ((=ucs		  . #x4E4E)	; 乎
       ))
-    (ideograph-daikanwa		. 01433)	; ø¸€–™
-    (ideograph-hanziku-1	. #xBE6F)	; ý¢€›¹¯
-    (mojikyo			. 001433)	; ý €€–™
-    (ucs			. #x204E7)	; 𠓧
+    (ideograph-daikanwa . 01433)	; ø¸€–™
+    (=hanziku-1		. #xBE6F)	; ý¢€›¹¯
+    (mojikyo		. 001433)	; ý €€–™
+    (=ucs		. #x204E7)	; 𠓧
     ))
 (define-char
   '((=>ucs		. #x204E7)	; 𠓧
@@ -623,11 +610,11 @@
     (total-strokes	 . 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x4E4E)	; 乎
+     ((=ucs		  . #x4E4E)	; 乎
       ))
     (chinese-cns11643-5 . #x2338)	; ø»™­¿
     ))
@@ -642,26 +629,23 @@
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 128)
-    (hanyu-dazidian-char . 6)
+    (hanyu-dazidian	1 128 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
+      (=ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       )
-     ((chinese-big5-cdp	  . #x8DA2)	; ý¢€ˆ¶¢
+     ((=ucs		  . #x6534)	; 攴
       ))
-    (ideograph-daikanwa		. 01435)	; ø¸€–›
-    (ideograph-hanziku-1	. #xBE53)	; ý¢€›¹“
-    (mojikyo			. 001435)	; ý €€–›
-    (ucs			. #x204E5)	; 𠓥
+    (ideograph-daikanwa . 01435)	; ø¸€–›
+    (=hanziku-1		. #xBE53)	; ý¢€›¹“
+    (mojikyo		. 001435)	; ý €€–›
+    (=ucs		. #x204E5)	; 𠓥
     ))
 (define-char
   '((=>ucs		. #x204E5)	; 𠓥
@@ -671,13 +655,13 @@
     (total-strokes	 . 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
+      (=ucs		  . #x2FF3)	; ⿳
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       )
-     ((chinese-big5-cdp	  . #x8DA2)	; ý¢€ˆ¶¢
+     ((=ucs		  . #x6534)	; 攴
       ))
     (chinese-cns11643-6 . #x2579)	; ø»›¼€
     ))
@@ -688,43 +672,42 @@
     (total-strokes	 . 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       )
-     ((chinese-big5-cdp	  . #x8C62)	; ý¢€ˆ±¢
+     ((=big5-cdp	  . #x8C62)	; ý¢€ˆ±¢
       ))
     (shinjigen-1	. 484)
     (shinjigen-2	. 484)
-    (japanese-jisx0208-1978	. #x5140)	; ø»ƒ‚¿
-    (japanese-jisx0208		. #x5140)	; ø»‡—‡
-    (korean-ksc5601		. #x5557)	; ø»‰§š
-    (japanese-jisx0208-1990	. #x5140)	; ø½Š¼»
-    (ideograph-daikanwa		. 01436)	; ø¸€–œ
-    (mojikyo			. 001436)	; ý €€–œ
+    (=jis-x0208		. #x5140)	; ø½Š¼»
+    (korean-ksc5601	. #x5557)	; ø»‰§š
+    (=gt-pj-1		. #x5140)	; ø½Š¼»
+    (chinese-big5	. #xA8E2)	; ý¢€Š£¢
+    (ideograph-daikanwa . 01436)	; ø¸€–œ
+    (=gt-k		. 03859)	; ý¡„€¼“
+    (=ucs@jis		. #x5169)	; ø½Š¼»
+    (mojikyo		. 001436)	; ý €€–œ
     ))
 (define-char
   '((morohashi-daikanwa	1436 0 0)
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 24)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 24 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       )
-     ((chinese-big5-cdp	  . #x8C62)	; ý¢€ˆ±¢
+     ((=big5-cdp	  . #x8C62)	; ý¢€ˆ±¢
       ))
     (shinjigen-1	. 484)
     (shinjigen-2	. 484)
     (chinese-cns11643-1 . #x4C25)	; ø»’ª
     (chinese-gb12345	. #x413D)	; 兩
-    (chinese-big5	. #xA8E2)	; øºŸ®‹
-    (ucs		. #x5169)	; 兩
+    (=ucs		. #x5169)	; 兩
     ))
 (define-char
   '((=>ucs		. #x516A)	; 兪
@@ -733,73 +716,94 @@
     (total-strokes	 . 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8AFC)	; ý¢€ˆ«¼
+     ((ideograph-daikanwa . 01416)	; ø¸€–ˆ
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((ucs		    . #x6708)	; 月
+       ((=gt-k		    . 00607)	; ý¡„€‰Ÿ
 	)
-       ((ucs		    . #x5DDC)	; 巜
+       ((=ucs		    . #x5DDC)	; 巜
 	))
       ))
     (shinjigen-1	. 487)
     (shinjigen-2	. 487)
-    (japanese-jisx0208-1978	. #x5141)	; ø»ƒƒ€
-    (japanese-jisx0208		. #x5141)	; ø»‡—ˆ
-    (korean-ksc5601		. #x6A64)	; ø»Š†
-    (japanese-jisx0208-1990	. #x5141)	; ø½Š¼¼
-    (ideograph-daikanwa		. 01437)	; ø¸€–
-    (mojikyo			. 001437)	; ý €€–
+    (=jis-x0208		. #x5141)	; ø½Š¼¼
+    (korean-ksc5601	. #x6A64)	; ø»Š†
+    (=gt-pj-1		. #x5141)	; ø½Š¼¼
+    (ideograph-daikanwa . 01437)	; ø¸€–
+    (=gt-k		. 05209)	; ý¡„‘™
+    (=ucs@jis		. #x516A)	; ø½Š¼¼
+    (mojikyo		. 001437)	; ý €€–
     ))
 (define-char
-  '((morohashi-daikanwa	1437 0 1)
+  '((=>ucs		. #x516A)	; 兪
+    (morohashi-daikanwa	1437 0 1)
+    (ideographic-radical . 11)	; ⼊
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 155 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((ideograph-daikanwa . 01416)	; ø¸€–ˆ
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=big5-cdp	    . #x8958)	; ý¢€ˆ¥˜
+	)
+       ((=ucs		    . #x5DDC)	; 巜
+	))
+      ))
+    (=hanziku-1		. #xC3C3)	; ý¢€œƒ
+    ))
+(define-char
+  '((morohashi-daikanwa	1437 0 2)
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 155)
-    (hanyu-dazidian-char . 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8AFC)	; ý¢€ˆ«¼
+     ((=big5-cdp	  . #x8AFC)	; ý¢€ˆ«¼
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((ucs		    . #x6708)	; 月
+       ((=big5-cdp	    . #x8958)	; ý¢€ˆ¥˜
 	)
-       ((ucs		    . #x5DDC)	; 巜
+       ((=ucs		    . #x5DDC)	; 巜
 	))
       ))
-    (ideograph-hanziku-1	. #xC3C3)	; ý¢€œƒ
-    (ucs			. #x516A)	; 兪
+    (=ucs		. #x516A)	; 兪
     ))
 (define-char
   '((=>ucs		. #x516A)	; 兪
-    (morohashi-daikanwa	1437 0 2)
+    (morohashi-daikanwa	1437 0 3)
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8AFC)	; ý¢€ˆ«¼
+     ((=big5-cdp	  . #x8AFC)	; ý¢€ˆ«¼
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((ucs		    . #x6708)	; 月
+       ((=ucs		    . #x6708)	; 月
 	)
-       ((ucs		    . #x5DDC)	; 巜
+       ((=ucs		    . #x5DDC)	; 巜
 	))
       ))
     (chinese-cns11643-3 . #x2B37)	; ø»•¥¦
@@ -808,58 +812,50 @@
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 156)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 156 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(ucs		    . #x2FF1)	; ⿱
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((japanese-jisx0208-1978	    . #x467E)	; ø»‚³³
-	(japanese-jisx0208	    . #x467E)	; ø»‡‡»
-	(korean-ksc5601		    . #x6C7D)	; ø»Š‰²
-	(ideograph-daikanwa	    . 01415)	; ø¸€–‡
+       ((korean-ksc5601	    . #x6C7D)	; ø»Š‰²
+	(ideograph-daikanwa . 01415)	; ø¸€–‡
 	)
-       ((ucs		    . #x4E28)	; 丨
+       ((=ucs		    . #x4E28)	; 丨
 	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (ucs		      . #x2FF1)	; ⿱
+	  (=ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((japanese-jisx0208-1978     . #x467E)	; ø»‚³³
-	  (japanese-jisx0208	      . #x467E)	; ø»‡‡»
-	  (korean-ksc5601	      . #x6C7D)	; ø»Š‰²
-	  (ideograph-daikanwa	      . 01415)	; ø¸€–‡
+	 ((korean-ksc5601     . #x6C7D)	; ø»Š‰²
+	  (ideograph-daikanwa . 01415)	; ø¸€–‡
 	  )
-	 ((ucs		      . #x4E28)	; 丨
+	 ((=ucs		      . #x4E28)	; 丨
 	  ))
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (ucs		      . #x2FF1)	; ⿱
+	  (=ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((japanese-jisx0208-1978     . #x467E)	; ø»‚³³
-	  (japanese-jisx0208	      . #x467E)	; ø»‡‡»
-	  (korean-ksc5601	      . #x6C7D)	; ø»Š‰²
-	  (ideograph-daikanwa	      . 01415)	; ø¸€–‡
+	 ((korean-ksc5601     . #x6C7D)	; ø»Š‰²
+	  (ideograph-daikanwa . 01415)	; ø¸€–‡
 	  )
-	 ((ucs		      . #x4E28)	; 丨
+	 ((=ucs		      . #x4E28)	; 丨
 	  ))
 	))
       ))
-    (ideograph-daikanwa		. 01438)	; ø¸€–ž
-    (ideograph-hanziku-1	. #xC3DF)	; ý¢€œŸ
-    (mojikyo			. 001438)	; ý €€–ž
-    (ucs			. #x204EA)	; 𠓪
+    (ideograph-daikanwa . 01438)	; ø¸€–ž
+    (=hanziku-1		. #xC3DF)	; ý¢€œŸ
+    (mojikyo		. 001438)	; ý €€–ž
+    (=ucs		. #x204EA)	; 𠓪
     ))
 (define-char
   '((=>ucs		. #x204EA)	; 𠓪
@@ -869,37 +865,37 @@
     (total-strokes	 . 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(ucs		    . #x2FF1)	; ⿱
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ucs		    . #x5165)	; 入
+       ((=ucs		    . #x5165)	; 入
 	)
-       ((ucs		    . #x4E28)	; 丨
+       ((=ucs		    . #x4E28)	; 丨
 	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (ucs		      . #x2FF1)	; ⿱
+	  (=ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((ucs		      . #x5165)	; 入
+	 ((=ucs		      . #x5165)	; 入
 	  )
-	 ((ucs		      . #x4E28)	; 丨
+	 ((=ucs		      . #x4E28)	; 丨
 	  ))
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (ucs		      . #x2FF1)	; ⿱
+	  (=ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((ucs		      . #x5165)	; 入
+	 ((=ucs		      . #x5165)	; 入
 	  )
-	 ((ucs		      . #x4E28)	; 丨
+	 ((=ucs		      . #x4E28)	; 丨
 	  ))
 	))
       ))
@@ -910,20 +906,20 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (hanyu-dazidian	1 156 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x5175)	; 兵
+     ((=ucs		  . #x5175)	; 兵
       ))
-    (ideograph-daikanwa		. 01439)	; ø¸€–Ÿ
-    (ideograph-hanziku-1	. #xC3E1)	; ý¢€œ¡
-    (mojikyo			. 001439)	; ý €€–Ÿ
+    (ideograph-daikanwa . 01439)	; ø¸€–Ÿ
+    (=hanziku-1		. #xC3E1)	; ý¢€œ¡
+    (mojikyo		. 001439)	; ý €€–Ÿ
     ))
 (define-char
   '((morohashi-daikanwa	1439 0 0)
@@ -935,37 +931,34 @@
     (hanyu-dazidian-char . 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x5175)	; 兵
+     ((=ucs		  . #x5175)	; 兵
       ))
     (chinese-cns11643-5 . #x2826)	; ø»™µƒ
-    (ucs		. #x204EB)	; 𠓫
+    (=ucs		. #x204EB)	; 𠓫
     ))
 (define-char
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 169)
-    (hanyu-dazidian-char . 5)
+    (hanyu-dazidian	1 169 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x6797)	; 林
+     ((=ucs		  . #x6797)	; 林
       ))
-    (ideograph-daikanwa		. 01440)	; ø¸€– 
-    (ideograph-hanziku-1	. #xC94B)	; ý¢€œ¥‹
-    (mojikyo			. 001440)	; ý €€– 
-    (ucs			. #x204ED)	; 𠓭
+    (ideograph-daikanwa . 01440)	; ø¸€– 
+    (=hanziku-1		. #xC94B)	; ý¢€œ¥‹
+    (mojikyo		. 001440)	; ý €€– 
+    (=ucs		. #x204ED)	; 𠓭
     ))
 (define-char
   '((=>ucs		. #x204ED)	; 𠓭
@@ -975,11 +968,11 @@
     (total-strokes	 . 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x6797)	; 林
+     ((=ucs		  . #x6797)	; 林
       ))
     (chinese-cns11643-4 . #x2B6A)	; ø»—°
     ))
@@ -987,33 +980,21 @@
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 169)
-    (hanyu-dazidian-char . 9)
+    (hanyu-dazidian	1 169 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	(ucs		    . #x2FF3)	; ⿳
-	)
-       ((ucs		    . #x4E00)	; 一
-	)
-       ((ucs		    . #x4E3F)	; 丿
-	)
-       ((ucs		    . #x56DE)	; 回
-	))
+     ((=ucs		  . #x9763)	; 靣
       ))
-    (ideograph-daikanwa		. 01441)	; ø¸€–¡
-    (ideograph-hanziku-1	. #xC94F)	; ý¢€œ¥
-    (mojikyo			. 001441)	; ý €€–¡
-    (ucs			. #x204EE)	; 𠓮
+    (ideograph-daikanwa . 01441)	; ø¸€–¡
+    (=hanziku-1		. #xC94F)	; ý¢€œ¥
+    (mojikyo		. 001441)	; ý €€–¡
+    (=ucs		. #x204EE)	; 𠓮
     ))
 (define-char
   '((=>ucs		. #x204EE)	; 𠓮
@@ -1023,20 +1004,11 @@
     (total-strokes	 . 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	(ucs		    . #x2FF3)	; ⿳
-	)
-       ((ucs		    . #x4E00)	; 一
-	)
-       ((ucs		    . #x4E3F)	; 丿
-	)
-       ((ucs		    . #x56DE)	; 回
-	))
+     ((=ucs		  . #x9763)	; 靣
       ))
     (chinese-cns11643-6 . #x353D)	; ø»œ’¤
     ))
@@ -1045,29 +1017,29 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (hanyu-dazidian	1 186 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
+      (=ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((ucs		    . #x5E7A)	; 幺
+       ((=ucs		    . #x5E7A)	; 幺
 	)
-       ((ucs		    . #x5E7A)	; 幺
+       ((=ucs		    . #x5E7A)	; 幺
 	))
       )
-     ((ucs		  . #x5927)	; 大
+     ((=ucs		  . #x5927)	; 大
       ))
-    (ideograph-daikanwa		. 01442)	; ø¸€–¢
-    (ideograph-hanziku-1	. #xCCB7)	; ý¢€œ²·
-    (mojikyo			. 001442)	; ý €€–¢
+    (ideograph-daikanwa . 01442)	; ø¸€–¢
+    (=hanziku-1		. #xCCB7)	; ý¢€œ²·
+    (mojikyo		. 001442)	; ý €€–¢
     ))
 (define-char
   '((morohashi-daikanwa	1442 0 0)
@@ -1076,23 +1048,23 @@
     (total-strokes	 . 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
+      (=ucs		  . #x2FF3)	; ⿳
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((ucs		    . #x5E7A)	; 幺
+       ((=ucs		    . #x5E7A)	; 幺
 	)
-       ((ucs		    . #x5E7A)	; 幺
+       ((=ucs		    . #x5E7A)	; 幺
 	))
       )
-     ((ucs		  . #x5927)	; 大
+     ((=ucs		  . #x5927)	; 大
       ))
     (chinese-cns11643-6 . #x3D3A)	; ø»œž‘
-    (ucs		. #x204F1)	; 𠓱
+    (=ucs		. #x204F1)	; 𠓱
     ))
 (define-char
   '((ideographic-radical . 11)	; ⼊
@@ -1100,7 +1072,7 @@
     (total-strokes	 . 12)
     (ideograph-daikanwa . 01443)	; ø¸€–£
     (mojikyo		. 001443)	; ý €€–£
-    (ucs		. #x204F3)	; 𠓳
+    (=ucs		. #x204F3)	; 𠓳
     ))
 (define-char
   '((=>ucs		. #x204F3)	; 𠓳
@@ -1115,18 +1087,19 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
+    (hanyu-dazidian	1 206 17)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
      ((korean-ksc5601	  . #x6E6F)	; ø»ŠŒ 
       (ideograph-daikanwa . 01424)	; ø¸€–
       )
-     ((ucs		  . #x4E23)	; 丣
+     ((=ucs		  . #x4E23)	; 丣
       ))
-    (ideograph-daikanwa		. 01444)	; ø¸€–¤
-    (ideograph-hanziku-1	. #xD0CE)	; ý¢€ƒŽ
-    (mojikyo			. 001444)	; ý €€–¤
+    (ideograph-daikanwa . 01444)	; ø¸€–¤
+    (=hanziku-1		. #xD0CE)	; ý¢€ƒŽ
+    (mojikyo		. 001444)	; ý €€–¤
     ))
 (define-char
   '((morohashi-daikanwa	1444 0 0)
@@ -1135,34 +1108,34 @@
     (total-strokes	 . 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
      ((chinese-cns11643-1 . #x4740)	; ø»‘º¯
       )
-     ((ucs		  . #x4E23)	; 丣
+     ((=ucs		  . #x4E23)	; 丣
       ))
     (chinese-cns11643-6 . #x5064)	; ø»œºµ
-    (ucs		. #x204F4)	; 𠓴
+    (=ucs		. #x204F4)	; 𠓴
     ))
 (define-char
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
+    (hanyu-dazidian	1 207 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x723D)	; 爽
+     ((=ucs		  . #x723D)	; 爽
       ))
-    (ideograph-daikanwa		. 01445)	; ø¸€–¥
-    (ideograph-hanziku-1	. #xD0E3)	; ý¢€ƒ£
-    (mojikyo			. 001445)	; ý €€–¥
-    (ucs			. #x204F7)	; 𠓷
+    (ideograph-daikanwa . 01445)	; ø¸€–¥
+    (=hanziku-1		. #xD0E3)	; ý¢€ƒ£
+    (mojikyo		. 001445)	; ý €€–¥
+    (=ucs		. #x204F7)	; 𠓷
     ))
 (define-char
   '((=>ucs		. #x204F7)	; 𠓷
@@ -1172,11 +1145,11 @@
     (total-strokes	 . 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x723D)	; 爽
+     ((=ucs		  . #x723D)	; 爽
       ))
     (chinese-cns11643-4 . #x3C31)	; ø»˜ˆ¢
     ))
@@ -1184,24 +1157,21 @@
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 207)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 207 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5E36)	; 帶
+     ((=ucs		  . #x5E36)	; 帶
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       ))
-    (ideograph-daikanwa		. 01446)	; ø¸€–¦
-    (ideograph-hanziku-1	. #xD0DE)	; ý¢€ƒž
-    (mojikyo			. 001446)	; ý €€–¦
-    (ucs			. #x204F6)	; 𠓶
+    (ideograph-daikanwa . 01446)	; ø¸€–¦
+    (=hanziku-1		. #xD0DE)	; ý¢€ƒž
+    (mojikyo		. 001446)	; ý €€–¦
+    (=ucs		. #x204F6)	; 𠓶
     ))
 (define-char
   '((=>ucs		. #x204F6)	; 𠓶
@@ -1211,11 +1181,11 @@
     (total-strokes	 . 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5E36)	; 帶
+     ((=ucs		  . #x5E36)	; 帶
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       ))
     (chinese-cns11643-5 . #x3D63)	; ø»š”¶
     ))
@@ -1223,33 +1193,30 @@
   '((ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 216)
-    (hanyu-dazidian-char . 5)
+    (hanyu-dazidian	1 216 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
+      (=ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((ucs		    . #x65E1)	; 旡
+       ((=ucs		    . #x65E1)	; 旡
 	)
-       ((ucs		    . #x65E1)	; 旡
+       ((=ucs		    . #x65E1)	; 旡
 	))
       )
-     ((ucs		  . #x6728)	; 木
+     ((=ucs		  . #x6728)	; 木
       ))
-    (ideograph-daikanwa		. 01447)	; ø¸€–§
-    (ideograph-hanziku-1	. #xD2C8)	; ý¢€‹ˆ
-    (mojikyo			. 001447)	; ý €€–§
-    (ucs			. #x204F8)	; 𠓸
+    (ideograph-daikanwa . 01447)	; ø¸€–§
+    (=hanziku-1		. #xD2C8)	; ý¢€‹ˆ
+    (mojikyo		. 001447)	; ý €€–§
+    (=ucs		. #x204F8)	; 𠓸
     ))
 (define-char
   '((=>ucs		. #x204F8)	; 𠓸
@@ -1265,12 +1232,11 @@
     (total-strokes	 . 17)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
      ((japanese-jisx0208-1978	  . #x475A)	; ø»‚´­
       (japanese-jisx0208	  . #x475A)	; ø»‡ˆµ
@@ -1278,7 +1244,7 @@
       ))
     (ideograph-daikanwa . 01448)	; ø¸€–¨
     (mojikyo		. 001448)	; ý €€–¨
-    (ucs		. #x204FD)	; 𠓽
+    (=ucs		. #x204FD)	; 𠓽
     ))
 (define-char
   '((=>ucs		. #x204FD)	; 𠓽
@@ -1286,21 +1252,18 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 232)
-    (hanyu-dazidian-char . 12)
+    (hanyu-dazidian	1 232 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x467E)	; ø»‚³³
-      (japanese-jisx0208	  . #x467E)	; ø»‡‡»
-      (korean-ksc5601		  . #x6C7D)	; ø»Š‰²
-      (ideograph-daikanwa	  . 01415)	; ø¸€–‡
+     ((=jis-x0208	  . #x467E)	; ø½Š­¯
+      (korean-ksc5601	  . #x6C7D)	; ø»Š‰²
+      (ideograph-daikanwa . 01415)	; ø¸€–‡
       )
-     ((ucs		  . #x8F29)	; 輩
+     ((=ucs		  . #x8F29)	; 輩
       ))
-    (ideograph-hanziku-1	. #xD5F8)	; ý¢€—¸
+    (=hanziku-1		. #xD5F8)	; ý¢€—¸
     ))
 (define-char
   '((=>ucs		. #x204FD)	; 𠓽
@@ -1310,11 +1273,11 @@
     (total-strokes	 . 17)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x5165)	; 入
+     ((=ucs		  . #x5165)	; 入
       )
-     ((ucs		  . #x8F29)	; 輩
+     ((=ucs		  . #x8F29)	; 輩
       ))
     (chinese-cns11643-5 . #x5A72)	; ø»š¿«
     ))