X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Futf-2000%2FIdeograph-R007-Two.el;h=de07cf92278774c7bfa080618fb13f9eca44870d;hb=9073a7a12a4f9dc3bf6e81078278118873f5628f;hp=6458aa93ce1e409ccaa57cd0631b1b1cfe2cc788;hpb=ddd418e9177ddc9cc299e79079f5d70acbaa8c89;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R007-Two.el b/lisp/utf-2000/Ideograph-R007-Two.el
index 6458aa9..de07cf9 100644
--- a/lisp/utf-2000/Ideograph-R007-Two.el
+++ b/lisp/utf-2000/Ideograph-R007-Two.el
@@ -14,7 +14,7 @@
     (chinese-isoir165		. #x367E)	; ø»Ž§
     (chinese-cns11643-1		. #x4428)	; ø»‘µ½
     (japanese-jisx0208-1990	. #x4673)	; ø½Š­¤
-    (chinese-big5		. #xA447)	; øºŸ¢ž
+    (chinese-big5		. #xA447)	; ý¢€Š‘‡
     (ideograph-daikanwa		. 00247)	; ø¸€ƒ·
     (mojikyo			. 000247)	; ý €€ƒ·
     (ucs			. #x4E8C)	; 二
@@ -23,9 +23,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 2)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 2 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -82,7 +80,7 @@
     (chinese-isoir165		. #x5821)	; ø»¿†
     (chinese-cns11643-2		. #x2129)	; ø»“Œ¨
     (japanese-jisx0213-1	. #x2E27)	; ø»¢¦ˆ
-    (chinese-big5		. #xC948)	; øº¡¥Œ
+    (chinese-big5		. #xC948)	; ý¢€Œ¥ˆ
     (ideograph-daikanwa		. 00251)	; ø¸€ƒ»
     (china3-jef			. #x41CF)	; øº„‡
     (mojikyo			. 000251)	; ý €€ƒ»
@@ -104,7 +102,7 @@
     (chinese-isoir165		. #x535A)	; ø»¸©
     (chinese-cns11643-1		. #x4440)	; ø»‘¶•
     (japanese-jisx0208-1990	. #x5032)	; ø½Š»
-    (chinese-big5		. #xA45F)	; øºŸ¢¶
+    (chinese-big5		. #xA45F)	; ý¢€Š‘Ÿ
     (ideograph-daikanwa		. 00252)	; ø¸€ƒ¼
     (mojikyo			. 000252)	; ý €€ƒ¼
     (ucs			. #x4E8E)	; 于
@@ -113,15 +111,13 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 5)
-    (hanyu-dazidian-char . 1)
     (<-original-ideograph
      (:sources	(seiji-tsuu morohashi-daikanwa shinjigen-1)
       :char	((shinjigen-1	     . 75)
 		 (ideograph-daikanwa . 00252)	; ø¸€ƒ¼
 		 )
       ))
+    (hanyu-dazidian	1 5 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -143,15 +139,13 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 5)
-    (hanyu-dazidian-char . 2)
     (->ideographic-variants
      (:sources	(shinjigen-1)
       :char	((shinjigen-1	     . 75)
 		 (ideograph-daikanwa . 00252)	; ø¸€ƒ¼
 		 )
       ))
+    (hanyu-dazidian	1 5 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -189,7 +183,7 @@
     (chinese-isoir165		. #x5446)	; ø»¹³
     (chinese-cns11643-1		. #x4469)	; ø»‘¶¾
     (japanese-jisx0208-1990	. #x313E)	; ø½Š¹
-    (chinese-big5		. #xA4AA)	; øºŸ£Ÿ
+    (chinese-big5		. #xA4AA)	; ý¢€Š’ª
     (ideograph-daikanwa		. 00254)	; ø¸€ƒ¾
     (mojikyo			. 000254)	; ý €€ƒ¾
     (ucs			. #x4E91)	; 云
@@ -202,10 +196,8 @@
     (hanyu-dazidian-page . 14)
     (hanyu-dazidian-char . 1)
     (ideographic-structure
-     (:cdp-combinator	2
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-		 (ucs		     . #x2FF1)	; ⿱
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
       )
      ((ucs		  . #x4E00)	; 一
       )
@@ -220,7 +212,7 @@
     (chinese-isoir165		. #x3B25)	; ø»”¤
     (chinese-cns11643-1		. #x446B)	; ø»‘·€
     (japanese-jisx0208-1990	. #x385F)	; ø½Š˜¬
-    (chinese-big5		. #xA4AC)	; øºŸ£¡
+    (chinese-big5		. #xA4AC)	; ý¢€Š’¬
     (ideograph-daikanwa		. 00255)	; ø¸€ƒ¿
     (mojikyo			. 000255)	; ý €€ƒ¿
     (ucs			. #x4E92)	; 互
@@ -243,7 +235,7 @@
     (chinese-gb2312	. #x5841)	; ø»…—–
     (chinese-isoir165	. #x5841)	; ø»¿¦
     (chinese-cns11643-2 . #x2131)	; ø»“Œ°
-    (chinese-big5	. #xC951)	; øº¡¥•
+    (chinese-big5	. #xC951)	; ý¢€Œ¥‘
     (ideograph-daikanwa . 00256)	; ø¸€„€
     (mojikyo		. 000256)	; ý €€„€
     (ucs		. #x4E93)	; 亓
@@ -264,7 +256,7 @@
     (chinese-isoir165		. #x4E65)	; ø»±ž
     (chinese-cns11643-1		. #x446C)	; ø»‘·
     (japanese-jisx0208-1990	. #x385E)	; ø½Š˜«
-    (chinese-big5		. #xA4AD)	; øºŸ£¢
+    (chinese-big5		. #xA4AD)	; ý¢€Š’­
     (ideograph-daikanwa		. 00257)	; ø¸€„
     (mojikyo			. 000257)	; ý €€„
     (ucs			. #x4E94)	; 五
@@ -285,7 +277,7 @@
     (chinese-isoir165		. #x3E2E)	; ø»™‡
     (chinese-cns11643-1		. #x446A)	; ø»‘¶¿
     (japanese-jisx0208-1990	. #x3066)	; ø½Šƒ
-    (chinese-big5		. #xA4AB)	; øºŸ£ 
+    (chinese-big5		. #xA4AB)	; ý¢€Š’«
     (ideograph-daikanwa		. 00258)	; ø¸€„‚
     (mojikyo			. 000258)	; ý €€„‚
     (ucs			. #x4E95)	; 井
@@ -294,9 +286,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 10)
-    (hanyu-dazidian-char . 2)
+    (hanyu-dazidian	1 10 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -317,9 +307,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 12)
-    (hanyu-dazidian-char . 4)
+    (hanyu-dazidian	1 12 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
@@ -340,9 +328,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 760)
-    (hanyu-dazidian-char . 5)
+    (hanyu-dazidian	1 760 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -363,9 +349,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 17)
-    (hanyu-dazidian-char . 16)
+    (hanyu-dazidian	1 17 16)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -409,9 +393,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 19)
-    (hanyu-dazidian-char . 4)
+    (hanyu-dazidian	1 19 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (ucs		  . #x2FF4)	; â¿´
@@ -447,7 +429,7 @@
     (japanese-jisx0208		. #x4F4A)	; ø»‡”•
     (chinese-cns11643-1		. #x4727)	; ø»‘º–
     (japanese-jisx0208-1990	. #x4F4A)	; ø½Šº‰
-    (chinese-big5		. #xA5E5)	; øºŸ¦·
+    (chinese-big5		. #xA5E5)	; ý¢€Š—¥
     (ideograph-daikanwa		. 00265)	; ø¸€„‰
     (mojikyo			. 000265)	; ý €€„‰
     (ucs			. #x4E99)	; 亙
@@ -456,9 +438,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 19)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 19 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -480,9 +460,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 17)
-    (hanyu-dazidian-char . 14)
+    (hanyu-dazidian	1 17 14)
     (chinese-gb2312	. #x5147)	; ø»…Š
     (chinese-isoir165	. #x5147)	; ø»µš
     (chinese-big5-cdp	. #x89B7)	; ý¢€ˆ¦·
@@ -541,15 +519,13 @@
      ((ucs		  . #x4E8C)	; 二
       ))
     (chinese-cns11643-1 . #x4B68)	; ø»’
-    (chinese-big5	. #xA8C7)	; øºŸ­°
+    (chinese-big5	. #xA8C7)	; ý¢€Š£‡
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 21)
-    (hanyu-dazidian-char . 8)
+    (hanyu-dazidian	1 21 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
@@ -570,9 +546,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 19)
-    (hanyu-dazidian-char . 13)
+    (hanyu-dazidian	1 19 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (ucs		  . #x2FF4)	; â¿´
@@ -592,9 +566,7 @@
     (ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 21)
-    (hanyu-dazidian-char . 4)
+    (hanyu-dazidian	1 21 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
@@ -621,9 +593,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 21)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 21 1)
     (shinjigen-1	. 84)
     (shinjigen-2	. 84)
     (japanese-jisx0208-1978	. #x3021)	; ø»‚’‚
@@ -639,28 +609,12 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 386)
-    (hanyu-dazidian-char . 19)
+    (hanyu-dazidian	1 386 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(ucs		    . #x2FF1)	; ⿱
-	)
-       ((ucs		    . #x53B6)	; 厶
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	  (ucs		      . #x2FF0)	; â¿°
-	  )
-	 ((ucs		      . #x53B6)	; 厶
-	  )
-	 ((ucs		      . #x53B6)	; 厶
-	  ))
-	))
+     ((ucs		  . #x53BD)	; 厽
       )
      ((ucs		  . #x4E8C)	; 二
       ))
@@ -688,7 +642,7 @@
     (chinese-cns11643-1		. #x4B69)	; ø»’
     (japanese-jisx0208-1990	. #x5033)	; ø½Š»
     (chinese-gb12345		. #x5147)	; 亞
-    (chinese-big5		. #xA8C8)	; øºŸ­±
+    (chinese-big5		. #xA8C8)	; ý¢€Š£ˆ
     (ideograph-daikanwa		. 00274)	; ø¸€„’
     (mojikyo			. 000274)	; ý €€„’
     (ucs			. #x4E9E)	; 亞
@@ -697,9 +651,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 25)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 25 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
@@ -771,7 +723,7 @@
     (japanese-jisx0208		. #x5034)	; ø»‡•
     (chinese-cns11643-1		. #x4F67)	; ø»’‡†
     (japanese-jisx0208-1990	. #x5034)	; ø½Š»‘
-    (chinese-big5		. #xAB45)	; øºŸ³§
+    (chinese-big5		. #xAB45)	; ý¢€Š­…
     (ideograph-daikanwa		. 00279)	; ø¸€„—
     (mojikyo			. 000279)	; ý €€„—
     ))
@@ -791,9 +743,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 25)
-    (hanyu-dazidian-char . 4)
+    (hanyu-dazidian	1 25 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -819,21 +769,29 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian-vol	 . 4)
-    (hanyu-dazidian-page . 2802)
-    (hanyu-dazidian-char . 2)
-    (chinese-cns11643-5 . #x277B)	; ø»™´º
-    (ideograph-daikanwa . 00281)	; ø¸€„™
-    (mojikyo		. 000281)	; ý €€„™
-    (ucs		. #x20131)	; 𠄱
+    (hanyu-dazidian	4 2802 2)
+    (chinese-cns11643-5		. #x277B)	; ø»™´º
+    (ideograph-daikanwa		. 00281)	; ø¸€„™
+    (ideograph-hanziku-7	. #xEEEB)	; ý¢¾»«
+    (mojikyo			. 000281)	; ý €€„™
+    (ucs			. #x20131)	; 𠄱
+    ))
+(define-char
+  '((ideographic-	(:radical	57 ; ⼸
+			 :strokes	6)
+			(:radical	7 ; ⼆
+			 :strokes	7))
+    (total-strokes	 . 9)
+    (chinese-cns11643-6		. #x307C)	; ø»œŒ
+    (ideograph-daikanwa		. 09782)	; ø¸‚˜¶
+    (ideograph-hanziku-1	. #xF5B0)	; ý¢€Ÿ–°
+    (ucs			. #x20134)	; 𠄴
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 26)
-    (hanyu-dazidian-char . 3)
+    (hanyu-dazidian	1 26 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (ucs		  . #x2FF3)	; ⿳
@@ -851,24 +809,22 @@
     (ucs			. #x20135)	; 𠄵
     ))
 (define-char
-  '((ideographic-radical . 7)	; ⼆
+  '((=>ucs		. #x20AFC)	; ð «¼
+    (ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 387)
-    (hanyu-dazidian-char . 18)
+    (->identical
+     ((ucs		  . #x20AFC)	; ð «¼
+      ))
     (chinese-cns11643-6 . #x352E)	; ø»œ’•
     (ideograph-daikanwa . 00283)	; ø¸€„›
     (mojikyo		. 000283)	; ý €€„›
-    (ucs		. #x20AFC)	; ð «¼
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 26)
-    (hanyu-dazidian-char . 9)
+    (hanyu-dazidian	1 26 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (ucs		  . #x2FF4)	; â¿´
@@ -894,9 +850,7 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 26)
-    (hanyu-dazidian-char . 17)
+    (hanyu-dazidian	1 26 17)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱