X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R008-Lid.el;h=651c2e05d51d5da9eb06cd8507b6a0202430da10;hb=f1e18ede53975db3370f9ee659c0728e9f902686;hp=9d1e135447fd014888a67b379ce947e42eac2bae;hpb=8be2f5965d5f38034df2804b5f75ef1139e1f607;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index 9d1e135..651c2e0 100644
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -14,11 +14,10 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (japanese-jisx0208-1978	. #x5035)	; ø»ƒ–
-    (japanese-jisx0208		. #x5035)	; ø»‡•ž
-    (japanese-jisx0208-1990	. #x5035)	; ø½Š»’
-    (chinese-big5-cdp		. #x8B42)	; ý¢€ˆ­‚
-    (mojikyo			. 000286)	; ý €€„ž
+    (=jis-x0208		. #x5035)	; ø½Š»’
+    (=big5-cdp		. #x8B42)	; ý¢€ˆ­‚
+    (ucs-jis		. #x4EA0)	; ø½Š»’
+    (mojikyo		. 000286)	; ý €€„ž
     ))
 (define-char
   '((=>ucs		. #x4EA1)	; 亡
@@ -37,10 +36,9 @@
     (total-strokes	 . 3)
     (shinjigen-1	. 89)
     (shinjigen-2	. 89)
-    (japanese-jisx0208-1978	. #x4B34)	; ø»‚¹¿
-    (japanese-jisx0208		. #x4B34)	; ø»‡Ž‡
-    (korean-ksc5601		. #x584C)	; ø»‰«©
-    (japanese-jisx0208-1990	. #x4B34)	; ø½Š³»
+    (=jis-x0208		. #x4B34)	; ø½Š³»
+    (korean-ksc5601	. #x584C)	; ø»‰«©
+    (ucs-jis		. #x4EA1)	; ø½Š³»
     ))
 (define-char
   '((=>ucs		. #x4EA1)	; 亡
@@ -48,9 +46,6 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 279)
-    (hanyu-dazidian-char . 5)
     (chinese-cns11643-1 . #x4441)	; ø»‘¶–
     ))
 (define-char
@@ -58,9 +53,7 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 279)
-    (hanyu-dazidian-char . 5)
+    (hanyu-dazidian	1 279 5)
     (chinese-gb2312	. #x4D76)	; ø»…ˆ
     (chinese-isoir165	. #x4D76)	; ø»°‘
     (ucs		. #x4EA1)	; 亡
@@ -70,27 +63,23 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 280)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 280 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x51E0)	; 几
       ))
     (shinjigen-1	. 92)
     (shinjigen-2	. 92)
-    (japanese-jisx0208-1978	. #x5036)	; ø»ƒ—
-    (japanese-jisx0208		. #x5036)	; ø»‡•Ÿ
-    (korean-ksc5601		. #x7971)	; ø»Šœ¬
-    (japanese-jisx0208-1990	. #x5036)	; ø½Š»“
-    (chinese-big5		. #xA4AE)	; ý¢€Š’®
-    (ideograph-daikanwa		. 00288)	; ø¸€„ 
-    (mojikyo			. 000288)	; ý €€„ 
+    (=jis-x0208		. #x5036)	; ø½Š»“
+    (korean-ksc5601	. #x7971)	; ø»Šœ¬
+    (chinese-big5	. #xA4AE)	; ý¢€Š’®
+    (ideograph-daikanwa . 00288)	; ø¸€„ 
+    (ucs-jis		. #x4EA2)	; ø½Š»“
+    (mojikyo		. 000288)	; ý €€„ 
     ))
 (define-char
   '((morohashi-daikanwa	288 0 0)
@@ -121,10 +110,9 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
-     ((chinese-big5-cdp	  . #x89AB)	; ý¢€ˆ¦«
+     ((=big5-cdp	  . #x89AB)	; ý¢€ˆ¦«
       ))
     (ideograph-daikanwa . 00289)	; ø¸€„¡
     (mojikyo		. 000289)	; ý €€„¡
@@ -141,7 +129,7 @@
       )
      ((ucs		  . #x4EA0)	; 亠
       )
-     ((chinese-big5-cdp	  . #x89AB)	; ý¢€ˆ¦«
+     ((=big5-cdp	  . #x89AB)	; ý¢€ˆ¦«
       ))
     (chinese-cns11643-3		. #x2147)	; ø»•—Š
     (ideograph-hanziku-1	. #xDFB1)	; ý¢€¾±
@@ -158,7 +146,7 @@
       )
      ((ucs		  . #x4EA0)	; 亠
       )
-     ((chinese-big5-cdp	  . #x88CA)	; ý¢€ˆ£Š
+     ((=big5-cdp	  . #x88CA)	; ý¢€ˆ£Š
       ))
     (ideograph-hanziku-1	. #xDFB0)	; ý¢€¾°
     (ucs			. #x20141)	; 𠅁
@@ -183,7 +171,7 @@
       )
      ((ucs		  . #x4EA0)	; 亠
       )
-     ((chinese-big5-cdp	  . #x865D)	; ý¢€ˆ™
+     ((=big5-cdp	  . #x865D)	; ý¢€ˆ™
       ))
     (ideograph-hanziku-1	. #xDFCC)	; ý¢€¿Œ
     (ucs			. #x20142)	; 𠅂
@@ -199,12 +187,11 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x53E3)	; 口
       ))
-    (chinese-big5-cdp	. #x8BAA)	; ý¢€ˆ®ª
+    (=big5-cdp		. #x8BAA)	; ý¢€ˆ®ª
     (mojikyo		. 070255)	; ý €‘‰¯
     ))
 (define-char
@@ -216,8 +203,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((japanese-jisx0208-1978	  . #x4963)	; ø»‚·²
       (japanese-jisx0208	  . #x4963)	; ø»‡‹º
@@ -231,7 +217,7 @@
     (korean-ksc5601		. #x4E5F)	; ø»‰
     (chinese-big5		. #xA5E6)	; ý¢€Š—¦
     (ideograph-daikanwa		. 00291)	; ø¸€„£
-    (china3-jef			. #x41D6)	; øº„‡–
+    (=jef-china3		. #x41D6)	; øº„‡–
     (mojikyo			. 000291)	; ý €€„£
     ))
 (define-char
@@ -240,30 +226,25 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 282)
-    (hanyu-dazidian-char . 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x7236)	; 父
       ))
     (shinjigen-1	. 96)
     (shinjigen-2	. 96)
     (japanese-jisx0208-1990	. #x3872)	; ø½Š˜¿
+    (ucs-jis			. #x4EA4)	; ø½Š˜¿
     ))
 (define-char
   '((morohashi-daikanwa	291 0 1)
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 282)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 282 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -289,13 +270,14 @@
      ((ucs		  . #x2011E)	; 𠄞
       )
      ((ideograph-daikanwa . 00114)	; ø¸€²
+      (=gt		  . 00154)	; ý¡€€‚š
       )
      ((ucs		  . #x4EBA)	; 人
       ))
     (shinjigen-1	. 95)
     (shinjigen-2	. 95)
     (ideograph-daikanwa . 00292)	; ø¸€„¤
-    (china3-jef		. #x41D5)	; øº„‡•
+    (=jef-china3	. #x41D5)	; øº„‡•
     ))
 (define-char
   '((=>ucs		. #x4EA5)	; 亥
@@ -303,28 +285,25 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 283)
-    (hanyu-dazidian-char . 5)
+    (hanyu-dazidian	1 283 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ideograph-daikanwa . 00114)	; ø¸€²
+      (=gt		  . 00154)	; ý¡€€‚š
       )
      ((ucs		  . #x4EBA)	; 人
       ))
     (shinjigen-1	. 94)
     (shinjigen-2	. 94)
-    (japanese-jisx0208-1978	. #x3067)	; ø»‚“ˆ
-    (japanese-jisx0208		. #x3067)	; ø»†§
-    (korean-ksc5601		. #x7A24)	; ø»Šœ½
-    (japanese-jisx0208-1990	. #x3067)	; ø½Š„
-    (chinese-big5		. #xA5E8)	; ý¢€Š—¨
-    (mojikyo			. 000292)	; ý €€„¤
+    (=jis-x0208		. #x3067)	; ø½Š„
+    (korean-ksc5601	. #x7A24)	; ø»Šœ½
+    (chinese-big5	. #xA5E8)	; ý¢€Š—¨
+    (ucs-jis		. #x4EA5)	; ø½Š„
+    (mojikyo		. 000292)	; ý €€„¤
     ))
 (define-char
   '((morohashi-daikanwa	292 0 2)
@@ -341,6 +320,7 @@
      ((ucs		  . #x4EA0)	; 亠
       )
      ((ideograph-daikanwa . 00114)	; ø¸€²
+      (=gt		  . 00154)	; ý¡€€‚š
       )
      ((ucs		  . #x4EBA)	; 人
       ))
@@ -354,27 +334,23 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 281)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 281 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
-     ((chinese-big5-cdp	  . #x8CB5)	; ý¢€ˆ²µ
+     ((=big5-cdp	  . #x8CB5)	; ý¢€ˆ²µ
       ))
     (shinjigen-1	. 93)
     (shinjigen-2	. 93)
-    (japanese-jisx0208-1978	. #x4B72)	; ø»‚º½
-    (japanese-jisx0208		. #x4B72)	; ø»‡…
-    (korean-ksc5601		. #x6632)	; ø»‰¿³
-    (japanese-jisx0208-1990	. #x4B72)	; ø½Š´¹
-    (chinese-big5		. #xA5E7)	; ý¢€Š—§
-    (ideograph-daikanwa		. 00293)	; ø¸€„¥
-    (mojikyo			. 000293)	; ý €€„¥
+    (=jis-x0208		. #x4B72)	; ø½Š´¹
+    (korean-ksc5601	. #x6632)	; ø»‰¿³
+    (chinese-big5	. #xA5E7)	; ý¢€Š—§
+    (ideograph-daikanwa . 00293)	; ø¸€„¥
+    (ucs-jis		. #x4EA6)	; ø½Š´¹
+    (mojikyo		. 000293)	; ý €€„¥
     ))
 (define-char
   '((morohashi-daikanwa	293 0 0)
@@ -390,7 +366,7 @@
       )
      ((ucs		  . #x4EA0)	; 亠
       )
-     ((chinese-big5-cdp	  . #x8CB5)	; ý¢€ˆ²µ
+     ((=big5-cdp	  . #x8CB5)	; ý¢€ˆ²µ
       ))
     (chinese-gb2312	. #x5260)	; ø»…
     (chinese-isoir165	. #x5260)	; ø»·‘
@@ -406,8 +382,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x4ECE)	; 从
       ))
@@ -442,14 +417,13 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x51F6)	; 凶
       ))
-    (china3-jef		. #x8DCD)	; øºˆ·
-    (ideograph-cbeta	. 04846)	; ø¸¡‹®
-    (chinese-big5-cdp	. #x8C5E)	; ý¢€ˆ±ž
+    (=big5-cdp		. #x8C5E)	; ý¢€ˆ±ž
+    (=cbeta		. 04846)	; ø¸¡‹®
+    (=jef-china3	. #x8DCD)	; øºˆ·
     (mojikyo		. 074988)	; ý €’“¬
     ))
 (define-char
@@ -486,11 +460,13 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8BAE)	; ý¢€ˆ®®
+     ((=big5-cdp	  . #x8BAE)	; ý¢€ˆ®®
       )
      ((ucs		  . #x5382)	; 厂
       ))
-    (china3-jef		. #x81C1)	; øºˆ‡
+    (ideograph-gt-pj-k1 . #x3A57)	; ý¡„€¤„
+    (=gt-k		. 02308)	; ý¡„€¤„
+    (=jef-china3	. #x81C1)	; øºˆ‡
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -507,9 +483,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(ucs		    . #x2FF0)	; â¿°
 	)
-       ((chinese-big5-cdp   . #x87F5)	; ý¢€ˆŸµ
+       ((=big5-cdp	    . #x87F5)	; ý¢€ˆŸµ
 	)
-       ((chinese-big5-cdp   . #x85BF)	; ý¢€ˆ–¿
+       ((=big5-cdp	    . #x85BF)	; ý¢€ˆ–¿
 	))
       ))
     (ideograph-hanziku-1	. #xE071)	; ý¢€ž±
@@ -522,22 +498,19 @@
     (total-strokes	 . 7)
     (shinjigen-1	. 98)
     (shinjigen-2	. 98)
-    (japanese-jisx0208-1978	. #x357C)	; ø»‚š³
-    (japanese-jisx0208		. #x357C)	; ø»†®»
-    (korean-ksc5601		. #x7A7B)	; ø»Šž”
-    (japanese-jisx0208-1990	. #x357C)	; ø½Š”¯
-    (chinese-big5		. #xA6EB)	; ý¢€Š›«
-    (ideograph-daikanwa		. 00295)	; ø¸€„§
-    (mojikyo			. 000295)	; ý €€„§
+    (=jis-x0208		. #x357C)	; ø½Š”¯
+    (korean-ksc5601	. #x7A7B)	; ø»Šž”
+    (chinese-big5	. #xA6EB)	; ý¢€Š›«
+    (ideograph-daikanwa . 00295)	; ø¸€„§
+    (ucs-jis		. #x4EA8)	; ø½Š”¯
+    (mojikyo		. 000295)	; ý €€„§
     ))
 (define-char
   '((morohashi-daikanwa	295 0 0)
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 284)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 284 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -569,16 +542,16 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0213-2	  . #x2359)	; ø»¤ ´
+     ((=jis-x0213-2-2000  . #x2359)	; ø»¤ ´
       )
-     ((chinese-big5-cdp	  . #x8BED)	; ý¢€ˆ¯­
+     ((=big5-cdp	  . #x8BED)	; ý¢€ˆ¯­
       ))
-    (chinese-cns11643-4		. #x2337)	; ø»—£º
-    (japanese-jisx0213-2	. #x2132)	; ø»¤‘
-    (ideograph-daikanwa		. 00296)	; ø¸€„¨
-    (china3-jef			. #x41D7)	; øº„‡—
-    (mojikyo			. 000296)	; ý €€„¨
-    (ucs			. #x342C)	; 㐬
+    (chinese-cns11643-4 . #x2337)	; ø»—£º
+    (=jis-x0213-2-2000	. #x2132)	; ø»¤‘
+    (ideograph-daikanwa . 00296)	; ø¸€„¨
+    (=jef-china3	. #x41D7)	; øº„‡—
+    (mojikyo		. 000296)	; ý €€„¨
+    (ucs		. #x342C)	; 㐬
     ))
 (define-char
   '((=>ucs		. #x342C)	; 㐬
@@ -593,9 +566,9 @@
       )
      ((ucs		  . #x20AD3)	; 𠫓
       )
-     ((chinese-big5-cdp	  . #x8BED)	; ý¢€ˆ¯­
+     ((=big5-cdp	  . #x8BED)	; ý¢€ˆ¯­
       ))
-    (chinese-big5-cdp	. #x8C50)	; ý¢€ˆ±
+    (=big5-cdp		. #x8C50)	; ý¢€ˆ±
     ))
 (define-char
   '((=>ucs		. #x20148)	; 𠅈
@@ -606,13 +579,12 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x4E19)	; 丙
       ))
     (ideograph-daikanwa . 00297)	; ø¸€„©
-    (ideograph-cbeta	. 01504)	; ø¸ — 
+    (=cbeta		. 01504)	; ø¸ — 
     (mojikyo		. 000297)	; ý €€„©
     ))
 (define-char
@@ -659,12 +631,11 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x7530)	; 田
       ))
-    (chinese-big5-cdp	. #x8DCA)	; ý¢€ˆ·Š
+    (=big5-cdp		. #x8DCA)	; ý¢€ˆ·Š
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -692,14 +663,13 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x53E3)	; 口
       )
      ((ucs		  . #x5196)	; 冖
       ))
-    (chinese-big5-cdp	. #x8C4D)	; ý¢€ˆ±
+    (=big5-cdp		. #x8C4D)	; ý¢€ˆ±
     (mojikyo		. 070256)	; ý €‘‰°
     ))
 (define-char
@@ -711,28 +681,25 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
+     ((=big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
       )
      ((ucs		  . #x5B50)	; 子
       ))
     (shinjigen-1	. 101)
     (shinjigen-2	. 101)
-    (japanese-jisx0208-1978	. #x357D)	; ø»‚š´
-    (japanese-jisx0208		. #x357D)	; ø»†®¼
-    (korean-ksc5601		. #x7A3D)	; ø»Š–
-    (japanese-jisx0208-1990	. #x357D)	; ø½Š”°
-    (chinese-big5		. #xA8C9)	; ý¢€Š£‰
-    (ideograph-daikanwa		. 00298)	; ø¸€„ª
-    (mojikyo			. 000298)	; ý €€„ª
+    (=jis-x0208		. #x357D)	; ø½Š”°
+    (korean-ksc5601	. #x7A3D)	; ø»Š–
+    (chinese-big5	. #xA8C9)	; ý¢€Š£‰
+    (ideograph-daikanwa . 00298)	; ø¸€„ª
+    (ucs-jis		. #x4EAB)	; ø½Š”°
+    (mojikyo		. 000298)	; ý €€„ª
     ))
 (define-char
   '((morohashi-daikanwa	298 0 0)
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 284)
-    (hanyu-dazidian-char . 8)
+    (hanyu-dazidian	1 284 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -760,22 +727,19 @@
     (total-strokes	 . 8)
     (shinjigen-1	. 102)
     (shinjigen-2	. 102)
-    (japanese-jisx0208-1978	. #x357E)	; ø»‚šµ
-    (japanese-jisx0208		. #x357E)	; ø»†®½
-    (korean-ksc5601		. #x4C48)	; ø»‰™½
-    (japanese-jisx0208-1990	. #x357E)	; ø½Š”±
-    (chinese-big5		. #xA8CA)	; ý¢€Š£Š
-    (ideograph-daikanwa		. 00299)	; ø¸€„«
-    (mojikyo			. 000299)	; ý €€„«
+    (=jis-x0208		. #x357E)	; ø½Š”±
+    (korean-ksc5601	. #x4C48)	; ø»‰™½
+    (chinese-big5	. #xA8CA)	; ý¢€Š£Š
+    (ideograph-daikanwa . 00299)	; ø¸€„«
+    (ucs-jis		. #x4EAC)	; ø½Š”±
+    (mojikyo		. 000299)	; ý €€„«
     ))
 (define-char
   '((morohashi-daikanwa	299 0 0)
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 284)
-    (hanyu-dazidian-char . 6)
+    (hanyu-dazidian	1 284 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -806,13 +770,12 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x56DE)	; 回
       ))
     (ideograph-daikanwa . 00300)	; ø¸€„¬
-    (chinese-big5-cdp	. #x8BE5)	; ý¢€ˆ¯¥
+    (=big5-cdp		. #x8BE5)	; ý¢€ˆ¯¥
     (mojikyo		. 000300)	; ý €€„¬
     ))
 (define-char
@@ -843,7 +806,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
+     ((=big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
       )
      ((ucs		  . #x5927)	; 大
       ))
@@ -851,7 +814,8 @@
     (mojikyo		. 000301)	; ý €€„­
     ))
 (define-char
-  '((morohashi-daikanwa	301 0 0)
+  '((=>ucs		. #x2014C)	; 𠅌
+    (morohashi-daikanwa	301 0 0)
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
@@ -860,13 +824,26 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(ucs		    . #x2FF1)	; ⿱
+	)
+       ((ucs		    . #x4EA0)	; 亠
+	)
+       ((ucs		    . #x53E3)	; 口
+	))
       )
      ((ucs		  . #x5927)	; 大
       ))
-    (chinese-cns11643-5		. #x2523)	; ø»™°¦
     (ideograph-hanziku-1	. #xE0B2)	; ý¢€ž‚²
-    (ucs			. #x2014C)	; 𠅌
+    ))
+(define-char
+  '((morohashi-daikanwa	301 0 1)
+    (ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
+    (chinese-cns11643-5 . #x2523)	; ø»™°¦
+    (ucs		. #x2014C)	; 𠅌
     ))
 (define-char
   '((=>ucs		. #x2014F)	; 𠅏
@@ -893,28 +870,25 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8C4D)	; ý¢€ˆ±
+     ((=big5-cdp	  . #x8C4D)	; ý¢€ˆ±
       )
      ((ucs		  . #x4E01)	; 丁
       ))
     (shinjigen-1	. 104)
     (shinjigen-2	. 104)
-    (japanese-jisx0208-1978	. #x4462)	; ø»‚°›
-    (japanese-jisx0208		. #x4462)	; ø»‡„£
-    (korean-ksc5601		. #x6F4D)	; ø»Šœ
-    (japanese-jisx0208-1990	. #x4462)	; ø½Šª—
-    (chinese-big5		. #xAB46)	; ý¢€Š­†
-    (ideograph-daikanwa		. 00303)	; ø¸€„¯
-    (mojikyo			. 000303)	; ý €€„¯
+    (=jis-x0208		. #x4462)	; ø½Šª—
+    (korean-ksc5601	. #x6F4D)	; ø»Šœ
+    (chinese-big5	. #xAB46)	; ý¢€Š­†
+    (ideograph-daikanwa . 00303)	; ø¸€„¯
+    (ucs-jis		. #x4EAD)	; ø½Šª—
+    (mojikyo		. 000303)	; ý €€„¯
     ))
 (define-char
   '((morohashi-daikanwa	303 0 0)
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 286)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 286 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -942,26 +916,23 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 286)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 286 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8C4D)	; ý¢€ˆ±
+     ((=big5-cdp	  . #x8C4D)	; ý¢€ˆ±
       )
      ((ucs		  . #x513F)	; 儿
       ))
     (shinjigen-1	. 106)
     (shinjigen-2	. 106)
-    (japanese-jisx0208-1978	. #x4E3C)	; ø»‚¾¡
-    (japanese-jisx0208		. #x4E3C)	; ø»‡’©
-    (korean-ksc5601		. #x5555)	; ø»‰§˜
-    (japanese-jisx0208-1990	. #x4E3C)	; ø½Š¸
-    (chinese-big5		. #xAB47)	; ý¢€Š­‡
-    (ideograph-daikanwa		. 00304)	; ø¸€„°
-    (mojikyo			. 000304)	; ý €€„°
+    (=jis-x0208		. #x4E3C)	; ø½Š¸
+    (korean-ksc5601	. #x5555)	; ø»‰§˜
+    (chinese-big5	. #xAB47)	; ý¢€Š­‡
+    (ideograph-daikanwa . 00304)	; ø¸€„°
+    (ucs-jis		. #x4EAE)	; ø½Š¸
+    (mojikyo		. 000304)	; ý €€„°
     ))
 (define-char
   '((=>ucs		. #x4EAE)	; 亮
@@ -1028,8 +999,9 @@
     (shinjigen-1	. 99)
     (japanese-jisx0212	. #x3041)	; ø»Šº²
     (ideograph-daikanwa . 00305)	; ø¸€„±
-    (china3-jef		. #x41D8)	; øº„‡˜
-    (chinese-big5-cdp	. #x8AA5)	; ý¢€ˆª¥
+    (=big5-cdp		. #x8AA5)	; ý¢€ˆª¥
+    (=jef-china3	. #x41D8)	; øº„‡˜
+    (ucs-jis		. #x4EAF)	; ø»Šº²
     (mojikyo		. 000305)	; ý €€„±
     ))
 (define-char
@@ -1067,8 +1039,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
@@ -1122,18 +1093,16 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
-     ((chinese-big5-cdp	  . #x8CED)	; ý¢€ˆ³­
+     ((=big5-cdp	  . #x8CED)	; ý¢€ˆ³­
       ))
     (shinjigen-1	. 103)
     (shinjigen-2	. 103)
-    (japanese-jisx0208-1978	. #x5037)	; ø»ƒ˜
-    (japanese-jisx0208		. #x5037)	; ø»‡• 
-    (japanese-jisx0208-1990	. #x5037)	; ø½Š»”
-    (ideograph-daikanwa		. 00307)	; ø¸€„³
-    (mojikyo			. 000307)	; ý €€„³
+    (=jis-x0208		. #x5037)	; ø½Š»”
+    (ideograph-daikanwa . 00307)	; ø¸€„³
+    (ucs-jis		. #x4EB0)	; ø½Š»”
+    (mojikyo		. 000307)	; ý €€„³
     ))
 (define-char
   '((morohashi-daikanwa	307 0 0)
@@ -1147,7 +1116,7 @@
       )
      ((ucs		  . #x4EA0)	; 亠
       )
-     ((chinese-big5-cdp	  . #x8CED)	; ý¢€ˆ³­
+     ((=big5-cdp	  . #x8CED)	; ý¢€ˆ³­
       ))
     (chinese-cns11643-3		. #x2B25)	; ø»•¥”
     (ideograph-hanziku-1	. #xE0D1)	; ý¢€žƒ‘
@@ -1162,8 +1131,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x9091)	; 邑
       ))
@@ -1197,8 +1165,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x4F46)	; 但
       ))
@@ -1229,7 +1196,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (ideograph-daikanwa . 00310)	; ø¸€„¶
-    (ideograph-cbeta	. 00282)	; ø¸ „š
+    (=cbeta		. 00282)	; ø¸ „š
     (mojikyo		. 000310)	; ý €€„¶
     ))
 (define-char
@@ -1241,7 +1208,9 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((ideograph-daikanwa . 25721)	; ø¸†‘¹
+     ((=jis-x0208	  . #x4E29)	; ø½Š¸Š
+      (korean-ksc5601	  . #x5821)	; ø»‰ª¾
+      (ideograph-daikanwa . 25721)	; ø¸†‘¹
       )
      ((ucs		  . #x6728)	; 木
       ))
@@ -1263,8 +1232,8 @@
       )
      ((ucs		  . #x6729)	; 朩
       ))
-    (china3-jef		. #x81D2)	; øºˆ‡’
-    (chinese-big5-cdp	. #x8BA7)	; ý¢€ˆ®§
+    (=big5-cdp		. #x8BA7)	; ý¢€ˆ®§
+    (=jef-china3	. #x81D2)	; øºˆ‡’
     ))
 (define-char
   '((=>ucs		. #x4EB2)	; 亲
@@ -1312,27 +1281,24 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8C4D)	; ý¢€ˆ±
+     ((=big5-cdp	  . #x8C4D)	; ý¢€ˆ±
       )
      ((ucs		  . #x4E47)	; 乇
       ))
     (shinjigen-1	. 109)
     (shinjigen-2	. 109)
-    (japanese-jisx0208-1978	. #x5038)	; ø»ƒ™
-    (japanese-jisx0208		. #x5038)	; ø»‡•¡
-    (japanese-jisx0208-1990	. #x5038)	; ø½Š»•
-    (chinese-big5		. #xADBD)	; ý¢€Š¶½
-    (ideograph-daikanwa		. 00312)	; ø¸€„¸
-    (mojikyo			. 000312)	; ý €€„¸
+    (=jis-x0208		. #x5038)	; ø½Š»•
+    (chinese-big5	. #xADBD)	; ý¢€Š¶½
+    (ideograph-daikanwa . 00312)	; ø¸€„¸
+    (ucs-jis		. #x4EB3)	; ø½Š»•
+    (mojikyo		. 000312)	; ý €€„¸
     ))
 (define-char
   '((morohashi-daikanwa	312 0 0)
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 287)
-    (hanyu-dazidian-char . 9)
+    (hanyu-dazidian	1 287 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -1364,7 +1330,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((chinese-big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
+     ((=big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
       )
      ((ucs		  . #x53E3)	; 口
       )
@@ -1383,7 +1349,14 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((chinese-big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(ucs		    . #x2FF1)	; ⿱
+	)
+       ((ucs		    . #x4EA0)	; 亠
+	)
+       ((ucs		    . #x53E3)	; 口
+	))
       )
      ((ucs		  . #x53E3)	; 口
       )
@@ -1402,8 +1375,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x821B)	; 舛
       )
@@ -1458,10 +1430,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	(ucs		    . #x2FF3)	; ⿳
 	)
-       ((japanese-jisx0208-1978	    . #x5035)	; ø»ƒ–
-	(japanese-jisx0208	    . #x5035)	; ø»‡•ž
+       ((=jis-x0208	    . #x5035)	; ø½Š»’
 	)
-       ((chinese-big5-cdp   . #x89CC)	; ý¢€ˆ§Œ
+       ((=big5-cdp	    . #x89CC)	; ý¢€ˆ§Œ
 	)
        ((ucs		    . #x5196)	; 冖
 	))
@@ -1489,7 +1460,7 @@
 	)
        ((ucs		    . #x4EA0)	; 亠
 	)
-       ((chinese-big5-cdp   . #x89CC)	; ý¢€ˆ§Œ
+       ((=big5-cdp	    . #x89CC)	; ý¢€ˆ§Œ
 	)
        ((ucs		    . #x5196)	; 冖
 	))
@@ -1519,10 +1490,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	(ucs		    . #x2FF3)	; ⿳
 	)
-       ((japanese-jisx0208-1978	    . #x5035)	; ø»ƒ–
-	(japanese-jisx0208	    . #x5035)	; ø»‡•ž
+       ((=jis-x0208	    . #x5035)	; ø½Š»’
 	)
-       ((chinese-big5-cdp   . #x89CC)	; ý¢€ˆ§Œ
+       ((=big5-cdp	    . #x89CC)	; ý¢€ˆ§Œ
 	)
        ((ucs		    . #x5196)	; 冖
 	))
@@ -1550,7 +1520,7 @@
 	)
        ((ucs		    . #x4EA0)	; 亠
 	)
-       ((chinese-big5-cdp   . #x89CC)	; ý¢€ˆ§Œ
+       ((=big5-cdp	    . #x89CC)	; ý¢€ˆ§Œ
 	)
        ((ucs		    . #x5196)	; 冖
 	))
@@ -1609,7 +1579,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((china3-jef	  . #x8DCD)	; øºˆ·
+     ((ucs		  . #x342B)	; 㐫
       )
      ((ucs		  . #x5E7A)	; 幺
       )
@@ -1627,10 +1597,9 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
-     ((chinese-big5-cdp	  . #x88DF)	; ý¢€ˆ£Ÿ
+     ((=big5-cdp	  . #x88DF)	; ý¢€ˆ£Ÿ
       )
      ((ucs		  . #x51E0)	; 几
       ))
@@ -1649,7 +1618,7 @@
       )
      ((ucs		  . #x4EA0)	; 亠
       )
-     ((chinese-big5-cdp	  . #x88DF)	; ý¢€ˆ£Ÿ
+     ((ucs		  . #x2099C)	; 𠦜
       )
      ((ucs		  . #x51E0)	; 几
       ))
@@ -1666,8 +1635,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
@@ -1743,7 +1711,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
+     ((=big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -1766,7 +1734,14 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(ucs		    . #x2FF1)	; ⿱
+	)
+       ((ucs		    . #x4EA0)	; 亠
+	)
+       ((ucs		    . #x53E3)	; 口
+	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -1844,7 +1819,7 @@
 	)
        ((ucs		    . #x5148)	; 先
 	)
-       ((chinese-big5-cdp   . #x8AF9)	; ý¢€ˆ«¹
+       ((ucs		    . #x6535)	; 攵
 	))
       ))
     (ideograph-hanziku-1	. #xE1D7)	; ý¢€ž‡—
@@ -1894,8 +1869,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
@@ -1947,8 +1921,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2000,8 +1973,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
@@ -2009,7 +1981,7 @@
 	)
        ((ucs		    . #x5148)	; 先
 	)
-       ((chinese-big5-cdp   . #x8DA2)	; ý¢€ˆ¶¢
+       ((ucs		    . #x6534)	; 攴
 	))
       ))
     (ideograph-daikanwa . 00326)	; ø¸€…†
@@ -2033,7 +2005,7 @@
 	)
        ((ucs		    . #x5148)	; 先
 	)
-       ((chinese-big5-cdp   . #x8DA2)	; ý¢€ˆ¶¢
+       ((ucs		    . #x6534)	; 攴
 	))
       ))
     (chinese-cns11643-4		. #x362F)	; ø»—¿¬
@@ -2049,7 +2021,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((chinese-big5-cdp	  . #x8C4D)	; ý¢€ˆ±
+     ((=big5-cdp	  . #x8C4D)	; ý¢€ˆ±
       )
      ((ucs		  . #x571F)	; 土
       )
@@ -2096,9 +2068,18 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((chinese-big5-cdp	  . #x8C4D)	; ý¢€ˆ±
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(ucs		    . #x2FF3)	; ⿳
+	)
+       ((ucs		    . #x4EA0)	; 亠
+	)
+       ((ucs		    . #x53E3)	; 口
+	)
+       ((ucs		    . #x5196)	; 冖
+	))
       )
-     ((chinese-big5-cdp	  . #x8BF1)	; ý¢€ˆ¯±
+     ((=big5-cdp	  . #x8BF1)	; ý¢€ˆ¯±
       )
      ((ucs		  . #x4E5D)	; 九
       ))
@@ -2119,12 +2100,13 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(ucs		    . #x2FF0)	; â¿°
 	)
-       ((chinese-big5-cdp   . #x8AFA)	; ý¢€ˆ«º
+       ((name		    . "CJK RADICAL HAND")
+	(ucs		    . #x2E98)	; ⺘
 	)
        ((ucs		    . #x4E38)	; 丸
 	))
       )
-     ((chinese-big5-cdp	  . #x8B67)	; ý¢€ˆ­§
+     ((=big5-cdp	  . #x8B67)	; ý¢€ˆ­§
       ))
     (chinese-gb2312		. #x5974)	; ø»…™§
     (chinese-isoir165		. #x5974)	; ø»Ž·
@@ -2180,26 +2162,24 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 291)
-    (hanyu-dazidian-char . 6)
+    (hanyu-dazidian	1 291 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
      ((ideograph-daikanwa . 00300)	; ø¸€„¬
+      (=big5-cdp	  . #x8BE5)	; ý¢€ˆ¯¥
       )
      ((ucs		  . #x65E6)	; 旦
       ))
     (shinjigen-1	. 110)
     (shinjigen-2	. 110)
-    (japanese-jisx0208-1978	. #x5039)	; ø»ƒš
-    (japanese-jisx0208		. #x5039)	; ø»‡•¢
-    (japanese-jisx0208-1990	. #x5039)	; ø½Š»–
-    (chinese-big5		. #xDCB3)	; ý¢€²³
-    (ideograph-daikanwa		. 00328)	; ø¸€…ˆ
-    (china3-jef			. #x41DA)	; øº„‡š
-    (mojikyo			. 000328)	; ý €€…ˆ
+    (=jis-x0208		. #x5039)	; ø½Š»–
+    (chinese-big5	. #xDCB3)	; ý¢€²³
+    (ideograph-daikanwa . 00328)	; ø¸€…ˆ
+    (=jef-china3	. #x41DA)	; øº„‡š
+    (ucs-jis		. #x4EB6)	; ø½Š»–
+    (mojikyo		. 000328)	; ý €€…ˆ
     ))
 (define-char
   '((morohashi-daikanwa	328 0 0)
@@ -2229,6 +2209,7 @@
       (ucs		  . #x2FF1)	; ⿱
       )
      ((ideograph-daikanwa . 00300)	; ø¸€„¬
+      (=big5-cdp	  . #x8BE5)	; ý¢€ˆ¯¥
       )
      ((ucs		  . #x4E14)	; 且
       ))
@@ -2243,19 +2224,19 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x4F3B)	; ø»‚¿¾
-      (japanese-jisx0208	  . #x4F3B)	; ø»‡”†
-      (korean-ksc5601		  . #x573F)	; ø»‰©¾
-      (ideograph-daikanwa	  . 01453)	; ø¸€–­
+     ((=jis-x0208	  . #x4F3B)	; ø½Š¹º
+      (korean-ksc5601	  . #x573F)	; ø»‰©¾
+      (ideograph-daikanwa . 01453)	; ø¸€–­
       )
-     ((chinese-big5-cdp	  . #x8BB7)	; ý¢€ˆ®·
+     ((=big5-cdp	  . #x8BB7)	; ý¢€ˆ®·
       )
-     ((chinese-big5-cdp	  . #x8B67)	; ý¢€ˆ­§
+     ((=big5-cdp	  . #x8B67)	; ý¢€ˆ­§
       ))
-    (japanese-jisx0213-2	. #x2133)	; ø»¤’
-    (ideograph-daikanwa		. 00329)	; ø¸€…‰
-    (china3-jef			. #x41D9)	; øº„‡™
-    (mojikyo			. 000329)	; ý €€…‰
+    (=jis-x0213-2-2000	. #x2133)	; ø»¤’
+    (ideograph-daikanwa . 00329)	; ø¸€…‰
+    (=jef-china3	. #x41D9)	; øº„‡™
+    (ucs-jis		. #x342E)	; ø»¤’
+    (mojikyo		. 000329)	; ý €€…‰
     ))
 (define-char
   '((morohashi-daikanwa	329 0 0)
@@ -2269,9 +2250,9 @@
       )
      ((ucs		  . #x516D)	; 六
       )
-     ((chinese-big5-cdp	  . #x8BB7)	; ý¢€ˆ®·
+     ((=big5-cdp	  . #x8BB7)	; ý¢€ˆ®·
       )
-     ((chinese-big5-cdp	  . #x8B67)	; ý¢€ˆ­§
+     ((=big5-cdp	  . #x8B67)	; ý¢€ˆ­§
       ))
     (chinese-cns11643-3		. #x4034)	; ø»–„™
     (ideograph-hanziku-1	. #xE1F8)	; ý¢€ž‡¸
@@ -2349,7 +2330,16 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8C4D)	; ý¢€ˆ±
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(ucs		    . #x2FF3)	; ⿳
+	)
+       ((ucs		    . #x4EA0)	; 亠
+	)
+       ((ucs		    . #x53E3)	; 口
+	)
+       ((ucs		    . #x5196)	; 冖
+	))
       )
      ((ucs		  . #x8001)	; 老
       ))
@@ -2404,7 +2394,16 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((chinese-big5-cdp	  . #x8C4D)	; ý¢€ˆ±
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(ucs		    . #x2FF3)	; ⿳
+	)
+       ((ucs		    . #x4EA0)	; 亠
+	)
+       ((ucs		    . #x53E3)	; 口
+	)
+       ((ucs		    . #x5196)	; 冖
+	))
       )
      ((ucs		  . #x4E8C)	; 二
       )
@@ -2422,7 +2421,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((chinese-big5-cdp	  . #x8DCA)	; ý¢€ˆ·Š
+     ((=big5-cdp	  . #x8DCA)	; ý¢€ˆ·Š
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2446,7 +2445,14 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((chinese-big5-cdp	  . #x8DCA)	; ý¢€ˆ·Š
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(ucs		    . #x2FF1)	; ⿱
+	)
+       ((ucs		    . #x4EA0)	; 亠
+	)
+       ((ucs		    . #x7530)	; 田
+	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2470,7 +2476,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
+     ((=big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2480,8 +2486,9 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	  (ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((name		      . "cjk radical person as roof")
-	  (chinese-big5-cdp   . #x8B5D)	; ý¢€ˆ­
+	 ((ideograph-gt-pj-9  . #x4D4C)	; ý¢€ˆ­
+	  (=big5-cdp	      . #x8B5D)	; ý¢€ˆ­
+	  (=jef-china3	      . #x71FA)	; øº‡‡º
 	  )
 	 ((ucs		      . #x4E2A)	; 个
 	  ))
@@ -2490,8 +2497,9 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	  (ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((name		      . "cjk radical person as roof")
-	  (chinese-big5-cdp   . #x8B5D)	; ý¢€ˆ­
+	 ((ideograph-gt-pj-9  . #x4D4C)	; ý¢€ˆ­
+	  (=big5-cdp	      . #x8B5D)	; ý¢€ˆ­
+	  (=jef-china3	      . #x71FA)	; øº‡‡º
 	  )
 	 ((ucs		      . #x4E2A)	; 个
 	  ))
@@ -2510,7 +2518,14 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8BAA)	; ý¢€ˆ®ª
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(ucs		    . #x2FF1)	; ⿱
+	)
+       ((ucs		    . #x4EA0)	; 亠
+	)
+       ((ucs		    . #x53E3)	; 口
+	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2520,8 +2535,9 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	  (ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((name		      . "cjk radical person as roof")
-	  (chinese-big5-cdp   . #x8B5D)	; ý¢€ˆ­
+	 ((ideograph-gt-pj-9  . #x4D4C)	; ý¢€ˆ­
+	  (=big5-cdp	      . #x8B5D)	; ý¢€ˆ­
+	  (=jef-china3	      . #x71FA)	; øº‡‡º
 	  )
 	 ((ucs		      . #x4E2A)	; 个
 	  ))
@@ -2530,8 +2546,9 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	  (ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((name		      . "cjk radical person as roof")
-	  (chinese-big5-cdp   . #x8B5D)	; ý¢€ˆ­
+	 ((ideograph-gt-pj-9  . #x4D4C)	; ý¢€ˆ­
+	  (=big5-cdp	      . #x8B5D)	; ý¢€ˆ­
+	  (=jef-china3	      . #x71FA)	; øº‡‡º
 	  )
 	 ((ucs		      . #x4E2A)	; 个
 	  ))
@@ -2550,8 +2567,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x5967)	; 奧
       ))
@@ -2614,6 +2630,40 @@
     (ucs			. #x2018A)	; 𠆊
     ))
 (define-char
+  '((=>ucs		. #x20189)	; 𠆉
+    (ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 13)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (ucs		  . #x2FF3)	; ⿳
+      )
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
+      )
+     ((ucs		  . #x53B6)	; 厶
+      )
+     ((=big5-cdp	  . #x856A)	; ý¢€ˆ•ª
+      ))
+    (ideograph-daikanwa . 48914)	; ø¸‹¼’
+    ))
+(define-char
+  '((morohashi-daikanwa	48914 0 0)
+    (ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 13)
+    (total-strokes	 . 15)
+    (hanyu-dazidian	1 293 1)
+    (ideograph-hanziku-1	. #xE272)	; ý¢€ž‰²
+    (ucs			. #x20189)	; 𠆉
+    ))
+(define-char
+  '((=>ucs		. #x20189)	; 𠆉
+    (morohashi-daikanwa	48914 0 2)
+    (ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 13)
+    (total-strokes	 . 15)
+    (chinese-cns11643-7 . #x2123)	; ø»¾¶
+    ))
+(define-char
   '((morohashi-daikanwa	49510 0 0)
     (ideographic-	(:radical	123 ; ⽺
 			 :strokes	8)
@@ -2666,7 +2716,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8DEB)	; ý¢€ˆ·«
+     ((=big5-cdp	  . #x8DEB)	; ý¢€ˆ·«
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
@@ -2688,8 +2738,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -2707,7 +2756,7 @@
        ((ucs		    . #x5927)	; 大
 	))
       ))
-    (ideograph-cbeta	. 03716)	; ø¸ º„
+    (=cbeta		. 03716)	; ø¸ º„
     (mojikyo		. 071493)	; ý €‘…
     ))
 (define-char
@@ -2800,8 +2849,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((japanese-jisx0208-1978	  . #x5423)	; ø»ƒ†¼
       (japanese-jisx0208	  . #x5423)	; ø»‡›„
@@ -2861,9 +2909,10 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8C4D)	; ý¢€ˆ±
+     ((=big5-cdp	  . #x8C4D)	; ý¢€ˆ±
       )
-     ((ucs		  . #x97F3)	; 音
+     ((=jis-x0208	  . #x323B)	; ø½Š”
+      (korean-ksc5601	  . #x6B65)	; ø»Š‡¼
       ))
     (ideograph-daikanwa . 00338)	; ø¸€…’
     (mojikyo		. 000338)	; ý €€…’
@@ -2878,7 +2927,16 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8C4D)	; ý¢€ˆ±
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(ucs		    . #x2FF3)	; ⿳
+	)
+       ((ucs		    . #x4EA0)	; 亠
+	)
+       ((ucs		    . #x53E3)	; 口
+	)
+       ((ucs		    . #x5196)	; 冖
+	))
       )
      ((ucs		  . #x97F3)	; 音
       ))
@@ -2927,7 +2985,7 @@
       )
      ((ucs		  . #x4EA0)	; 亠
       )
-     ((chinese-big5-cdp	  . #x8B6E)	; ý¢€ˆ­®
+     ((ucs		  . #x7676)	; 癶
       )
      ((ucs		  . #x4E2B)	; 丫
       )
@@ -2956,7 +3014,7 @@
        ((ucs		    . #x76EE)	; 目
 	))
       )
-     ((chinese-big5-cdp	  . #x8B4F)	; ý¢€ˆ­
+     ((ucs		  . #x706C)	; 灬
       ))
     (ideograph-hanziku-1	. #xE273)	; ý¢€ž‰³
     (ucs			. #x20190)	; 𠆐
@@ -2972,7 +3030,7 @@
       )
      ((ucs		  . #x4EA0)	; 亠
       )
-     ((chinese-big5-cdp	  . #x8553)	; ý¢€ˆ•“
+     ((=big5-cdp	  . #x8553)	; ý¢€ˆ•“
       ))
     (ideograph-hanziku-1	. #xE274)	; ý¢€ž‰´
     (ucs			. #x20191)	; 𠆑
@@ -3018,7 +3076,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
       )
-     ((chinese-big5-cdp	  . #x88EB)	; ý¢€ˆ£«
+     ((ucs		  . #x5E77)	; å¹·
       )
      ((ucs		  . #x591C)	; 夜
       ))
@@ -3059,7 +3117,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8DEB)	; ý¢€ˆ·«
+     ((=big5-cdp	  . #x8DEB)	; ý¢€ˆ·«
       )
      ((ucs		  . #x5408)	; 合
       ))
@@ -3079,69 +3137,71 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(ucs		    . #x2FF1)	; ⿱
 	)
-       ((chinese-big5-cdp   . #x8BEC)	; ý¢€ˆ¯¬
+       ((=big5-cdp	    . #x8BEC)	; ý¢€ˆ¯¬
 	)
        ((ucs		    . #x516B)	; 八
 	))
       )
-     ((chinese-big5-cdp	  . #x8BE2)	; ý¢€ˆ¯¢
+     ((=big5-cdp	  . #x8BE2)	; ý¢€ˆ¯¢
       )
-     ((chinese-big5-cdp	  . #x8B67)	; ý¢€ˆ­§
+     ((=big5-cdp	  . #x8B67)	; ý¢€ˆ­§
       ))
     (ideograph-hanziku-1	. #xE2B4)	; ý¢€žŠ´
     (ucs			. #x20198)	; 𠆘
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 15)
-    (total-strokes	 . 17)
-    (ideograph-daikanwa . 00339)	; ø¸€…“
-    (mojikyo		. 000339)	; ý €€…“
-    ))
-(define-char
-  '((=>ucs		. #x20189)	; 𠆉
+  '((=>ucs		. #x342F)	; 㐯
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 15)
-    (total-strokes	 . 15)
+    (total-strokes	 . 17)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
-      )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x53B6)	; 厶
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(ucs		    . #x2FF1)	; ⿱
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=jis-x0208	      . #x5035)	; ø½Š»’
+	  )
+	 ((ucs		      . #x53E3)	; 口
+	  ))
+	(=big5-cdp	    . #x8BAA)	; ý¢€ˆ®ª
+	)
+       ((ucs		    . #x53E3)	; 口
+	))
       )
-     ((chinese-big5-cdp	  . #x856A)	; ý¢€ˆ•ª
+     ((ucs		  . #x9999)	; 香
       ))
-    (ideograph-daikanwa . 48914)	; ø¸‹¼’
+    (ideograph-daikanwa . 00339)	; ø¸€…“
+    (mojikyo		. 000339)	; ý €€…“
     ))
 (define-char
-  '((morohashi-daikanwa	48914 0 0)
+  '((morohashi-daikanwa	339 0 0)
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 15)
-    (total-strokes	 . 15)
-    (hanyu-dazidian	1 293 1)
-    (chinese-cns11643-7		. #x2123)	; ø»¾¶
-    (ideograph-hanziku-1	. #xE272)	; ý¢€ž‰²
-    (ucs			. #x20189)	; 𠆉
-    ))
-(define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 15)
     (total-strokes	 . 17)
     (hanyu-dazidian	1 294 2)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
-      )
-     ((ucs		  . #x4EA0)	; 亠
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(ucs		    . #x2FF1)	; ⿱
 	)
-       ((ucs		    . #x53E3)	; 口
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((ucs		      . #x4EA0)	; 亠
+	  )
+	 ((ucs		      . #x53E3)	; 口
+	  ))
 	)
        ((ucs		    . #x53E3)	; 口
 	))
@@ -3152,8 +3212,13 @@
     (ucs			. #x342F)	; 㐯
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 15)
+  '((morohashi-daikanwa	5824 0 2)
+    (ideographic-	(:radical	8 ; ⼇
+			 :strokes	15
+			 :sources	(ucs))
+			(:radical	36 ; â¼£
+			 :strokes	14
+			 :strokes	(morohashi-daikanwa)))
     (total-strokes	 . 17)
     (hanyu-dazidian	1 294 4)
     (ideographic-structure
@@ -3176,8 +3241,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -3244,7 +3308,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8DEB)	; ý¢€ˆ·«
+     ((=big5-cdp	  . #x8DEB)	; ý¢€ˆ·«
       )
      ((ucs		  . #x59BB)	; 妻
       ))
@@ -3260,22 +3324,29 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(ucs		    . #x2FF0)	; â¿°
+	)
+       ((ucs		    . #x65E5)	; 日
+	)
+       ((ucs		    . #x65E5)	; 日
+	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	(ucs		    . #x2FF3)	; ⿳
 	)
-       ((ucs		    . #x660D)	; 昍
-	)
        ((ucs		    . #x516B)	; 八
 	)
-       ((name		    . "cjk radical person as roof")
-	(chinese-big5-cdp   . #x8B5D)	; ý¢€ˆ­
+       ((ideograph-gt-pj-9  . #x4D4C)	; ý¢€ˆ­
+	(=big5-cdp	    . #x8B5D)	; ý¢€ˆ­
+	(=jef-china3	    . #x71FA)	; øº‡‡º
+	)
+       ((ucs		    . #x620A)	; 戊
 	))
-      )
-     ((ucs		  . #x620A)	; 戊
       ))
     (ideograph-daikanwa . 00341)	; ø¸€…•
     (mojikyo		. 000341)	; ý €€…•
@@ -3293,18 +3364,26 @@
      ((ucs		  . #x4EA0)	; 亠
       )
      ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(ucs		    . #x2FF0)	; â¿°
+	)
+       ((ucs		    . #x65E5)	; 日
+	)
+       ((ucs		    . #x65E5)	; 日
+	))
+      )
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	(ucs		    . #x2FF3)	; ⿳
 	)
-       ((ucs		    . #x660D)	; 昍
-	)
        ((ucs		    . #x516B)	; 八
 	)
-       ((name		    . "cjk radical person as roof")
-	(chinese-big5-cdp   . #x8B5D)	; ý¢€ˆ­
+       ((ideograph-gt-pj-9  . #x4D4C)	; ý¢€ˆ­
+	(=big5-cdp	    . #x8B5D)	; ý¢€ˆ­
+	(=jef-china3	    . #x71FA)	; øº‡‡º
+	)
+       ((ucs		    . #x620A)	; 戊
 	))
-      )
-     ((ucs		  . #x620A)	; 戊
       ))
     (chinese-cns11643-7		. #x4628)	; ø»žµ‘
     (ideograph-hanziku-1	. #xE2BB)	; ý¢€žŠ»
@@ -3331,26 +3410,24 @@
     (ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 20)
     (total-strokes	 . 22)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 294)
-    (hanyu-dazidian-char . 12)
+    (hanyu-dazidian	1 294 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x5035)	; ø»ƒ–
-      (japanese-jisx0208	  . #x5035)	; ø»‡•ž
+     ((=jis-x0208	  . #x5035)	; ø½Š»’
       )
      ((ucs		  . #x820B)	; 舋
       ))
     (jis-x0213-strokes	. 19)
     (shinjigen-2	. 112)
-    (japanese-jisx0212		. #x3042)	; ø»Šº³
-    (japanese-jisx0213-2	. #x2134)	; ø»¤“
-    (chinese-big5		. #xF6D6)	; ý¢€›–
-    (ideograph-daikanwa		. 00342)	; ø¸€…–
-    (china3-jef			. #x41DB)	; øº„‡›
-    (mojikyo			. 000342)	; ý €€…–
+    (japanese-jisx0212	. #x3042)	; ø»Šº³
+    (=jis-x0213-2-2000	. #x2134)	; ø»¤“
+    (chinese-big5	. #xF6D6)	; ý¢€›–
+    (ideograph-daikanwa . 00342)	; ø¸€…–
+    (=jef-china3	. #x41DB)	; øº„‡›
+    (ucs-jis		. #x4EB9)	; ø»Šº³
+    (mojikyo		. 000342)	; ý €€…–
     ))
 (define-char
   '((morohashi-daikanwa	342 0 0)
@@ -3393,15 +3470,15 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
 	(ucs		    . #x2FF5)	; ⿵
 	)
-       ((chinese-big5-cdp   . #x8B65)	; ý¢€ˆ­¥
+       ((=big5-cdp	    . #x8B65)	; ý¢€ˆ­¥
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	  (ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((chinese-big5-cdp   . #x8A6E)	; ý¢€ˆ©®
+	 ((=big5-cdp	      . #x8A6E)	; ý¢€ˆ©®
 	  )
-	 ((chinese-big5-cdp   . #x8BC9)	; ý¢€ˆ¯‰
+	 ((=big5-cdp	      . #x8BC9)	; ý¢€ˆ¯‰
 	  ))
 	))
       ))
@@ -3435,14 +3512,14 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
 	  (ucs		      . #x2FF6)	; ⿶
 	  )
-	 ((chinese-big5-cdp   . #x8B64)	; ý¢€ˆ­¤
+	 ((=big5-cdp	      . #x8B64)	; ý¢€ˆ­¤
 	  )
 	 ((ucs		      . #x540C)	; 同
 	  ))
 	)
        ((ucs		    . #x6797)	; 林
 	)
-       ((chinese-big5-cdp   . #x8B4F)	; ý¢€ˆ­
+       ((ucs		    . #x706C)	; 灬
 	))
       ))
     (ideograph-hanziku-1	. #xE2CB)	; ý¢€ž‹‹