X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R003-Dot.el;h=952fee5be034ef96aa691df1b409a863db0d6a0e;hb=4f09994878627d7d0dae45c3ab83458b469b87e5;hp=6c8b85c8176273cf54e45768b55534cb74080ba7;hpb=8932e3d444a4d58723dc5fafedcc73e8456e33ff;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el
index 6c8b85c..952fee5 100644
--- a/lisp/utf-2000/Ideograph-R003-Dot.el
+++ b/lisp/utf-2000/Ideograph-R003-Dot.el
@@ -2,21 +2,17 @@
   '((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)
+    (chinese-gb2312	. #x583C)	; ø»…—‘
+    (=jis-x0208		. #x5026)	; ø½Š»ƒ
+    (chinese-isoir165	. #x583C)	; ø»¿¡
+    (chinese-cns11643-3 . #x2122)	; ø»•–¥
+    (ideograph-gt-pj-1	. #x5026)	; ý¡€€‚€
+    (ideograph-daikanwa . 00091)	; ø¸€›
+    (chinese-big5-cdp	. #x8B41)	; ý¢€ˆ­
+    (ideograph-gt	. 00128)	; ý¡€€‚€
+    (mojikyo		. 000091)	; ý €€›
+    (ucs		. #x4E36)	; 丶
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
@@ -37,6 +33,7 @@
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
+    (ideograph-cdp	. -91)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
@@ -54,9 +51,7 @@
   '((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)	; ⿱
@@ -85,30 +80,26 @@
     (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)	; 丸
+    (chinese-gb2312	. #x4D68)	; ø»…‡³
+    (=jis-x0208		. #x345D)	; ø½Š’²
+    (korean-ksc5601	. #x7C2F)	; ø»Š „
+    (chinese-isoir165	. #x4D68)	; ø»°ƒ
+    (chinese-cns11643-6 . #x2131)	; ø»›µ€
+    (ideograph-gt-pj-1	. #x345D)	; ý¡€€‚ƒ
+    (ideograph-daikanwa . 00094)	; ø¸€ž
+    (ideograph-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)	; øºŸ¢°
+    (chinese-big5	. #xA459)	; ý¢€Š‘™
     (ideograph-daikanwa . 00095)	; ø¸€Ÿ
     (ideograph-gt	. 00132)	; ý¡€€‚„
     (mojikyo		. 000095)	; ý €€Ÿ
@@ -117,15 +108,13 @@
   '((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)
 		 (ideograph-daikanwa . 00094)	; ø¸€ž
 		 )
       ))
+    (hanyu-dazidian	1 276 4)
     (shinjigen-1	. 40)
     (chinese-cns11643-6 . #x2132)	; ø»›µ
     (ideograph-gt-pj-2	. #x306B)	; ý¡€€‚…
@@ -163,14 +152,12 @@
     (ideograph-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)	; ⿵
@@ -179,35 +166,34 @@
       )
      ((ucs		  . #x4E36)	; 丶
       ))
+    (shinjigen-1	. 566)
+    (shinjigen-2	. 566)
+    (chinese-gb2312	. #x3732)	; ø»„¦©
+    (=jis-x0208		. #x4B5E)	; ø½Š´¥
+    (korean-ksc5601	. #x5B6D)	; ø»‰°¤
+    (chinese-isoir165	. #x3732)	; ø»Ž¹
     (chinese-cns11643-1 . #x443B)	; ø»‘¶
+    (chinese-big5	. #xA45A)	; ý¢€Š‘š
+    (ideograph-daikanwa . 01739)	; ø¸€›‹
+    (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)	; ø¸€¬˜
-      ))
+    (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)	; 𢖩
-    ))
-(define-char
-  '((ideographic-radical . 3)	; ⼂
-    (ideographic-strokes . 2)
-    (total-strokes	 . 3)
     (ideograph-gt-pj-9	. #x4C4C)	; ý¡€€‚†
     (ideograph-gt	. 00134)	; ý¡€€‚†
     ))
@@ -215,24 +201,20 @@
   '((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)	; 丹
+    (chinese-gb2312	. #x3524)	; ø»„£Ÿ
+    (=jis-x0208		. #x4330)	; ø½Š¨‡
+    (korean-ksc5601	. #x5321)	; ø»‰£¨
+    (chinese-isoir165	. #x3524)	; ø»‹¯
+    (chinese-cns11643-1 . #x4465)	; ø»‘¶º
+    (ideograph-gt-pj-1	. #x4330)	; ý¡€€‚ˆ
+    (chinese-big5	. #xA4A6)	; ý¢€Š’¦
+    (ideograph-daikanwa . 00099)	; ø¸€£
+    (ideograph-gt	. 00136)	; ý¡€€‚ˆ
+    (mojikyo		. 000099)	; ý €€£
+    (ucs		. #x4E39)	; 丹
     ))
 (define-char
   '((morohashi-daikanwa	99 0 0)
@@ -246,9 +228,7 @@
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 44)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 44 2)
     (chinese-gb2312	. #x4E2A)	; ø»…ˆ“
     (chinese-isoir165	. #x4E2A)	; ø»°£
     (chinese-big5-cdp	. #x89D0)	; ý¢€ˆ§
@@ -259,15 +239,13 @@
     (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)	; 𠁾
       )
      ((chinese-cns11643-5 . #x212D)	; ø»™ª¸
       (ideograph-daikanwa . 02840)	; ø¸€¬˜
       ))
+    (hanyu-dazidian	1 52 1)
     (chinese-big5-cdp	. #x87D2)	; ý¢€ˆŸ’
     ))
 (define-char
@@ -296,9 +274,7 @@
     (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)	; ⿱
@@ -309,25 +285,21 @@
       ))
     (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)	; 主
+    (chinese-gb2312	. #x5677)	; ø»…•
+    (=jis-x0208		. #x3C67)	; ø½Šž¬
+    (korean-ksc5601	. #x712B)	; ø»Š¶
+    (chinese-isoir165	. #x5677)	; ø»½ 
+    (chinese-cns11643-1 . #x4564)	; ø»‘¸—
+    (ideograph-gt-pj-1	. #x3C67)	; ý¡€€‚Š
+    (chinese-big5	. #xA544)	; ý¢€Š•„
+    (ideograph-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)	; â¿´
@@ -338,24 +310,20 @@
       ))
     (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)	; ø»“ƒ
+    (ideograph-gt-pj-1	. #x5027)	; ý¡€€‚‹
+    (chinese-big5	. #xC964)	; ý¢€Œ¥¤
+    (ideograph-daikanwa . 00101)	; ø¸€¥
+    (ideograph-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)	; â¿´
@@ -376,9 +344,7 @@
   '((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)	; â¿´
@@ -401,9 +367,7 @@
   '((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)	; ý¡€€‚
     (ideograph-daikanwa . 00103)	; ø¸€§
@@ -421,8 +385,12 @@
     ))
 (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)	; ⼀
@@ -470,6 +438,7 @@
 	  ))
 	))
       ))
+    (chinese-cns11643-3 . #x2740)	; ø»•Ÿ·
     (ideograph-gt-pj-2	. #x3071)	; ý¡€€‚‘
     (ideograph-daikanwa . 00104)	; ø¸€¨
     (ideograph-gt	. 00145)	; ý¡€€‚‘
@@ -480,9 +449,7 @@
     (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)	; ⿱
@@ -521,9 +488,7 @@
   '((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)	; ⿵
@@ -546,9 +511,7 @@
   '((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)	; ⿵
@@ -582,9 +545,7 @@
   '((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)	; ý¡€€‚“
     (ideograph-daikanwa		. 00105)	; ø¸€©