X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R028-Private.el;h=129790eba71ad04b4c29d637e28a2b61a76b02d6;hb=86ee3bc0c7c643f7166fb356d26e1e0f863b3339;hp=f5c4f7631fd4fe744a2bcf9add367b19051d43ee;hpb=9190d13ebacbfde815dffeb16cd6045fc39164cd;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el
index f5c4f76..129790e 100644
--- a/lisp/utf-2000/Ideograph-R028-Private.el
+++ b/lisp/utf-2000/Ideograph-R028-Private.el
@@ -2,29 +2,27 @@
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 383)
-    (hanyu-dazidian-char . 9)
+    (hanyu-dazidian	1 383 9)
     (shinjigen-1	. 889)
     (shinjigen-2	. 889)
-    (japanese-jisx0208-1978	. #x5253)	; ø»ƒ„°
-    (chinese-gb2312		. #x5B4C)	; ø»…›»
-    (japanese-jisx0208		. #x5253)	; ø»‡˜¸
-    (chinese-isoir165		. #x5B4C)	; ø»Ž„‹
-    (chinese-cns11643-3		. #x212B)	; ø»•–®
-    (japanese-jisx0208-1990	. #x5253)	; ø½Š¾¬
-    (ideograph-daikanwa		. 03057)	; ø¸€¯±
-    (chinese-big5-cdp		. #x8AFD)	; ý¢€ˆ«½
-    (ucs			. #x53B6)	; 厶
+    (=gb2312		. #x5B4C)	; ø»…›»
+    (=jis-x0208		. #x5253)	; ø½Š¾¬
+    (=iso-ir165		. #x5B4C)	; ø»Ž„‹
+    (=cns11643-3	. #x212B)	; ø»•–®
+    (=gt-pj-1		. #x5253)	; ý¡€€¼£
+    (=daikanwa		. 03057)	; ø¸€¯±
+    (=big5-cdp		. #x8AFD)	; ý¢€ˆ«½
+    (=gt		. 03875)	; ý¡€€¼£
+    (=ucs		. #x53B6)	; 厶
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (chinese-cns11643-5 . #x212E)	; ø»™ª¹
-    (ideograph-daikanwa . 03058)	; ø¸€¯²
-    (chinese-big5-cdp	. #x8B7E)	; ý¢€ˆ­¾
-    (ucs		. #x20AD3)	; 𠫓
+    (=cns11643-5	. #x212E)	; ø»™ª¹
+    (=daikanwa		. 03058)	; ø¸€¯²
+    (=big5-cdp		. #x8B7E)	; ý¢€ˆ­¾
+    (=ucs		. #x20AD3)	; 𠫓
     ))
 (define-char
   '((=>ucs		. #x20AD3)	; 𠫓
@@ -32,7 +30,8 @@
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (japanese-jisx0213-2	. #x2359)	; ø»¤ ´
+    (=jis-x0213-2-2000	. #x2359)	; ø»¤ ´
+    (=ucs@jis		. #x20AD3)	; ø»¤ ´
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
@@ -40,23 +39,33 @@
     (total-strokes	 . 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       )
-     ((ucs		  . #x53B6)	; 厶
+     ((=ucs		  . #x53B6)	; 厶
       ))
-    (chinese-cns11643-6 . #x213C)	; ø»›µ‹
-    (ideograph-daikanwa . 03059)	; ø¸€¯³
-    (chinese-big5-cdp	. #x89AC)	; ý¢€ˆ¦¬
-    (ucs		. #x20AD4)	; 𠫔
+    (=cns11643-6	. #x213C)	; ø»›µ‹
+    (=daikanwa		. 03059)	; ø¸€¯³
+    (=big5-cdp		. #x89AC)	; ý¢€ˆ¦¬
+    (=ucs		. #x20AD4)	; 𠫔
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (ideograph-daikanwa . 03060)	; ø¸€¯´
-    (ucs		. #x20AD5)	; 𠫕
+    (hanyu-dazidian	1 51 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (=ucs		  . #x2FFA)	; ⿺
+      )
+     ((=ucs		  . #x4E59)	; 乙
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      ))
+    (=daikanwa		. 03060)	; ø¸€¯´
+    (=hanziku-1		. #xAEA5)	; ý¢€šº¥
+    (=ucs		. #x20AD5)	; 𠫕
     ))
 (define-char
   '((=>ucs		. #x20AD5)	; 𠫕
@@ -64,104 +73,121 @@
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (chinese-cns11643-6 . #x213D)	; ø»›µŒ
+    (=cns11643-6	. #x213D)	; ø»›µŒ
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (ideograph-daikanwa . 03061)	; ø¸€¯µ
+    (=daikanwa		. 03061)	; ø¸€¯µ
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (hanyu-dazidian	1 384 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-      (ucs		  . #x2FF8)	; ⿸
+      (=ucs		  . #x2FF8)	; ⿸
       )
-     ((ucs		  . #x20087)	; 𠂇
+     ((=ucs		  . #x20087)	; 𠂇
       )
-     ((ucs		  . #x53B6)	; 厶
+     ((=ucs		  . #x53B6)	; 厶
       ))
-    (japanese-jisx0212		. #x3453)	; ø»‹€¼
-    (chinese-cns11643-3		. #x215C)	; ø»•—Ÿ
-    (japanese-jisx0213-2	. #x235A)	; ø»¤ µ
-    (ideograph-daikanwa		. 03062)	; ø¸€¯¶
-    (chinese-big5-cdp		. #x8CEB)	; ý¢€ˆ³«
-    (ucs			. #x53B7)	; 厷
+    (=jis-x0212		. #x3453)	; ø»‹€¼
+    (=cns11643-3	. #x215C)	; ø»•—Ÿ
+    (=jis-x0213-2-2000	. #x235A)	; ø»¤ µ
+    (=daikanwa		. 03062)	; ø¸€¯¶
+    (=big5-cdp		. #x8CEB)	; ý¢€ˆ³«
+    (=ucs		. #x53B7)	; 厷
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (chinese-cns11643-3 . #x215D)	; ø»•— 
-    (ideograph-daikanwa . 03063)	; ø¸€¯·
-    (ucs		. #x3555)	; 㕕
+    (=cns11643-3	. #x215D)	; ø»•— 
+    (=daikanwa		. 03063)	; ø¸€¯·
+    (=ucs		. #x3555)	; 㕕
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (japanese-jisx0212	. #x3454)	; ø»‹€½
-    (chinese-cns11643-4 . #x2145)	; ø»—¡Œ
-    (ideograph-daikanwa . 03064)	; ø¸€¯¸
-    (china3-jef		. #x45E7)	; øº„—§
-    (ucs		. #x53B8)	; 厸
+    (hanyu-dazidian	1 384 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      ))
+    (=jis-x0212		. #x3454)	; ø»‹€½
+    (=cns11643-4	. #x2145)	; ø»—¡Œ
+    (=daikanwa		. 03064)	; ø¸€¯¸
+    (=hanziku-1		. #xF4F0)	; ý¢€Ÿ“°
+    (=jef-china3	. #x45E7)	; øº„—§
+    (=ucs		. #x53B8)	; 厸
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 384)
-    (hanyu-dazidian-char . 5)
+    (hanyu-dazidian	1 384 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x4E5D)	; 九
+     ((=ucs		  . #x4E5D)	; 九
       )
-     ((ucs		  . #x53B6)	; 厶
+     ((=ucs		  . #x53B6)	; 厶
       ))
-    (chinese-cns11643-2 . #x2138)	; ø»“Œ·
-    (chinese-big5	. #xC958)	; øº¡¥œ
-    (ideograph-daikanwa . 03065)	; ø¸€¯¹
-    (china3-jef		. #x8EAF)	; øºˆº¯
-    (ucs		. #x53B9)	; 厹
+    (=cns11643-2	. #x2138)	; ø»“Œ·
+    (=big5		. #xC958)	; ý¢€Œ¥˜
+    (=daikanwa		. 03065)	; ø¸€¯¹
+    (=jef-china3	. #x8EAF)	; øºˆº¯
+    (=ucs		. #x53B9)	; 厹
     ))
 (define-char
   '((=>ucs		. #x20AD7)	; 𠫗
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (chinese-cns11643-6 . #x215D)	; ø»›µ¬
-    (ideograph-daikanwa . 03066)	; ø¸€¯º
+    (=cns11643-6	. #x215D)	; ø»›µ¬
+    (=daikanwa		. 03066)	; ø¸€¯º
     ))
 (define-char
   '((morohashi-daikanwa	3066 0 9)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (ucs		. #x20AD7)	; 𠫗
+    (hanyu-dazidian	1 276 8)
+    (=hanziku-1		. #xDEEF)	; ý¢€»¯
+    (=ucs		. #x20AD7)	; 𠫗
     ))
 (define-char
-  '((ideographic-radical . 28)	; ⼛
+  '((ideographic-radical@ucs . 16)	; ⼏
+    (ideographic-strokes@ucs . 2)
+    (ideographic-radical@daikanwa . 28)	; ⼛
+    (ideographic-strokes@daikanwa . 2)
+    (total-strokes	 . 4)
+    (=daikanwa		. 03067)	; ø¸€¯»
+    (=ucs		. #x2062F)	; 𠘯
+    ))
+(define-char
+  '((=>ucs		. #x2062F)	; 𠘯
+    (morohashi-daikanwa	3067 0 0)
+    (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 276)
-    (hanyu-dazidian-char . 9)
-    (chinese-cns11643-6 . #x215C)	; ø»›µ«
-    (ideograph-daikanwa . 03067)	; ø¸€¯»
-    (chinese-big5-cdp	. #x87B8)	; ý¢€ˆž¸
-    (ucs		. #x2062F)	; 𠘯
+    (=cns11643-6	. #x215C)	; ø»›µ«
+    (=big5-cdp		. #x87B8)	; ý¢€ˆž¸
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (ideograph-daikanwa . 03068)	; ø¸€¯¼
+    (=daikanwa		. 03068)	; ø¸€¯¼
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
@@ -170,171 +196,226 @@
     (<-original-ideograph
      (:sources	(seiji-tsuu morohashi-daikanwa shinjigen-1)
       :char	((shinjigen-1	     . 890)
-		 (ideograph-daikanwa . 03070)	; ø¸€¯¾
+		 (=daikanwa	     . 03070)	; ø¸€¯¾
 		 )
       ))
+    (hanyu-dazidian	1 385 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5927)	; 大
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      ))
     (shinjigen-1	. 891)
-    (japanese-jisx0212	. #x3455)	; ø»‹€¾
-    (chinese-cns11643-3 . #x222A)	; ø»•˜‹
-    (ideograph-daikanwa . 03069)	; ø¸€¯½
-    (ucs		. #x53BA)	; 厺
+    (=jis-x0212		. #x3455)	; ø»‹€¾
+    (=cns11643-3	. #x222A)	; ø»•˜‹
+    (=daikanwa		. 03069)	; ø¸€¯½
+    (=hanziku-1		. #xF54B)	; ý¢€Ÿ•‹
+    (=ucs		. #x53BA)	; 厺
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 384)
-    (hanyu-dazidian-char . 8)
+    (hanyu-dazidian	1 384 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x571F)	; 土
+     ((=ucs		  . #x571F)	; 土
       )
-     ((ucs		  . #x53B6)	; 厶
+     ((=ucs		  . #x53B6)	; 厶
       ))
     (shinjigen-1	. 890)
     (shinjigen-2	. 890)
-    (japanese-jisx0208-1978	. #x356E)	; ø»‚š¥
-    (chinese-gb2312		. #x4825)	; ø»„¿š
-    (japanese-jisx0208		. #x356E)	; ø»†®­
-    (korean-ksc5601		. #x4B5B)	; ø»‰˜²
-    (chinese-isoir165		. #x4825)	; ø»§ª
-    (chinese-cns11643-1		. #x462A)	; ø»‘¸»
-    (japanese-jisx0208-1990	. #x356E)	; ø½Š”¡
-    (chinese-big5		. #xA568)	; øºŸ¥œ
-    (ideograph-daikanwa		. 03070)	; ø¸€¯¾
-    (ucs			. #x53BB)	; 去
+    (=gb2312		. #x4825)	; ø»„¿š
+    (=jis-x0208		. #x356E)	; ø½Š”¡
+    (=ks-x1001		. #x4B5B)	; ø»‰˜²
+    (=iso-ir165		. #x4825)	; ø»§ª
+    (=cns11643-1	. #x462A)	; ø»‘¸»
+    (=gt-pj-1		. #x356E)	; ý¡€€¼²
+    (=big5		. #xA568)	; ý¢€Š•¨
+    (=daikanwa		. 03070)	; ø¸€¯¾
+    (=gt-k		. 00912)	; ý¡„€Ž
+    (=gt		. 03890)	; ý¡€€¼²
+    (=ucs		. #x53BB)	; 去
     ))
 (define-char
   '((=>ucs		. #x20AD9)	; 𠫙
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (ideograph-daikanwa . 03071)	; ø¸€¯¿
+    (=daikanwa		. 03071)	; ø¸€¯¿
     ))
 (define-char
   '((morohashi-daikanwa	3071 0 1)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (chinese-cns11643-6 . #x2252)	; ø»›¶¿
-    (ucs		. #x20AD9)	; 𠫙
+    (hanyu-dazidian	1 385 3)
+    (=cns11643-6	. #x2252)	; ø»›¶¿
+    (=hanziku-1		. #xF54D)	; ý¢€Ÿ•
+    (=ucs		. #x20AD9)	; 𠫙
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (ideograph-daikanwa . 03072)	; ø¸€°€
+    (=daikanwa		. 03072)	; ø¸€°€
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (ideograph-daikanwa . 03073)	; ø¸€°
+    (=daikanwa		. 03073)	; ø¸€°
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (chinese-gb12345	. #x7D29)	; 厼
-    (ucs		. #x53BC)	; 厼
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      )
+     ((=ucs		  . #x5C0F)	; 小
+      ))
+    (=gb12345		. #x7D29)	; 厼
+    (=ucs		. #x53BC)	; 厼
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (chinese-cns11643-6 . #x2251)	; ø»›¶¾
-    (ucs		. #x20ADA)	; 𠫚
+    (=cns11643-6	. #x2251)	; ø»›¶¾
+    (=ucs		. #x20ADA)	; 𠫚
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-4 . #x224A)	; ø»—¢¯
-    (ideograph-daikanwa . 03074)	; ø¸€°‚
-    (ucs		. #x20ADE)	; 𠫞
+    (hanyu-dazidian	1 386 7)
+    (=cns11643-4	. #x224A)	; ø»—¢¯
+    (=daikanwa		. 03074)	; ø¸€°‚
+    (=hanziku-1		. #xF571)	; ý¢€Ÿ•±
+    (=ucs		. #x20ADE)	; 𠫞
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (japanese-jisx0212	. #x3456)	; ø»‹€¿
-    (chinese-cns11643-4 . #x2248)	; ø»—¢­
-    (ideograph-daikanwa . 03075)	; ø¸€°ƒ
-    (china3-jef		. #x45E8)	; øº„—¨
-    (ucs		. #x53BD)	; 厽
+    (hanyu-dazidian	1 386 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      )
+     ((=ucs		  . #x53B8)	; 厸
+      ))
+    (=jis-x0212		. #x3456)	; ø»‹€¿
+    (=cns11643-4	. #x2248)	; ø»—¢­
+    (=daikanwa		. 03075)	; ø¸€°ƒ
+    (=hanziku-1		. #xF572)	; ý¢€Ÿ•²
+    (=jef-china3	. #x45E8)	; øº„—¨
+    (=ucs		. #x53BD)	; 厽
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 . #x2423)	; ø»›¹Œ
-    (ideograph-daikanwa . 03076)	; ø¸€°„
-    (ucs		. #x20ADF)	; 𠫟
+    (hanyu-dazidian	1 386 2)
+    (=cns11643-6	. #x2423)	; ø»›¹Œ
+    (=daikanwa		. 03076)	; ø¸€°„
+    (=hanziku-1		. #xF56C)	; ý¢€Ÿ•¬
+    (=ucs		. #x20ADF)	; 𠫟
     ))
 (define-char
   '((=>ucs		. #x20AE0)	; ð « 
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (ideograph-daikanwa . 03077)	; ø¸€°…
+    (=daikanwa		. 03077)	; ø¸€°…
     ))
 (define-char
   '((morohashi-daikanwa	3077 0 0)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 . #x2421)	; ø»›¹Š
-    (ucs		. #x20AE0)	; ð « 
+    (hanyu-dazidian	1 386 6)
+    (=cns11643-6	. #x2421)	; ø»›¹Š
+    (=hanziku-1		. #xF570)	; ý¢€Ÿ•°
+    (=ucs		. #x20AE0)	; ð « 
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 . #x2422)	; ø»›¹‹
-    (ideograph-daikanwa . 03078)	; ø¸€°†
-    (ucs		. #x20AE5)	; ð «¥
+    (hanyu-dazidian	1 386 5)
+    (=cns11643-6	. #x2422)	; ø»›¹‹
+    (=daikanwa		. 03078)	; ø¸€°†
+    (=hanziku-1		. #xF56F)	; ý¢€Ÿ•¯
+    (=ucs		. #x20AE5)	; ð «¥
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (ideograph-daikanwa . 03079)	; ø¸€°‡
+    (=daikanwa		. 03079)	; ø¸€°‡
     ))
 (define-char
-  '((ideographic-radical . 28)	; ⼛
+  '((=>ucs		. #x53BE)	; 厾
+    (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
-    (kangxi-radical	 . 5)	; ⼄
-    (kangxi-strokes	 . 5)
     (total-strokes	 . 6)
-    (chinese-isoir165	. #x2C21)	; ø»Œ¾ž
-    (chinese-cns11643-3 . #x2331)	; ø»•™°
-    (ideograph-daikanwa . 03080)	; ø¸€°ˆ
-    (ucs		. #x53BE)	; 厾
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((name		  . "CJK RADICAL SECOND THREE")
+      (=ucs		  . #x2E84)	; ⺄
+      )
+     ((=ucs		  . #x53BB)	; 去
+      ))
+    (=cns11643-3	. #x2331)	; ø»•™°
+    (=daikanwa		. 03080)	; ø¸€°ˆ
     ))
 (define-char
-  '((=>ucs		. #x21FEE)	; ð¡¿®
+  '((morohashi-daikanwa	3080 0 2)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (ideograph-daikanwa . 03081)	; ø¸€°‰
+    (hanyu-dazidian	1 53 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((name		  . "CJK RADICAL SECOND THREE")
+      (=ucs		  . #x2E84)	; ⺄
+      )
+     ((=ucs		  . #x53BB)	; 去
+      ))
+    (=iso-ir165		. #x2C21)	; ø»Œ¾ž
+    (=hanziku-1		. #xAEE3)	; ý¢€š»£
+    (=ucs		. #x53BE)	; 厾
     ))
 (define-char
   '((=>ucs		. #x21FEE)	; ð¡¿®
-    (morohashi-daikanwa	3081 0 0)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (chinese-cns11643-6 . #x237E)	; ø»›¹‰
+    (=daikanwa		. 03081)	; ø¸€°‰
     ))
 (define-char
-  '((morohashi-daikanwa	3081 0 4)
+  '((=>ucs		. #x21FEE)	; ð¡¿®
+    (morohashi-daikanwa	3081 0 0)
     (ideographic-radical . 28)	; ⼛
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (ucs		. #x21FEE)	; ð¡¿®
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (=cns11643-6	. #x237E)	; ø»›¹‰
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
@@ -342,139 +423,227 @@
     (total-strokes	 . 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x3405)	; 㐅
+     ((=ucs		  . #x3405)	; 㐅
       )
-     ((chinese-big5-cdp	  . #x8CEB)	; ý¢€ˆ³«
+     ((=ucs		  . #x53B7)	; 厷
       ))
-    (chinese-cns11643-4 . #x2249)	; ø»—¢®
-    (ideograph-daikanwa . 48956)	; ø¸‹¼¼
-    (ideograph-cbeta	. 06611)	; ø¸¡§“
-    (chinese-big5-cdp	. #x88E6)	; ý¢€ˆ£¦
-    (ucs		. #x20AE4)	; 𠫤
+    (=cns11643-4	. #x2249)	; ø»—¢®
+    (=daikanwa		. 48956)	; ø¸‹¼¼
+    (=big5-cdp		. #x88E6)	; ý¢€ˆ£¦
+    (=cbeta		. 06611)	; ø¸¡§“
+    (=ucs		. #x20AE4)	; 𠫤
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (chinese-cns11643-6 . #x2640)	; ø»›¼¥
-    (ideograph-daikanwa . 03082)	; ø¸€°Š
-    (ucs		. #x20AE6)	; 𠫦
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (=ucs		. #x20AE3)	; ð «£
     ))
 (define-char
-  '((=>ucs		. #x2128F)	; 𡊏
+  '((=>ucs		. #x20AE3)	; ð «£
     (ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (hanyu-dazidian	1 386 1)
+    (=hanziku-1		. #xF56B)	; ý¢€Ÿ•«
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (chinese-cns11643-6 . #x2641)	; ø»›¼¦
-    (ideograph-daikanwa . 48957)	; ø¸‹¼½
+    (hanyu-dazidian	1 386 10)
+    (=cns11643-6	. #x2640)	; ø»›¼¥
+    (=daikanwa		. 03082)	; ø¸€°Š
+    (=hanziku-1		. #xF574)	; ý¢€Ÿ•´
+    (=ucs		. #x20AE6)	; 𠫦
     ))
 (define-char
-  '((morohashi-daikanwa	48957 0 4)
+  '((=>ucs		. #x2128F)	; 𡊏
     (ideographic-radical . 28)	; ⼛
-    (ideographic-strokes . 6)
-    (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2641)	; ø»›¼¦
-    (ucs		. #x2128F)	; 𡊏
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (=cns11643-6	. #x2641)	; ø»›¼¦
+    (=daikanwa		. 48957)	; ø¸‹¼½
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (chinese-gb2312	. #x4F58)	; ø»…ŠŸ
-    (chinese-isoir165	. #x4F58)	; ø»²¯
-    (ucs		. #x53BF)	; 县
+    (hanyu-dazidian	1 386 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E14)	; 且
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      ))
+    (=gb2312		. #x4F58)	; ø»…ŠŸ
+    (=iso-ir165		. #x4F58)	; ø»²¯
+    (=hanziku-1		. #xF573)	; ý¢€Ÿ•³
+    (=ucs		. #x53BF)	; 县
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (japanese-jisx0212		. #x3457)	; ø»‹€
-    (chinese-cns11643-4		. #x2559)	; ø»—§˜
-    (japanese-jisx0213-2	. #x235B)	; ø»¤ ¶
-    (ideograph-daikanwa		. 03083)	; ø¸€°‹
-    (china3-jef			. #x8BF1)	; øºˆ¯±
-    (ucs			. #x53C0)	; 叀
+    (hanyu-dazidian	1 386 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8DEE)	; ý¢€ˆ·®
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      ))
+    (=jis-x0212		. #x3457)	; ø»‹€
+    (=cns11643-4	. #x2559)	; ø»—§˜
+    (=jis-x0213-2-2000	. #x235B)	; ø»¤ ¶
+    (=daikanwa		. 03083)	; ø¸€°‹
+    (=hanziku-1		. #xF576)	; ý¢€Ÿ•¶
+    (=jef-china3	. #x8BF1)	; øºˆ¯±
+    (=ucs		. #x53C0)	; 叀
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2A2C)	; ø»œ‚‰
-    (ideograph-daikanwa . 03084)	; ø¸€°Œ
-    (ucs		. #x20AE9)	; ð «©
+    (hanyu-dazidian	1 386 18)
+    (=cns11643-6	. #x2A2C)	; ø»œ‚‰
+    (=daikanwa		. 03084)	; ø¸€°Œ
+    (=hanziku-1		. #xF57C)	; ý¢€Ÿ•¼
+    (=ucs		. #x20AE9)	; ð «©
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2A2B)	; ø»œ‚ˆ
-    (ideograph-daikanwa . 03085)	; ø¸€°
-    (ucs		. #x20AEA)	; 𠫪
+    (hanyu-dazidian	1 386 16)
+    (=cns11643-6	. #x2A2B)	; ø»œ‚ˆ
+    (=daikanwa		. 03085)	; ø¸€°
+    (=hanziku-1		. #xF57A)	; ý¢€Ÿ•º
+    (=ucs		. #x20AEA)	; 𠫪
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2A2D)	; ø»œ‚Š
-    (ideograph-daikanwa . 03086)	; ø¸€°Ž
-    (ucs		. #x20AEB)	; ð ««
+    (hanyu-dazidian	1 387 1)
+    (=cns11643-6	. #x2A2D)	; ø»œ‚Š
+    (=daikanwa		. 03086)	; ø¸€°Ž
+    (=hanziku-1		. #xF5AD)	; ý¢€Ÿ–­
+    (=ucs		. #x20AEB)	; ð ««
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-cns11643-6 . #x2A2E)	; ø»œ‚‹
-    (ideograph-daikanwa . 03087)	; ø¸€°
-    (ucs		. #x20AEC)	; 𠫬
+    (hanyu-dazidian	1 387 3)
+    (=cns11643-6	. #x2A2E)	; ø»œ‚‹
+    (=daikanwa		. 03087)	; ø¸€°
+    (=hanziku-1		. #xF5AF)	; ý¢€Ÿ–¯
+    (=ucs		. #x20AEC)	; 𠫬
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (ideograph-daikanwa . 03088)	; ø¸€°
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x53BD)	; 厽
+      )
+     ((name*		  . "ideographic component person as roof")
+      (=gt		  . 00458)	; ý¡€€‡Š
+      ))
+    (=daikanwa		. 03088)	; ø¸€°
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (chinese-gb2312	. #x487E)	; ø»…€³
-    (chinese-isoir165	. #x487E)	; ø»©ƒ
-    (chinese-cns11643-3 . #x2769)	; ø»•  
-    (ideograph-daikanwa . 03089)	; ø¸€°‘
-    (ucs		. #x53C1)	; 叁
+    (hanyu-dazidian	1 386 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x53B6)	; 厶
+	)
+       ((=ucs		    . #x5927)	; 大
+	))
+      )
+     ((=ucs		  . #x4E09)	; 三
+      ))
+    (=gb2312		. #x487E)	; ø»…€³
+    (=iso-ir165		. #x487E)	; ø»©ƒ
+    (=cns11643-3	. #x2769)	; ø»•  
+    (=daikanwa		. 03089)	; ø¸€°‘
+    (=hanziku-1		. #xF577)	; ý¢€Ÿ•·
+    (=ucs		. #x53C1)	; 叁
     ))
 (define-char
-  '((ideographic-radical . 28)	; ⼛
+  '((script		JP-Jouyou Ideograph)
+    (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (comment		. "[JP:Jouyou-Kanji] <simplified character> of S1-0893")
+    (<-simplified-ideograph
+     (:sources	(morohashi-daikanwa shinjigen-1)
+      :char	((shinjigen-1	     . 893)
+		 (=daikanwa	     . 03098)	; ø¸€°š
+		 )
+      ))
+    (hanyu-dazidian	1 386 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x53B6)	; 厶
+	)
+       ((=ucs		    . #x5927)	; 大
+	))
+      )
+     ((=ucs		  . #x5F61)	; 彡
+      ))
     (shinjigen-1	. 892)
     (shinjigen-2	. 892)
-    (japanese-jisx0208-1978	. #x3B32)	; ø»‚¢
-    (chinese-gb2312		. #x324E)	; ø»„Ÿ¯
-    (japanese-jisx0208		. #x3B32)	; ø»†¶¥
-    (chinese-isoir165		. #x324E)	; ø»‡¿
-    (chinese-cns11643-3		. #x276A)	; ø»• ¡
-    (japanese-jisx0208-1990	. #x3B32)	; ø½Šœ™
-    (ideograph-daikanwa		. 03090)	; ø¸€°’
-    (ucs			. #x53C2)	; 参
+    (=gb2312		. #x324E)	; ø»„Ÿ¯
+    (=jis-x0208		. #x3B32)	; ø½Šœ™
+    (=iso-ir165		. #x324E)	; ø»‡¿
+    (=cns11643-3	. #x276A)	; ø»• ¡
+    (=gt-pj-1		. #x3B32)	; ý¡€€½…
+    (=daikanwa		. 03090)	; ø¸€°’
+    (=hanziku-1		. #xF579)	; ý¢€Ÿ•¹
+    (=gt-k		. 03720)	; ý¡„€ºˆ
+    (=gt		. 03909)	; ý¡€€½…
+    (=ucs		. #x53C2)	; 参
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x2F47)	; ø»œ‰º
-    (ideograph-daikanwa . 03091)	; ø¸€°“
-    (ucs		. #x20AF0)	; ð «°
+    (hanyu-dazidian	1 387 9)
+    (=cns11643-6	. #x2F47)	; ø»œ‰º
+    (=daikanwa		. 03091)	; ø¸€°“
+    (=hanziku-1		. #xF5B5)	; ý¢€Ÿ–µ
+    (=ucs		. #x20AF0)	; ð «°
     ))
 (define-char
   '((=>ucs		. #x20AF1)	; ð «±
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 03092)	; ø¸€°”
+    (=daikanwa		. 03092)	; ø¸€°”
     ))
 (define-char
   '((=>ucs		. #x20AF1)	; ð «±
@@ -482,44 +651,64 @@
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-6 . #x2F48)	; ø»œ‰»
+    (=cns11643-6	. #x2F48)	; ø»œ‰»
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (ideograph-daikanwa . 03093)	; ø¸€°•
+    (=daikanwa		. 03093)	; ø¸€°•
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (chinese-cns11643-4 . #x2856)	; ø»—«¯
-    (ideograph-daikanwa . 48989)	; ø¸‹½
-    (ucs		. #x20AF3)	; ð «³
+    (hanyu-dazidian	1 397 9)
+    (=cns11643-4	. #x2856)	; ø»—«¯
+    (=daikanwa		. 48989)	; ø¸‹½
+    (=hanziku-1		. #xF7BB)	; ý¢€Ÿž»
+    (=ucs		. #x20AF3)	; ð «³
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (=ucs		. #x20AF8)	; 𠫸
+    ))
+(define-char
+  '((=>ucs		. #x20AF8)	; 𠫸
+    (ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 387 10)
+    (=hanziku-1		. #xF5B6)	; ý¢€Ÿ–¶
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3576)	; ø»œ“
-    (ideograph-daikanwa . 03094)	; ø¸€°–
-    (ucs		. #x20AF9)	; ð «¹
+    (hanyu-dazidian	1 387 16)
+    (=cns11643-6	. #x3576)	; ø»œ“
+    (=daikanwa		. 03094)	; ø¸€°–
+    (=hanziku-1		. #xF5BC)	; ý¢€Ÿ–¼
+    (=ucs		. #x20AF9)	; ð «¹
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-6 . #x3575)	; ø»œ“œ
-    (ideograph-daikanwa . 03095)	; ø¸€°—
-    (ucs		. #x20AFA)	; 𠫺
+    (hanyu-dazidian	1 387 15)
+    (=cns11643-6	. #x3575)	; ø»œ“œ
+    (=daikanwa		. 03095)	; ø¸€°—
+    (=hanziku-1		. #xF5BB)	; ý¢€Ÿ–»
+    (=ucs		. #x20AFA)	; 𠫺
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (ideograph-daikanwa . 03096)	; ø¸€°˜
-    (ucs		. #x3556)	; 㕖
+    (=daikanwa		. 03096)	; ø¸€°˜
+    (=ucs		. #x3556)	; 㕖
     ))
 (define-char
   '((=>ucs		. #x3556)	; 㕖
@@ -527,60 +716,98 @@
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (chinese-cns11643-3 . #x2F72)	; ø»•¬™
+    (=cns11643-3	. #x2F72)	; ø»•¬™
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (->identical
+     ((=daikanwa	  . 05931)	; ø¸œ«
+      ))
+    (=ucs		. #x20AFB)	; ð «»
+    ))
+(define-char
+  '((=>ucs		. #x20AFB)	; ð «»
+    (ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (->same-ideograph
+     ((=daikanwa	  . 05931)	; ø¸œ«
+      ))
+    (hanyu-dazidian	1 387 12)
+    (=hanziku-1		. #xF5B8)	; ý¢€Ÿ–¸
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (->identical
+     ((=daikanwa	  . 00283)	; ø¸€„›
+      ))
+    (hanyu-dazidian	1 387 18)
+    (=hanziku-1		. #xF5BE)	; ý¢€Ÿ–¾
+    (=ucs		. #x20AFC)	; ð «¼
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (chinese-cns11643-6 . #x3D61)	; ø»œž¸
-    (ideograph-daikanwa . 03097)	; ø¸€°™
-    (ucs		. #x3557)	; 㕗
+    (=cns11643-6	. #x3D61)	; ø»œž¸
+    (=daikanwa		. 03097)	; ø¸€°™
+    (=ucs		. #x3557)	; 㕗
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 387)
-    (hanyu-dazidian-char . 23)
+    (hanyu-dazidian	1 387 23)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (ucs		  . #x2FF3)	; ⿳
-      )
-     ((chinese-big5-cdp	  . #x8DF6)	; ý¢€ˆ·¶
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x53B6)	; 厶
+     ((=daikanwa	  . 03088)	; ø¸€°
       )
-     ((ucs		  . #x3431)	; 㐱
+     ((=ucs		  . #x5F61)	; 彡
       ))
     (shinjigen-1	. 893)
     (shinjigen-2	. 893)
-    (japanese-jisx0208-1978	. #x5254)	; ø»ƒ„±
-    (japanese-jisx0208		. #x5254)	; ø»‡˜¹
-    (korean-ksc5601		. #x7351)	; ø»Š“˜
-    (chinese-cns11643-1		. #x5936)	; ø»’•
-    (japanese-jisx0208-1990	. #x5254)	; ø½Š¾­
-    (chinese-gb12345		. #x324E)	; 參
-    (chinese-big5		. #xB0D1)	; øº ¢
-    (ideograph-daikanwa		. 03098)	; ø¸€°š
-    (ucs			. #x53C3)	; 參
+    (=jis-x0208		. #x5254)	; ø½Š¾­
+    (=ks-x1001		. #x7351)	; ø»Š“˜
+    (=cns11643-1	. #x5936)	; ø»’•
+    (=gb12345		. #x324E)	; 參
+    (=gt-pj-1		. #x5254)	; ý¡€€½’
+    (=big5		. #xB0D1)	; ý¢€‹ƒ‘
+    (=daikanwa		. 03098)	; ø¸€°š
+    (=gt-k		. 07912)	; ý¡„»¨
+    (=gt		. 03922)	; ý¡€€½’
+    (=ucs		. #x53C3)	; 參
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (chinese-cns11643-3 . #x3455)	; ø»•³’
-    (ideograph-daikanwa . 03099)	; ø¸€°›
-    (ucs		. #x53C4)	; 叄
+    (hanyu-dazidian	1 387 21)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=daikanwa	  . 03088)	; ø¸€°
+      )
+     ((=ucs		  . #x4E09)	; 三
+      ))
+    (=cns11643-3	. #x3455)	; ø»•³’
+    (=daikanwa		. 03099)	; ø¸€°›
+    (=hanziku-1		. #xF5C1)	; ý¢€Ÿ—
+    (=ucs		. #x53C4)	; 叄
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (chinese-cns11643-3 . #x3456)	; ø»•³“
+    (=cns11643-3	. #x3456)	; ø»•³“
     (mojikyo		. 070966)	; ý €‘”¶
-    (ucs		. #x3558)	; 㕘
+    (=ucs		. #x3558)	; 㕘
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
@@ -589,205 +816,314 @@
     (<-vulgar-ideograph
      (:sources	(shinjigen-1)
       :char	((shinjigen-1	     . 893)
-		 (ideograph-daikanwa . 03098)	; ø¸€°š
+		 (=daikanwa	     . 03098)	; ø¸€°š
 		 )
       ))
+    (hanyu-dazidian	1 389 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=daikanwa	  . 03088)	; ø¸€°
+      )
+     ((=big5-cdp	  . #x8CD9)	; ý¢€ˆ³™
+      ))
     (shinjigen-1	. 894)
-    (japanese-jisx0212	. #x3458)	; ø»‹
-    (chinese-cns11643-3 . #x3A29)	; ø»•»š
-    (ideograph-daikanwa . 03100)	; ø¸€°œ
-    (china3-jef		. #x45E9)	; øº„—©
-    (ideograph-cbeta	. 03744)	; ø¸ º 
-    (ucs		. #x53C5)	; 叅
+    (=jis-x0212		. #x3458)	; ø»‹
+    (=cns11643-3	. #x3A29)	; ø»•»š
+    (=daikanwa		. 03100)	; ø¸€°œ
+    (=hanziku-1		. #xF5F1)	; ý¢€Ÿ—±
+    (=cbeta		. 03744)	; ø¸ º 
+    (=jef-china3	. #x45E9)	; øº„—©
+    (=ucs		. #x53C5)	; 叅
     ))
 (define-char
   '((=>ucs		. #x20AFF)	; ð «¿
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 03101)	; ø¸€°
+    (=daikanwa		. 03101)	; ø¸€°
     ))
 (define-char
   '((morohashi-daikanwa	3101 0 0)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (chinese-cns11643-5 . #x366C)	; ø»šŠ­
-    (ucs		. #x20AFF)	; ð «¿
+    (hanyu-dazidian	1 389 1)
+    (=cns11643-5	. #x366C)	; ø»šŠ­
+    (=hanziku-1		. #xF5ED)	; ý¢€Ÿ—­
+    (=ucs		. #x20AFF)	; ð «¿
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4722)	; ø»œ¬¥
-    (ideograph-daikanwa . 03102)	; ø¸€°ž
-    (ucs		. #x20B00)	; 𠬀
+    (hanyu-dazidian	1 389 2)
+    (=cns11643-6	. #x4722)	; ø»œ¬¥
+    (=daikanwa		. 03102)	; ø¸€°ž
+    (=hanziku-1		. #xF5EE)	; ý¢€Ÿ—®
+    (=ucs		. #x20B00)	; 𠬀
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4724)	; ø»œ¬§
-    (ideograph-daikanwa . 03103)	; ø¸€°Ÿ
-    (ucs		. #x20B01)	; 𠬁
+    (hanyu-dazidian	1 389 4)
+    (=cns11643-6	. #x4724)	; ø»œ¬§
+    (=daikanwa		. 03103)	; ø¸€°Ÿ
+    (=hanziku-1		. #xF5F0)	; ý¢€Ÿ—°
+    (=ucs		. #x20B01)	; 𠬁
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 03104)	; ø¸€° 
+    (->identical
+     ((=daikanwa	  . 30340)	; ø¸‡š„
+      ))
+    (->synonyms
+     (:sources	(henkai-ruihen morohashi-daikanwa)
+      :char	((=daikanwa	     . 13502)	; ø¸ƒ’¾
+		 )
+      ))
+    (hanyu-dazidian	1 389 3)
+    (=daikanwa		. 03104)	; ø¸€° 
+    (=hanziku-1		. #xF5EF)	; ý¢€Ÿ—¯
+    (=ucs		. #x20B02)	; 𠬂
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4721)	; ø»œ¬¤
-    (ideograph-daikanwa . 03105)	; ø¸€°¡
-    (ucs		. #x26385)	; 𦎅
+    (hanyu-dazidian	5 3132 11)
+    (=cns11643-6	. #x4721)	; ø»œ¬¤
+    (=daikanwa		. 03105)	; ø¸€°¡
+    (=hanziku-8		. #xDF48)	; ý¢‚½ˆ
+    (=ucs		. #x26385)	; 𦎅
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (chinese-cns11643-6 . #x4723)	; ø»œ¬¦
-    (ucs		. #x20B05)	; 𠬅
+    (=cns11643-6	. #x4723)	; ø»œ¬¦
+    (=ucs		. #x20B05)	; 𠬅
     ))
 (define-char
   '((=>ucs		. #x20B06)	; 𠬆
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 03106)	; ø¸€°¢
+    (=daikanwa		. 03106)	; ø¸€°¢
     ))
 (define-char
-  '((morohashi-daikanwa	3106 0 0)
+  '((=>ucs		. #x20B06)	; 𠬆
+    (morohashi-daikanwa	3106 0 0)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (ucs		. #x20B06)	; 𠬆
+    (hanyu-dazidian	5 3408 6)
+    (=hanziku-9		. #xC1B6)	; ý¢‚œ†¶
+    ))
+(define-char
+  '((morohashi-daikanwa	3106 0 1)
+    (ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (=ucs		. #x20B06)	; 𠬆
     ))
 (define-char
   '((=>ucs		. #x20B06)	; 𠬆
-    (morohashi-daikanwa	3106 0 1)
+    (morohashi-daikanwa	3106 0 2)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (chinese-cns11643-5 . #x3E21)	; ø»š•’
+    (=cns11643-5	. #x3E21)	; ø»š•’
     ))
 (define-char
   '((=>ucs		. #x20B07)	; 𠬇
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 03107)	; ø¸€°£
+    (=daikanwa		. 03107)	; ø¸€°£
     ))
 (define-char
   '((morohashi-daikanwa	3107 0 0)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (chinese-cns11643-6 . #x5125)	; ø»œ»”
-    (ucs		. #x20B07)	; 𠬇
+    (hanyu-dazidian	1 477 6)
+    (=cns11643-6	. #x5125)	; ø»œ»”
+    (=hanziku-2		. #xB252)	; ý¢€«‰’
+    (=ucs		. #x20B07)	; 𠬇
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (chinese-cns11643-5 . #x3D7E)	; ø»š•‘
-    (ideograph-daikanwa . 03108)	; ø¸€°¤
-    (ucs		. #x20B08)	; 𠬈
+    (hanyu-dazidian	1 389 6)
+    (=cns11643-5	. #x3D7E)	; ø»š•‘
+    (=daikanwa		. 03108)	; ø¸€°¤
+    (=hanziku-1		. #xF5F2)	; ý¢€Ÿ—²
+    (=ucs		. #x20B08)	; 𠬈
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (ideograph-daikanwa . 03109)	; ø¸€°¥
+    (=daikanwa		. 03109)	; ø¸€°¥
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 11)
-    (ucs		. #x517F)	; 兿
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x4491)	; 䒑
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL HAND")
+	(=ucs		    . #x2E98)	; ⺘
+	)
+       ((=ucs		    . #x4E38)	; 丸
+	))
+      )
+     ((=ucs		  . #x4E91)	; 云
+      ))
+    (=ucs		. #x517F)	; 兿
     ))
 (define-char
   '((=>ucs		. #x20B0E)	; 𠬎
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 03110)	; ø¸€°¦
+    (=daikanwa		. 03110)	; ø¸€°¦
     ))
 (define-char
   '((morohashi-daikanwa	3110 0 0)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-cns11643-6 . #x5B3C)	; ø»Š—
-    (ucs		. #x20B0E)	; 𠬎
+    (hanyu-dazidian	1 389 11)
+    (=cns11643-6	. #x5B3C)	; ø»Š—
+    (=hanziku-1		. #xF5F7)	; ý¢€Ÿ—·
+    (=ucs		. #x20B0E)	; 𠬎
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 03111)	; ø¸€°§
+    (=daikanwa		. 03111)	; ø¸€°§
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (chinese-isoir165	. #x7A45)	; ø»Ž±¦
-    (ucs		. #x53C6)	; 叆
+    (hanyu-dazidian	1 389 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4E91)	; 云
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=big5-cdp	    . #x8BB8)	; ý¢€ˆ®¸
+	)
+       ((=ucs		    . #x53CB)	; 友
+	))
+      ))
+    (=iso-ir165		. #x7A45)	; ø»Ž±¦
+    (=hanziku-1		. #xF5F5)	; ý¢€Ÿ—µ
+    (=ucs		. #x53C6)	; 叆
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (=ucs		. #x20B0D)	; 𠬍
+    ))
+(define-char
+  '((=>ucs		. #x20B0D)	; 𠬍
+    (ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 389 10)
+    (=hanziku-1		. #xF5F6)	; ý¢€Ÿ—¶
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (chinese-cns11643-7 . #x2145)	; ø»¿˜
-    (ideograph-daikanwa . 03112)	; ø¸€°¨
-    (ucs		. #x20B11)	; 𠬑
+    (hanyu-dazidian	1 389 15)
+    (=cns11643-7	. #x2145)	; ø»¿˜
+    (=daikanwa		. 03112)	; ø¸€°¨
+    (=hanziku-1		. #xF5FB)	; ý¢€Ÿ—»
+    (=ucs		. #x20B11)	; 𠬑
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (chinese-cns11643-4 . #x4929)	; ø»˜› 
-    (ideograph-daikanwa . 03113)	; ø¸€°©
-    (ucs		. #x3559)	; 㕙
+    (=cns11643-4	. #x4929)	; ø»˜› 
+    (=daikanwa		. 03113)	; ø¸€°©
+    (=ucs		. #x3559)	; 㕙
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (chinese-cns11643-4 . #x492A)	; ø»˜›¡
-    (ideograph-daikanwa . 48958)	; ø¸‹¼¾
-    (ucs		. #x366F)	; 㙯
+    (=cns11643-4	. #x492A)	; ø»˜›¡
+    (=daikanwa		. 48958)	; ø¸‹¼¾
+    (=ucs		. #x366F)	; 㙯
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (chinese-isoir165	. #x7A46)	; ø»Ž±§
-    (ucs		. #x53C7)	; 叇
+    (hanyu-dazidian	1 389 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4E91)	; 云
+      )
+     ((=ucs		  . #x902E)	; 逮
+      ))
+    (=iso-ir165		. #x7A46)	; ø»Ž±§
+    (=hanziku-1		. #xF5FA)	; ý¢€Ÿ—º
+    (=ucs		. #x53C7)	; 叇
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
-    (chinese-cns11643-5 . #x5366)	; ø»šµ
-    (ideograph-daikanwa . 03114)	; ø¸€°ª
-    (ucs		. #x20B13)	; 𠬓
+    (hanyu-dazidian	1 389 18)
+    (=cns11643-5	. #x5366)	; ø»šµ
+    (=daikanwa		. 03114)	; ø¸€°ª
+    (=hanziku-1		. #xF5FE)	; ý¢€Ÿ—¾
+    (=ucs		. #x20B13)	; 𠬓
     ))
 (define-char
   '((=>ucs		. #x23728)	; 𣜨
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (ideograph-daikanwa . 48959)	; ø¸‹¼¿
+    (hanyu-dazidian	2 1306 3)
+    (=daikanwa		. 48959)	; ø¸‹¼¿
+    (=hanziku-4		. #xB4DD)	; ý¢‹“
     ))
 (define-char
   '((morohashi-daikanwa	48959 0 2)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (ucs		. #x23728)	; 𣜨
+    (=ucs		. #x23728)	; 𣜨
     ))
 (define-char
   '((=>ucs		. #x23728)	; 𣜨
@@ -795,5 +1131,115 @@
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (chinese-cns11643-7 . #x3727)	; ø»žŸŽ
+    (=cns11643-7	. #x3727)	; ø»žŸŽ
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 17)
+    (total-strokes	 . 19)
+    (=ucs		. #x20B19)	; 𠬙
+    ))
+(define-char
+  '((=>ucs		. #x20B19)	; 𠬙
+    (ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 17)
+    (total-strokes	 . 19)
+    (hanyu-dazidian	1 389 21)
+    (=hanziku-1		. #xF642)	; ý¢€Ÿ™‚
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 384 1)
+    (=hanziku-1		. #xF4EA)	; ý¢€Ÿ“ª
+    (=ucs		. #x20AD6)	; 𠫖
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 384 3)
+    (=hanziku-1		. #xF4EC)	; ý¢€Ÿ“¬
+    (=ucs		. #x20AD8)	; 𠫘
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 385 2)
+    (=hanziku-1		. #xF54C)	; ý¢€Ÿ•Œ
+    (=ucs		. #x20ADB)	; 𠫛
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 385 4)
+    (=hanziku-1		. #xF54E)	; ý¢€Ÿ•Ž
+    (=ucs		. #x20ADC)	; 𠫜
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	8 11 10)
+    (=hanziku-12	. #xEBCE)	; ý¢ƒŽ¯Ž
+    (=ucs		. #x20ADD)	; 𠫝
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 386 14)
+    (=hanziku-1		. #xF578)	; ý¢€Ÿ•¸
+    (=ucs		. #x20AED)	; ð «­
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 386 17)
+    (=hanziku-1		. #xF57B)	; ý¢€Ÿ•»
+    (=ucs		. #x20AEE)	; ð «®
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 387 2)
+    (=hanziku-1		. #xF5AE)	; ý¢€Ÿ–®
+    (=ucs		. #x20AEF)	; 𠫯
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 387 11)
+    (=hanziku-1		. #xF5B7)	; ý¢€Ÿ–·
+    (=ucs		. #x20AF1)	; ð «±
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 387 5)
+    (=hanziku-1		. #xF5B1)	; ý¢€Ÿ–±
+    (=ucs		. #x20AF5)	; ð «µ
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 387 6)
+    (=hanziku-1		. #xF5B2)	; ý¢€Ÿ–²
+    (=ucs		. #x20AF6)	; 𠫶
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 387 7)
+    (=hanziku-1		. #xF5B3)	; ý¢€Ÿ–³
+    (=ucs		. #x20AF7)	; ð «·
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 387 19)
+    (=hanziku-1		. #xF5BF)	; ý¢€Ÿ–¿
+    (=ucs		. #x20AFD)	; ð «½
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 389 8)
+    (=hanziku-1		. #xF5F4)	; ý¢€Ÿ—´
+    (=ucs		. #x20B0B)	; 𠬋
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 389 13)
+    (=hanziku-1		. #xF5F9)	; ý¢€Ÿ—¹
+    (=ucs		. #x20B10)	; 𠬐
+    ))
+(define-char
+  '((ideographic-radical . 28)	; ⼛
+    (hanyu-dazidian	1 389 20)
+    (=hanziku-1		. #xF641)	; ý¢€Ÿ™
+    (=ucs		. #x20B18)	; 𠬘
     ))