X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R007-Two.el;h=398cc714ec4531197ca0e7108d9fcbcd69241ec1;hb=41d196062b3720347fb1aba066b23fd81b77ec23;hp=20309a5eb76106419fe88cd62af7b9f10dc8de91;hpb=97300a56736c316ea00b8045a0e1aac7c841f7af;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R007-Two.el b/lisp/utf-2000/Ideograph-R007-Two.el
index 20309a5..398cc71 100644
--- a/lisp/utf-2000/Ideograph-R007-Two.el
+++ b/lisp/utf-2000/Ideograph-R007-Two.el
@@ -26,10 +26,19 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 2)
     (hanyu-dazidian-char . 2)
-    (chinese-cns11643-6 . #x2127)	; ø»›´¶
-    (ideograph-daikanwa . 00248)	; ø¸€ƒ¸
-    (mojikyo		. 000248)	; ý €€ƒ¸
-    (ucs		. #x2011E)	; 𠄞
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
+      )
+     ((ucs		  . #x4E00)	; 一
+      )
+     ((ucs		  . #x4E00)	; 一
+      ))
+    (chinese-cns11643-6		. #x2127)	; ø»›´¶
+    (ideograph-daikanwa		. 00248)	; ø¸€ƒ¸
+    (ideograph-hanziku-1	. #xA4A3)	; ý¢€š’£
+    (mojikyo			. 000248)	; ý €€ƒ¸
+    (ucs			. #x2011E)	; 𠄞
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -296,12 +305,13 @@
       )
      ((ucs		  . #x4E8C)	; 二
       ))
-    (japanese-jisx0212	. #x303E)	; ø»Šº¯
-    (chinese-cns11643-4 . #x213B)	; ø»—¡‚
-    (ideograph-daikanwa . 00259)	; ø¸€„ƒ
-    (china3-jef		. #x41CE)	; øº„‡Ž
-    (mojikyo		. 000259)	; ý €€„ƒ
-    (ucs		. #x4E96)	; 亖
+    (japanese-jisx0212		. #x303E)	; ø»Šº¯
+    (chinese-cns11643-4		. #x213B)	; ø»—¡‚
+    (ideograph-daikanwa		. 00259)	; ø¸€„ƒ
+    (china3-jef			. #x41CE)	; øº„‡Ž
+    (ideograph-hanziku-1	. #xA647)	; ý¢€š™‡
+    (mojikyo			. 000259)	; ý €€„ƒ
+    (ucs			. #x4E96)	; 亖
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -310,10 +320,21 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 12)
     (hanyu-dazidian-char . 4)
-    (chinese-cns11643-6 . #x214A)	; ø»›µ™
-    (ideograph-daikanwa . 00260)	; ø¸€„„
-    (mojikyo		. 000260)	; ý €€„„
-    (ucs		. #x20121)	; 𠄡
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (ucs		  . #x2FF3)	; ⿳
+      )
+     ((ucs		  . #x4E00)	; 一
+      )
+     ((ucs		  . #x3405)	; 㐅
+      )
+     ((ucs		  . #x4E00)	; 一
+      ))
+    (chinese-cns11643-6		. #x214A)	; ø»›µ™
+    (ideograph-daikanwa		. 00260)	; ø¸€„„
+    (ideograph-hanziku-1	. #xA6AB)	; ý¢€šš«
+    (mojikyo			. 000260)	; ý €€„„
+    (ucs			. #x20121)	; 𠄡
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -371,9 +392,6 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 21)
-    (hanyu-dazidian-char . 4)
     (chinese-cns11643-6 . #x2565)	; ø»›»¬
     (ideograph-daikanwa . 00263)	; ø¸€„‡
     (ucs		. #x20122)	; 𠄢
@@ -393,10 +411,19 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 19)
     (hanyu-dazidian-char . 4)
-    (chinese-cns11643-6 . #x2348)	; ø»›¸“
-    (ideograph-daikanwa . 00264)	; ø¸€„ˆ
-    (mojikyo		. 000264)	; ý €€„ˆ
-    (ucs		. #x20123)	; 𠄣
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs		  . #x2FF4)	; â¿´
+      )
+     ((ucs		  . #x4E8C)	; 二
+      )
+     ((chinese-big5-cdp	  . #x87EC)	; ý¢€ˆŸ¬
+      ))
+    (chinese-cns11643-6		. #x2348)	; ø»›¸“
+    (ideograph-daikanwa		. 00264)	; ø¸€„ˆ
+    (ideograph-hanziku-1	. #xA7EE)	; ý¢€šŸ®
+    (mojikyo			. 000264)	; ý €€„ˆ
+    (ucs			. #x20123)	; 𠄣
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -431,10 +458,22 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 19)
     (hanyu-dazidian-char . 3)
-    (chinese-cns11643-6 . #x2349)	; ø»›¸”
-    (ideograph-daikanwa . 00266)	; ø¸€„Š
-    (mojikyo		. 000266)	; ý €€„Š
-    (ucs		. #x20124)	; 𠄤
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
+      )
+     ((japanese-jisx0208-1978	  . #x4656)	; ø»‚³‹
+      (japanese-jisx0208	  . #x4656)	; ø»‡‡“
+      (korean-ksc5601		  . #x546A)	; ø»‰¦
+      (ideograph-daikanwa	  . 07828)	; ø¸º”
+      )
+     ((ucs		  . #x4E8C)	; 二
+      ))
+    (chinese-cns11643-6		. #x2349)	; ø»›¸”
+    (ideograph-daikanwa		. 00266)	; ø¸€„Š
+    (ideograph-hanziku-1	. #xA7ED)	; ý¢€šŸ­
+    (mojikyo			. 000266)	; ý €€„Š
+    (ucs			. #x20124)	; 𠄤
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -510,10 +549,21 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 21)
     (hanyu-dazidian-char . 8)
-    (chinese-cns11643-6 . #x2568)	; ø»›»¯
-    (ideograph-daikanwa . 00269)	; ø¸€„
-    (mojikyo		. 000269)	; ý €€„
-    (ucs		. #x20128)	; 𠄨
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (ucs		  . #x2FF3)	; ⿳
+      )
+     ((ucs		  . #x4E00)	; 一
+      )
+     ((ucs		  . #x5916)	; 外
+      )
+     ((ucs		  . #x4E00)	; 一
+      ))
+    (chinese-cns11643-6		. #x2568)	; ø»›»¯
+    (ideograph-daikanwa		. 00269)	; ø¸€„
+    (ideograph-hanziku-1	. #xA873)	; ý¢€š¡³
+    (mojikyo			. 000269)	; ý €€„
+    (ucs			. #x20128)	; 𠄨
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -522,18 +572,49 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 19)
     (hanyu-dazidian-char . 13)
-    (chinese-cns11643-6 . #x2567)	; ø»›»®
-    (ideograph-daikanwa . 00270)	; ø¸€„Ž
-    (mojikyo		. 000270)	; ý €€„Ž
-    (ucs		. #x20025)	; 𠀥
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs		  . #x2FF4)	; â¿´
+      )
+     ((ucs		  . #x4E8C)	; 二
+      )
+     ((ucs		  . #x65E7)	; 旧
+      ))
+    (chinese-cns11643-6		. #x2567)	; ø»›»®
+    (ideograph-daikanwa		. 00270)	; ø¸€„Ž
+    (ideograph-hanziku-1	. #xA7F7)	; ý¢€šŸ·
+    (mojikyo			. 000270)	; ý €€„Ž
+    (ucs			. #x20025)	; 𠀥
     ))
 (define-char
-  '((ideographic-radical . 7)	; ⼆
+  '((=>ucs		. #x20122)	; 𠄢
+    (ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (chinese-cns11643-6 . #x2566)	; ø»›»­
-    (ideograph-daikanwa . 00271)	; ø¸€„
-    (mojikyo		. 000271)	; ý €€„
+    (hanyu-dazidian-vol	 . 1)
+    (hanyu-dazidian-page . 21)
+    (hanyu-dazidian-char . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (ucs		  . #x2FF3)	; ⿳
+      )
+     ((ucs		  . #x4E00)	; 一
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(ucs		    . #x2FF4)	; â¿´
+	)
+       ((ucs		    . #x5182)	; 冂
+	)
+       ((ucs		    . #x5DF3)	; å·³
+	))
+      )
+     ((ucs		  . #x4E00)	; 一
+      ))
+    (chinese-cns11643-6		. #x2566)	; ø»›»­
+    (ideograph-daikanwa		. 00271)	; ø¸€„
+    (ideograph-hanziku-1	. #xA86F)	; ý¢€š¡¯
+    (mojikyo			. 000271)	; ý €€„
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -617,10 +698,28 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 25)
     (hanyu-dazidian-char . 3)
-    (chinese-cns11643-4 . #x2532)	; ø»—¦±
-    (ideograph-daikanwa . 00275)	; ø¸€„“
-    (mojikyo		. 000275)	; ý €€„“
-    (ucs		. #x2012E)	; 𠄮
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (ucs		  . #x2FF3)	; ⿳
+      )
+     ((ucs		  . #x4E00)	; 一
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(ucs		    . #x2FF0)	; â¿°
+	)
+       ((chinese-big5-cdp   . #x8B44)	; ý¢€ˆ­„
+	)
+       ((chinese-big5-cdp   . #x8B44)	; ý¢€ˆ­„
+	))
+      )
+     ((ucs		  . #x4E00)	; 一
+      ))
+    (chinese-cns11643-4		. #x2532)	; ø»—¦±
+    (ideograph-daikanwa		. 00275)	; ø¸€„“
+    (ideograph-hanziku-1	. #xA951)	; ý¢€š¥‘
+    (mojikyo			. 000275)	; ý €€„“
+    (ucs			. #x2012E)	; 𠄮
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -693,10 +792,26 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 25)
     (hanyu-dazidian-char . 4)
-    (chinese-cns11643-6 . #x2E50)	; ø»œˆ¥
-    (ideograph-daikanwa . 00280)	; ø¸€„˜
-    (mojikyo		. 000280)	; ý €€„˜
-    (ucs		. #x20130)	; 𠄰
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
+      )
+     ((ucs		  . #x4E8C)	; 二
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(ucs		    . #x2FF4)	; â¿´
+	)
+       ((ucs		    . #x56D7)	; 囗
+	)
+       ((ucs		    . #x706B)	; 火
+	))
+      ))
+    (chinese-cns11643-6		. #x2E50)	; ø»œˆ¥
+    (ideograph-daikanwa		. 00280)	; ø¸€„˜
+    (ideograph-hanziku-1	. #xA952)	; ý¢€š¥’
+    (mojikyo			. 000280)	; ý €€„˜
+    (ucs			. #x20130)	; 𠄰
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -717,10 +832,21 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 26)
     (hanyu-dazidian-char . 3)
-    (chinese-cns11643-6 . #x352D)	; ø»œ’”
-    (ideograph-daikanwa . 00282)	; ø¸€„š
-    (mojikyo		. 000282)	; ý €€„š
-    (ucs		. #x20135)	; 𠄵
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (ucs		  . #x2FF3)	; ⿳
+      )
+     ((ucs		  . #x4E00)	; 一
+      )
+     ((ucs		  . #x660D)	; 昍
+      )
+     ((ucs		  . #x4E00)	; 一
+      ))
+    (chinese-cns11643-6		. #x352D)	; ø»œ’”
+    (ideograph-daikanwa		. 00282)	; ø¸€„š
+    (ideograph-hanziku-1	. #xA971)	; ý¢€š¥±
+    (mojikyo			. 000282)	; ý €€„š
+    (ucs			. #x20135)	; 𠄵
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -741,15 +867,48 @@
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 26)
     (hanyu-dazidian-char . 9)
-    (chinese-cns11643-6 . #x3D21)	; ø»œ¸
-    (ideograph-daikanwa . 00284)	; ø¸€„œ
-    (mojikyo		. 000284)	; ý €€„œ
-    (ucs		. #x20139)	; 𠄹
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs		  . #x2FF4)	; â¿´
+      )
+     ((ucs		  . #x4E8C)	; 二
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(ucs		    . #x2FF0)	; â¿°
+	)
+       ((ucs		    . #x53E5)	; 句
+	)
+       ((chinese-big5-cdp   . #x8AF9)	; ý¢€ˆ«¹
+	))
+      ))
+    (chinese-cns11643-6		. #x3D21)	; ø»œ¸
+    (ideograph-daikanwa		. 00284)	; ø¸€„œ
+    (ideograph-hanziku-1	. #xA977)	; ý¢€š¥·
+    (mojikyo			. 000284)	; ý €€„œ
+    (ucs			. #x20139)	; 𠄹
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (ideograph-daikanwa . 00285)	; ø¸€„
-    (mojikyo		. 000285)	; ý €€„
+    (hanyu-dazidian-vol	 . 1)
+    (hanyu-dazidian-page . 26)
+    (hanyu-dazidian-char . 17)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
+      )
+     ((ucs		  . #x4E8C)	; 二
+      )
+     ((japanese-jisx0208-1978	  . #x5423)	; ø»ƒ†¼
+      (japanese-jisx0208	  . #x5423)	; ø»‡›„
+      (korean-ksc5601		  . #x6A4C)	; ø»Š†…
+      (chinese-cns11643-1	  . #x5E58)	; ø»’œ¹
+      (ideograph-daikanwa	  . 04806)	; ø¸‹†
+      ))
+    (ideograph-daikanwa		. 00285)	; ø¸€„
+    (ideograph-hanziku-1	. #xA9A1)	; ý¢€š¦¡
+    (mojikyo			. 000285)	; ý €€„
+    (ucs			. #x2013F)	; 𠄿
     ))