X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R003-Dot.el;h=10a75fbaf0d6645b1ee17ab1fe63db6e6a920289;hb=52fb56ff79ba7ea2e9eb336e8e4f078556972a96;hp=7efc4dead8b7eea0e59ab3f9dda1fa908a6f161d;hpb=fa562706736ecaba5fcfd24a75f488b4cc6634fb;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el
index 7efc4de..10a75fb 100644
--- a/lisp/utf-2000/Ideograph-R003-Dot.el
+++ b/lisp/utf-2000/Ideograph-R003-Dot.el
@@ -2,29 +2,26 @@
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 0)
     (total-strokes	 . 1)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 42)
-    (hanyu-dazidian-char . 8)
-    (japanese-jisx0208-1978	. #x5026)	; ø»ƒ‡
-    (chinese-gb2312		. #x583C)	; ø»…—‘
-    (japanese-jisx0208		. #x5026)	; ø»‡•
-    (chinese-isoir165		. #x583C)	; ø»¿¡
-    (chinese-cns11643-3		. #x2122)	; ø»•–¥
-    (japanese-jisx0208-1990	. #x5026)	; ø½Š»ƒ
-    (ideograph-gt-pj-1		. #x5026)	; ý¡€€‚€
-    (ideograph-daikanwa		. 00091)	; ø¸€›
-    (chinese-big5-cdp		. #x8B41)	; ý¢€ˆ­
-    (ideograph-gt		. 00128)	; ý¡€€‚€
-    (mojikyo			. 000091)	; ý €€›
-    (ucs			. #x4E36)	; 丶
+    (hanyu-dazidian	1 42 8)
+    (=gb2312		. #x583C)	; ø»…—‘
+    (=jis-x0208		. #x5026)	; ø½Š»ƒ
+    (=iso-ir165		. #x583C)	; ø»¿¡
+    (chinese-cns11643-3 . #x2122)	; ø»•–¥
+    (=gt-pj-1		. #x5026)	; ý¡€€‚€
+    (ideograph-daikanwa . 00091)	; ø¸€›
+    (=big5-cdp		. #x8B41)	; ý¢€ˆ­
+    (=gt-k		. 00010)	; ý¡„€€Š
+    (=gt		. 00128)	; ý¡€€‚€
+    (mojikyo		. 000091)	; ý €€›
+    (=ucs		. #x4E36)	; 丶
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
-    (ideograph-gt-pj-2	. #x3068)	; ý¡€€‚
+    (=gt-pj-2		. #x3068)	; ý¡€€‚
     (ideograph-daikanwa . 00092)	; ø¸€œ
-    (ideograph-gt	. 00129)	; ý¡€€‚
+    (=gt		. 00129)	; ý¡€€‚
     ))
 (define-char
   '((morohashi-daikanwa	92 0 5)
@@ -37,47 +34,46 @@
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
+    (ideograph-cdp	. -91)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (ucs		  . #x2FF0)	; â¿°
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ucs		  . #x4E36)	; 丶
+     ((=ucs		  . #x4E36)	; 丶
       )
-     ((ucs		  . #x4E3F)	; 丿
+     ((=ucs		  . #x4E3F)	; 丿
       ))
-    (chinese-gb12345	. #x7D65)	; 丷
-    (chinese-big5-cdp	. #x8B55)	; ý¢€ˆ­•
+    (=gb12345		. #x7D65)	; 丷
+    (=big5-cdp		. #x8B55)	; ý¢€ˆ­•
     (mojikyo		. 059001)	; ý €Ž™¹
-    (ucs		. #x4E37)	; 丷
+    (=ucs		. #x4E37)	; 丷
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 42)
-    (hanyu-dazidian-char . 12)
+    (hanyu-dazidian	1 42 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x4E36)	; 丶
+     ((=ucs		  . #x4E36)	; 丶
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((ucs		    . #x4E36)	; 丶
+       ((=ucs		    . #x4E36)	; 丶
 	)
-       ((ucs		    . #x4E36)	; 丶
+       ((=ucs		    . #x4E36)	; 丶
 	))
       ))
-    (ideograph-gt-pj-2		. #x3069)	; ý¡€€‚‚
-    (ideograph-daikanwa		. 00093)	; ø¸€
-    (ideograph-hanziku-1	. #xACC5)	; ý¢€š³…
-    (ideograph-gt		. 00130)	; ý¡€€‚‚
-    (mojikyo			. 000093)	; ý €€
-    (ucs			. #x2007C)	; 𠁼
+    (=gt-pj-2		. #x3069)	; ý¡€€‚‚
+    (ideograph-daikanwa . 00093)	; ø¸€
+    (=hanziku-1		. #xACC5)	; ý¢€š³…
+    (=gt		. 00130)	; ý¡€€‚‚
+    (mojikyo		. 000093)	; ý €€
+    (=ucs		. #x2007C)	; 𠁼
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
@@ -85,55 +81,52 @@
     (total-strokes	 . 3)
     (shinjigen-1	. 39)
     (shinjigen-2	. 39)
-    (japanese-jisx0208-1978	. #x345D)	; ø»‚˜¶
-    (chinese-gb2312		. #x4D68)	; ø»…‡³
-    (japanese-jisx0208		. #x345D)	; ø»†¬¾
-    (korean-ksc5601		. #x7C2F)	; ø»Š „
-    (chinese-isoir165		. #x4D68)	; ø»°ƒ
-    (chinese-cns11643-6		. #x2131)	; ø»›µ€
-    (japanese-jisx0208-1990	. #x345D)	; ø½Š’²
-    (ideograph-gt-pj-1		. #x345D)	; ý¡€€‚ƒ
-    (ideograph-daikanwa		. 00094)	; ø¸€ž
-    (ideograph-gt		. 00131)	; ý¡€€‚ƒ
-    (mojikyo			. 000094)	; ý €€ž
-    (ucs			. #x4E38)	; 丸
+    (=gb2312		. #x4D68)	; ø»…‡³
+    (=jis-x0208		. #x345D)	; ø½Š’²
+    (=ks-x1001		. #x7C2F)	; ø»Š „
+    (=iso-ir165		. #x4D68)	; ø»°ƒ
+    (chinese-cns11643-6 . #x2131)	; ø»›µ€
+    (=gt-pj-1		. #x345D)	; ý¡€€‚ƒ
+    (ideograph-daikanwa . 00094)	; ø¸€ž
+    (=gt-k		. 00161)	; ý¡„€‚¡
+    (=gt		. 00131)	; ý¡€€‚ƒ
+    (mojikyo		. 000094)	; ý €€ž
+    (=ucs		. #x4E38)	; 丸
     ))
 (define-char
   '((=>ucs		. #x4E38)	; 丸
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 42)
-    (hanyu-dazidian-char . 11)
+    (hanyu-dazidian	1 42 11)
     (chinese-cns11643-1 . #x443A)	; ø»‘¶
-    (ideograph-gt-pj-2	. #x306A)	; ý¡€€‚„
-    (chinese-big5	. #xA459)	; øºŸ¢°
+    (=gt-pj-2		. #x306A)	; ý¡€€‚„
+    (=big5		. #xA459)	; ý¢€Š‘™
     (ideograph-daikanwa . 00095)	; ø¸€Ÿ
-    (ideograph-gt	. 00132)	; ý¡€€‚„
+    (=gt-k		. 00162)	; ý¡„€‚¢
+    (=ucs@cns		. #x4E38)	; ø»‘¶
+    (=ucs@big5		. #x4E38)	; ø»‘¶
+    (=gt		. 00132)	; ý¡€€‚„
     (mojikyo		. 000095)	; ý €€Ÿ
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 276)
-    (hanyu-dazidian-char . 4)
     (<-original-ideograph
-     (:sources	(chuuka-daijiten morohashi-daikanwa shinjigen-1)
-      :char	((shinjigen-1	     . 39)
+     (:char	((shinjigen-1	     . 39)
 		 (ideograph-daikanwa . 00094)	; ø¸€ž
 		 )
-      ))
+      :sources	(chuuka-daijiten morohashi-daikanwa shinjigen-1)))
+    (hanyu-dazidian	1 276 4)
     (shinjigen-1	. 40)
     (chinese-cns11643-6 . #x2132)	; ø»›µ
-    (ideograph-gt-pj-2	. #x306B)	; ý¡€€‚…
+    (=gt-pj-2		. #x306B)	; ý¡€€‚…
     (ideograph-daikanwa . 00096)	; ø¸€ 
-    (chinese-big5-cdp	. #x87B9)	; ý¢€ˆž¹
-    (ideograph-gt	. 00133)	; ý¡€€‚…
+    (=big5-cdp		. #x87B9)	; ý¢€ˆž¹
+    (=gt		. 00133)	; ý¡€€‚…
     (mojikyo		. 000096)	; ý €€ 
-    (ucs		. #x2007D)	; 𠁽
+    (=ucs		. #x2007D)	; 𠁽
     ))
 (define-char
   '((script		Ideograph)
@@ -141,10 +134,11 @@
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (ideograph-gt-pj-2	. #x306C)	; ý¡€€‚‡
+    (=gt-pj-2		. #x306C)	; ý¡€€‚‡
     (ideograph-daikanwa . 00097)	; ø¸€¡
-    (ideograph-cbeta	. 02728)	; ø¸ ª¨
-    (ideograph-gt	. 00135)	; ý¡€€‚‡
+    (=gt-k		. 00282)	; ý¡„€„š
+    (=cbeta		. 02728)	; ø¸ ª¨
+    (=gt		. 00135)	; ý¡€€‚‡
     (mojikyo		. 000097)	; ý €€¡
     ))
 (define-char
@@ -159,116 +153,108 @@
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (ideograph-gt-pj-2	. #x306D)	; ý¡€€‚Ž
-    (ideograph-gt	. 00142)	; ý¡€€‚Ž
+    (=gt-pj-2		. #x306D)	; ý¡€€‚Ž
+    (=gt		. 00142)	; ý¡€€‚Ž
     ))
 (define-char
-  '((=>ucs		. #x51E1)	; 凡
-    (ideographic-radical . 3)	; ⼂
-    (ideographic-strokes . 2)
+  '((ideographic-	(:radical	3 ; ⼂
+			 :strokes	2)
+			(:radical	16 ; ⼏
+			 :strokes	1))
     (total-strokes	 . 3)
-    (->identical
-     ((ideograph-daikanwa . 01739)	; ø¸€›‹
-      (ucs		  . #x51E1)	; 凡
-      ))
+    (hanyu-dazidian	1 276 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-      (ucs		  . #x2FF5)	; ⿵
+      (=ucs		  . #x2FF5)	; ⿵
       )
-     ((ucs		  . #x51E0)	; 几
+     ((=ucs		  . #x51E0)	; 几
       )
-     ((ucs		  . #x4E36)	; 丶
+     ((=ucs		  . #x4E36)	; 丶
       ))
+    (shinjigen-1	. 566)
+    (shinjigen-2	. 566)
+    (=gb2312		. #x3732)	; ø»„¦©
+    (=jis-x0208		. #x4B5E)	; ø½Š´¥
+    (=ks-x1001		. #x5B6D)	; ø»‰°¤
+    (=iso-ir165		. #x3732)	; ø»Ž¹
     (chinese-cns11643-1 . #x443B)	; ø»‘¶
+    (=gt-pj-1		. #x4B5E)	; 凡
+    (=big5		. #xA45A)	; ý¢€Š‘š
+    (ideograph-daikanwa . 01739)	; ø¸€›‹
+    (=gt-k		. 00203)	; ý¡„€ƒ‹
+    (=ucs		. #x51E1)	; 凡
     ))
 (define-char
-  '((ideographic-radical . 3)	; ⼂
-    (ideographic-strokes . 2)
+  '((ideographic-	(:radical	26 ; ⼙
+			 :strokes	1)
+			(:radical	3 ; ⼂
+			 :strokes	2))
     (total-strokes	 . 3)
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 52)
     (hanyu-dazidian-char . 1)
-    (->identical
-     ((chinese-cns11643-5 . #x212D)	; ø»™ª¸
-      (ideograph-daikanwa . 02840)	; ø¸€¬˜
-      ))
-    (ucs		. #x2007E)	; 𠁾
-    ))
-(define-char
-  '((ideographic-radical . 3)	; ⼂
-    (ideographic-strokes . 2)
-    (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 42)
-    (hanyu-dazidian-char . 13)
-    (chinese-big5-cdp	. #x87D6)	; ý¢€ˆŸ–
-    (ucs		. #x225A9)	; 𢖩
+    (chinese-cns11643-5 . #x212D)	; ø»™ª¸
+    (ideograph-daikanwa . 02840)	; ø¸€¬˜
+    (=ucs		. #x2007E)	; 𠁾
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (ideograph-gt-pj-9	. #x4C4C)	; ý¡€€‚†
-    (ideograph-gt	. 00134)	; ý¡€€‚†
+    (=gt-pj-9		. #x4C4C)	; ý¡€€‚†
+    (=gt		. 00134)	; ý¡€€‚†
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 44)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 44 1)
     (shinjigen-1	. 41)
     (shinjigen-2	. 41)
-    (japanese-jisx0208-1978	. #x4330)	; ø»‚®‹
-    (chinese-gb2312		. #x3524)	; ø»„£Ÿ
-    (japanese-jisx0208		. #x4330)	; ø»‡‚“
-    (korean-ksc5601		. #x5321)	; ø»‰£¨
-    (chinese-isoir165		. #x3524)	; ø»‹¯
-    (chinese-cns11643-1		. #x4465)	; ø»‘¶º
-    (japanese-jisx0208-1990	. #x4330)	; ø½Š¨‡
-    (ideograph-gt-pj-1		. #x4330)	; ý¡€€‚ˆ
-    (chinese-big5		. #xA4A6)	; øºŸ£›
-    (ideograph-daikanwa		. 00099)	; ø¸€£
-    (ideograph-gt		. 00136)	; ý¡€€‚ˆ
-    (mojikyo			. 000099)	; ý €€£
-    (ucs			. #x4E39)	; 丹
+    (=gb2312		. #x3524)	; ø»„£Ÿ
+    (=jis-x0208		. #x4330)	; ø½Š¨‡
+    (=ks-x1001		. #x5321)	; ø»‰£¨
+    (=iso-ir165		. #x3524)	; ø»‹¯
+    (chinese-cns11643-1 . #x4465)	; ø»‘¶º
+    (=gt-pj-1		. #x4330)	; ý¡€€‚ˆ
+    (=big5		. #xA4A6)	; ý¢€Š’¦
+    (ideograph-daikanwa . 00099)	; ø¸€£
+    (=gt-k		. 00460)	; ý¡„€‡Œ
+    (=gt		. 00136)	; ý¡€€‚ˆ
+    (mojikyo		. 000099)	; ý €€£
+    (=ucs		. #x4E39)	; 丹
     ))
 (define-char
   '((morohashi-daikanwa	99 0 0)
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (korean-ksc5601	. #x552E)	; ø»‰¦±
-    (ucs		. #xF95E)	; 丹
+    (=ks-x1001		. #x552E)	; ø»‰¦±
+    (=ucs		. #xF95E)	; 丹
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 44)
-    (hanyu-dazidian-char . 2)
-    (chinese-gb2312	. #x4E2A)	; ø»…ˆ“
-    (chinese-isoir165	. #x4E2A)	; ø»°£
-    (chinese-big5-cdp	. #x89D0)	; ý¢€ˆ§
-    (ucs		. #x4E3A)	; 为
+    (hanyu-dazidian	1 44 2)
+    (=gb2312		. #x4E2A)	; ø»…ˆ“
+    (=iso-ir165		. #x4E2A)	; ø»°£
+    (=big5-cdp		. #x89D0)	; ý¢€ˆ§
+    (=ucs		. #x4E3A)	; 为
     ))
 (define-char
   '((=>ucs		. #x2007E)	; 𠁾
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 52)
-    (hanyu-dazidian-char . 1)
     (->same-ideograph
-     ((ucs		  . #x2007E)	; 𠁾
+     ((=ucs		  . #x2007E)	; 𠁾
       )
      ((chinese-cns11643-5 . #x212D)	; ø»™ª¸
       (ideograph-daikanwa . 02840)	; ø¸€¬˜
       ))
-    (chinese-big5-cdp	. #x87D2)	; ý¢€ˆŸ’
+    (hanyu-dazidian	1 52 1)
+    (=big5-cdp		. #x87D2)	; ý¢€ˆŸ’
     ))
 (define-char
   '((=>ucs		. #x4E3B)	; 主
@@ -277,18 +263,19 @@
     (total-strokes	 . 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x4E28)	; 丨
+     ((=ucs		  . #x4E28)	; 丨
       )
-     ((ucs		  . #x738B)	; 王
+     ((=ucs		  . #x738B)	; 王
       ))
     (shinjigen-1	. 42)
     (shinjigen-2	. 42)
-    (ideograph-gt-pj-2	. #x306E)	; ý¡€€‚‰
+    (=gt-pj-2		. #x306E)	; ý¡€€‚‰
     (ideograph-daikanwa . 00100)	; ø¸€¤
-    (china3-jef		. #x41B3)	; øº„†³
-    (ideograph-gt	. 00137)	; ý¡€€‚‰
+    (=gt-k		. 00948)	; ý¡„€Ž´
+    (=jef-china3	. #x41B3)	; øº„†³
+    (=gt		. 00137)	; ý¡€€‚‰
     (mojikyo		. 000100)	; ý €€¤
     ))
 (define-char
@@ -296,183 +283,176 @@
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 44)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 44 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x4E36)	; 丶
+     ((=ucs		  . #x4E36)	; 丶
       )
-     ((ucs		  . #x738B)	; 王
+     ((=ucs		  . #x738B)	; 王
       ))
     (shinjigen-1	. 42)
     (shinjigen-2	. 42)
-    (japanese-jisx0208-1978	. #x3C67)	; ø»‚¤°
-    (chinese-gb2312		. #x5677)	; ø»…•
-    (japanese-jisx0208		. #x3C67)	; ø»†¸¸
-    (korean-ksc5601		. #x712B)	; ø»Š¶
-    (chinese-isoir165		. #x5677)	; ø»½ 
-    (chinese-cns11643-1		. #x4564)	; ø»‘¸—
-    (japanese-jisx0208-1990	. #x3C67)	; ø½Šž¬
-    (ideograph-gt-pj-1		. #x3C67)	; ý¡€€‚Š
-    (chinese-big5		. #xA544)	; øºŸ¤¸
-    (ideograph-gt		. 00138)	; ý¡€€‚Š
-    (ucs			. #x4E3B)	; 主
+    (=gb2312		. #x5677)	; ø»…•
+    (=jis-x0208		. #x3C67)	; ø½Šž¬
+    (=ks-x1001		. #x712B)	; ø»Š¶
+    (=iso-ir165		. #x5677)	; ø»½ 
+    (chinese-cns11643-1 . #x4564)	; ø»‘¸—
+    (=gt-pj-1		. #x3C67)	; ý¡€€‚Š
+    (=big5		. #xA544)	; ý¢€Š•„
+    (=gt-k		. 00949)	; ý¡„€Žµ
+    (=gt		. 00138)	; ý¡€€‚Š
+    (=ucs		. #x4E3B)	; 主
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 45)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 45 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+      (=ucs		  . #x2FF4)	; â¿´
       )
-     ((ucs		  . #x4E95)	; 井
+     ((=ucs		  . #x4E95)	; 井
       )
-     ((ucs		  . #x4E36)	; 丶
+     ((=ucs		  . #x4E36)	; 丶
       ))
     (shinjigen-1	. 44)
     (shinjigen-2	. 44)
-    (japanese-jisx0208-1978	. #x5027)	; ø»ƒˆ
-    (japanese-jisx0208		. #x5027)	; ø»‡•
-    (chinese-cns11643-2		. #x2144)	; ø»“ƒ
-    (japanese-jisx0208-1990	. #x5027)	; ø½Š»„
-    (ideograph-gt-pj-1		. #x5027)	; ý¡€€‚‹
-    (chinese-big5		. #xC964)	; øº¡¥¨
-    (ideograph-daikanwa		. 00101)	; ø¸€¥
-    (ideograph-gt		. 00139)	; ý¡€€‚‹
-    (mojikyo			. 000101)	; ý €€¥
-    (ucs			. #x4E3C)	; 丼
+    (=jis-x0208		. #x5027)	; ø½Š»„
+    (chinese-cns11643-2 . #x2144)	; ø»“ƒ
+    (=gt-pj-1		. #x5027)	; ý¡€€‚‹
+    (=big5		. #xC964)	; ý¢€Œ¥¤
+    (ideograph-daikanwa . 00101)	; ø¸€¥
+    (=gt-k		. 01026)	; ý¡„€‚
+    (=gt		. 00139)	; ý¡€€‚‹
+    (mojikyo		. 000101)	; ý €€¥
+    (=ucs		. #x4E3C)	; 丼
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 45)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 45 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+      (=ucs		  . #x2FF4)	; â¿´
       )
-     ((chinese-big5-cdp	  . #x88BD)	; ý¢€ˆ¢½
+     ((=big5-cdp	  . #x88BD)	; ý¢€ˆ¢½
       )
-     ((ucs		  . #x4E36)	; 丶
+     ((=ucs		  . #x4E36)	; 丶
       ))
-    (chinese-cns11643-6		. #x222D)	; ø»›¶š
-    (ideograph-gt-pj-2		. #x306F)	; ý¡€€‚Œ
-    (ideograph-daikanwa		. 00102)	; ø¸€¦
-    (ideograph-hanziku-1	. #xAD5C)	; ý¢€šµœ
-    (ideograph-gt		. 00140)	; ý¡€€‚Œ
-    (mojikyo			. 000102)	; ý €€¦
-    (ucs			. #x2007F)	; 𠁿
+    (chinese-cns11643-6 . #x222D)	; ø»›¶š
+    (=gt-pj-2		. #x306F)	; ý¡€€‚Œ
+    (ideograph-daikanwa . 00102)	; ø¸€¦
+    (=hanziku-1		. #xAD5C)	; ý¢€šµœ
+    (=gt		. 00140)	; ý¡€€‚Œ
+    (mojikyo		. 000102)	; ý €€¦
+    (=ucs		. #x2007F)	; 𠁿
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 45)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 45 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+      (=ucs		  . #x2FF4)	; â¿´
       )
-     ((chinese-big5-cdp	  . #x89C6)	; ý¢€ˆ§†
+     ((=big5-cdp	  . #x89C6)	; ý¢€ˆ§†
       )
-     ((ucs		  . #x4E36)	; 丶
+     ((=ucs		  . #x4E36)	; 丶
       ))
-    (ideograph-hanziku-1	. #xAD5D)	; ý¢€šµ
-    (ucs			. #x20081)	; 𠂁
+    (=hanziku-1		. #xAD5D)	; ý¢€šµ
+    (=ucs		. #x20081)	; 𠂁
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (ideograph-gt-pj-11 . #x4A5B)	; ý¡€€‚
-    (ideograph-gt	. 00141)	; ý¡€€‚
+    (=gt-pj-11		. #x4A5B)	; ý¡€€‚
+    (=gt		. 00141)	; ý¡€€‚
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 47)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 47 1)
     (chinese-cns11643-6 . #x2342)	; ø»›¸
-    (ideograph-gt-pj-2	. #x3070)	; ý¡€€‚
+    (=gt-pj-2		. #x3070)	; ý¡€€‚
     (ideograph-daikanwa . 00103)	; ø¸€§
-    (chinese-big5-cdp	. #x87D5)	; ý¢€ˆŸ•
-    (ideograph-gt	. 00143)	; ý¡€€‚
+    (=big5-cdp		. #x87D5)	; ý¢€ˆŸ•
+    (=gt		. 00143)	; ý¡€€‚
     (mojikyo		. 000103)	; ý €€§
-    (ucs		. #x20082)	; 𠂂
+    (=ucs		. #x20082)	; 𠂂
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (ideograph-gt-pj-9	. #x4A2F)	; ý¡€€‚
-    (ideograph-gt	. 00144)	; ý¡€€‚
+    (=gt-pj-9		. #x4A2F)	; ý¡€€‚
+    (=gt		. 00144)	; ý¡€€‚
     ))
 (define-char
   '((=>ucs		. #x4E3D)	; 丽
-    (ideographic-radical . 3)	; ⼂
-    (ideographic-strokes . 7)
+    (ideographic-	(:radical	1 ; ⼀
+			 :strokes	7
+			 :sources	(cns-11643))
+			(:radical	3 ; ⼂
+			 :strokes	7
+			 :sources	(morohashi-daikanwa gt)))
     (total-strokes	 . 8)
     (->same-ideograph
      ((ideographic-radical . 1)	; ⼀
       (ideograph-daikanwa . 00059)	; ø¸€€»
       ))
     (<-ancient-ideograph
-     (:sources	(morohashi-daikanwa)
-      :char	((ideographic-radical . 198)	; ⿅
+     (:char	((ideographic-radical . 198)	; ⿅
 		 (ideograph-daikanwa . 47663)	; ø¸‹¨¯
 		 )
-      ))
+      :sources	(morohashi-daikanwa)))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (ucs		  . #x2FF0)	; â¿°
+      (=ucs		  . #x2FF0)	; â¿°
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(ucs		    . #x2FF1)	; ⿱
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ucs		    . #x4E00)	; 一
+       ((=ucs		    . #x4E00)	; 一
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (ucs		      . #x2FF5)	; ⿵
+	  (=ucs		      . #x2FF5)	; ⿵
 	  )
-	 ((ucs		      . #x5182)	; 冂
+	 ((=ucs		      . #x5182)	; 冂
 	  )
-	 ((ucs		      . #x4E36)	; 丶
+	 ((=ucs		      . #x4E36)	; 丶
 	  ))
 	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(ucs		    . #x2FF1)	; ⿱
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ucs		    . #x4E00)	; 一
+       ((=ucs		    . #x4E00)	; 一
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (ucs		      . #x2FF5)	; ⿵
+	  (=ucs		      . #x2FF5)	; ⿵
 	  )
-	 ((ucs		      . #x5182)	; 冂
+	 ((=ucs		      . #x5182)	; 冂
 	  )
-	 ((ucs		      . #x4E36)	; 丶
+	 ((=ucs		      . #x4E36)	; 丶
 	  ))
 	))
       ))
-    (ideograph-gt-pj-2	. #x3071)	; ý¡€€‚‘
+    (chinese-cns11643-3 . #x2740)	; ø»•Ÿ·
+    (=gt-pj-2		. #x3071)	; ý¡€€‚‘
     (ideograph-daikanwa . 00104)	; ø¸€¨
-    (ideograph-gt	. 00145)	; ý¡€€‚‘
+    (=ucs@cns		. #x4E3D)	; ø»•Ÿ·
+    (=gt		. 00145)	; ý¡€€‚‘
     (mojikyo		. 000104)	; ý €€¨
     ))
 (define-char
@@ -480,115 +460,108 @@
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 21)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 21 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E00)	; 一
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(ucs		    . #x2FF0)	; â¿°
+	(=ucs		    . #x2FF0)	; â¿°
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (ucs		      . #x2FF5)	; ⿵
+	  (=ucs		      . #x2FF5)	; ⿵
 	  )
-	 ((ucs		      . #x5182)	; 冂
+	 ((=ucs		      . #x5182)	; 冂
 	  )
-	 ((ucs		      . #x4E36)	; 丶
+	 ((=ucs		      . #x4E36)	; 丶
 	  ))
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (ucs		      . #x2FF5)	; ⿵
+	  (=ucs		      . #x2FF5)	; ⿵
 	  )
-	 ((ucs		      . #x5182)	; 冂
+	 ((=ucs		      . #x5182)	; 冂
 	  )
-	 ((ucs		      . #x4E36)	; 丶
+	 ((=ucs		      . #x4E36)	; 丶
 	  ))
 	))
       ))
-    (chinese-gb2312		. #x4076)	; ø»„´»
-    (chinese-isoir165		. #x4076)	; ø»‹
-    (ideograph-hanziku-1	. #xA86E)	; ý¢€š¡®
-    (ucs			. #x4E3D)	; 丽
+    (=gb2312		. #x4076)	; ø»„´»
+    (=iso-ir165		. #x4076)	; ø»‹
+    (=hanziku-1		. #xA86E)	; ý¢€š¡®
+    (=ucs		. #x4E3D)	; 丽
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 47)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 47 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-      (ucs		  . #x2FF5)	; ⿵
+      (=ucs		  . #x2FF5)	; ⿵
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(ucs		    . #x2FF1)	; ⿱
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ucs		    . #x4E36)	; 丶
+       ((=ucs		    . #x4E36)	; 丶
 	)
-       ((chinese-big5-cdp   . #x8C58)	; ý¢€ˆ±˜
+       ((=big5-cdp	    . #x8C58)	; ý¢€ˆ±˜
 	))
       )
-     ((ucs		  . #x5EFE)	; 廾
+     ((=ucs		  . #x5EFE)	; 廾
       ))
-    (ideograph-hanziku-1	. #xADBE)	; ý¢€š¶¾
-    (ucs			. #x2592C)	; 𥤬
+    (=hanziku-1		. #xADBE)	; ý¢€š¶¾
+    (=ucs		. #x2592C)	; 𥤬
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 8)
     (total-strokes	 . 9)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 47)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 47 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-      (ucs		  . #x2FF5)	; ⿵
+      (=ucs		  . #x2FF5)	; ⿵
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	(ucs		    . #x2FF3)	; ⿳
+	(=ucs		    . #x2FF3)	; ⿳
 	)
-       ((chinese-big5-cdp   . #x89B2)	; ý¢€ˆ¦²
+       ((=big5-cdp	    . #x89B2)	; ý¢€ˆ¦²
 	)
-       ((ucs		    . #x4E00)	; 一
+       ((=ucs		    . #x4E00)	; 一
 	)
-       ((ucs		    . #x516B)	; 八
+       ((=ucs		    . #x516B)	; 八
 	))
       )
-     ((chinese-big5-cdp	  . #x8BF1)	; ý¢€ˆ¯±
+     ((=big5-cdp	  . #x8BF1)	; ý¢€ˆ¯±
       ))
-    (chinese-gb2312		. #x3E59)	; ø»„±¢
-    (chinese-isoir165		. #x3E59)	; ø»™²
-    (ideograph-hanziku-1	. #xADBF)	; ý¢€š¶¿
-    (ucs			. #x4E3E)	; 举
+    (=gb2312		. #x3E59)	; ø»„±¢
+    (=iso-ir165		. #x3E59)	; ø»™²
+    (=hanziku-1		. #xADBF)	; ý¢€š¶¿
+    (=ucs		. #x4E3E)	; 举
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 11)
     (total-strokes	 . 12)
-    (ideograph-gt-pj-9	. #x507C)	; ý¡€€‚’
-    (ideograph-gt	. 00146)	; ý¡€€‚’
+    (=gt-pj-9		. #x507C)	; ý¡€€‚’
+    (=gt		. 00146)	; ý¡€€‚’
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 12)
     (total-strokes	 . 13)
-    (hanyu-dazidian-vol	 . 2)
-    (hanyu-dazidian-page . 1526)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	2 1526 1)
     (chinese-cns11643-6 . #x5050)	; ø»œº¡
-    (ideograph-gt-pj-2	. #x3072)	; ý¡€€‚“
+    (=gt-pj-2		. #x3072)	; ý¡€€‚“
     (ideograph-daikanwa . 00105)	; ø¸€©
-    (ideograph-gt	. 00147)	; ý¡€€‚“
+    (=hanziku-4		. #xE461)	; ý¢Ž‘¡
+    (=gt		. 00147)	; ý¡€€‚“
     (mojikyo		. 000105)	; ý €€©
-    (ucs		. #x20084)	; 𠂄
+    (=ucs		. #x20084)	; 𠂄
     ))