X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R020-Wrap.el;h=9d26e8701f6a91643a030ada21c87050bc230645;hb=4bd899dfd7c332baa10f9d0a50319d4fbd83e3db;hp=4c9c7bb41595e6d20a1a6958bccc4c6003fdc0f5;hpb=5c4fbb40ff73b7c5be747bf9cfb27e2e93fd49cc;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el
index 4c9c7bb..9d26e87 100644
--- a/lisp/utf-2000/Ideograph-R020-Wrap.el
+++ b/lisp/utf-2000/Ideograph-R020-Wrap.el
@@ -111,6 +111,14 @@
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((ucs		  . #x51AB)	; 冫
+      ))
     (chinese-gb2312	. #x5448)	; ø»…‘¥
     (chinese-isoir165	. #x5448)	; ø»¹µ
     (chinese-cns11643-3 . #x2156)	; ø»•—™
@@ -140,6 +148,14 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((ucs		  . #x4EBA)	; 人
+      ))
     (chinese-cns11643-3 . #x2155)	; ø»•—˜
     (ideograph-daikanwa . 02499)	; ø¸€§ƒ
     (ucs		. #x52FD)	; 勽
@@ -180,8 +196,8 @@
     (hanyu-dazidian-page . 255)
     (hanyu-dazidian-char . 2)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -204,7 +220,18 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (comment		. "[= R004:M00129.0]")
+    (->same-ideograph
+     ((ideographic-radical . 4)	; ⼃
+      (ideograph-daikanwa . 00129)	; ø¸€‚
+      ))
+    (ideographic-structure
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (ucs		  . #x2FFB)	; â¿»
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((ucs		  . #x4E42)	; 乂
+      ))
     (shinjigen-1	. 769)
     (shinjigen-2	. 769)
     (japanese-jisx0208-1978	. #x4C68)	; ø»‚¼‘
@@ -217,6 +244,14 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((ucs		  . #x5315)	; 匕
+      ))
     (shinjigen-1	. 768)
     (shinjigen-2	. 768)
     (japanese-jisx0208-1978	. #x4677)	; ø»‚³¬
@@ -231,8 +266,8 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -247,11 +282,49 @@
     (ucs		. #x5303)	; 匃
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x5304)	; 匄
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (chinese-cns11643-3 . #x2222)	; ø»•˜ƒ
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((ideograph-daikanwa . 00287)	; ø¸€„Ÿ
+      ))
     (ideograph-daikanwa . 02505)	; ø¸€§‰
+    ))
+(define-char
+  '((=>ucs		. #x5304)	; 匄
+    (morohashi-daikanwa	2505 0 1)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (ucs		  . #x2FF4)	; â¿´
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((chinese-cns11643-1 . #x4441)	; ø»‘¶–
+      ))
+    (chinese-cns11643-3 . #x2222)	; ø»•˜ƒ
+    ))
+(define-char
+  '((morohashi-daikanwa	2505 0 2)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((ucs		  . #x4EA1)	; 亡
+      ))
     (ucs		. #x5304)	; 匄
     ))
 (define-char
@@ -262,8 +335,8 @@
     (hanyu-dazidian-page . 257)
     (hanyu-dazidian-char . 6)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (ucs		  . #x2FFB)	; â¿»
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -370,8 +443,8 @@
 		 )
       ))
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (ucs		  . #x2FFB)	; â¿»
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -392,8 +465,8 @@
     (hanyu-dazidian-page . 257)
     (hanyu-dazidian-char . 2)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -432,6 +505,14 @@
     (->ideographic-variants
      ((ideograph-daikanwa . 02511)	; ø¸€§
       ))
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((ucs		  . #x5915)	; 夕
+      ))
     (chinese-cns11643-3 . #x2224)	; ø»•˜…
     (china3-jef		. #x45A8)	; øº„–¨
     (mojikyo		. 054897)	; ý €™±
@@ -445,8 +526,8 @@
     (hanyu-dazidian-page . 258)
     (hanyu-dazidian-char . 5)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -494,14 +575,15 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
      ((korean-ksc5601	  . #x7841)	; ø»Ššž
       (ideograph-daikanwa . 09167)	; ø¸‚
       ))
+    (chinese-big5	. #xCA71)	; øº¡¨’
     (ideograph-daikanwa . 02515)	; ø¸€§“
     ))
 (define-char
@@ -513,15 +595,14 @@
     (hanyu-dazidian-page . 258)
     (hanyu-dazidian-char . 7)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
      ((ucs		  . #x5E73)	; å¹³
       ))
     (chinese-cns11643-2 . #x2333)	; ø»“®
-    (chinese-big5	. #xCA71)	; øº¡¨’
     (ucs		. #x5309)	; 匉
     ))
 (define-char
@@ -600,8 +681,8 @@
     (hanyu-dazidian-page . 259)
     (hanyu-dazidian-char . 1)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -641,8 +722,8 @@
     (hanyu-dazidian-page . 258)
     (hanyu-dazidian-char . 13)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -662,6 +743,14 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((ucs		  . #x5408)	; 合
+      ))
     (japanese-jisx0212	. #x3421)	; ø»‹€Š
     (chinese-cns11643-4 . #x2551)	; ø»—§
     (ideograph-daikanwa . 02525)	; ø¸€§
@@ -686,8 +775,8 @@
     (hanyu-dazidian-page . 259)
     (hanyu-dazidian-char . 4)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -753,8 +842,8 @@
     (hanyu-dazidian-page . 259)
     (hanyu-dazidian-char . 11)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -917,8 +1006,8 @@
     (hanyu-dazidian-page . 260)
     (hanyu-dazidian-char . 5)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -989,8 +1078,8 @@
     (hanyu-dazidian-page . 260)
     (hanyu-dazidian-char . 14)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
@@ -1027,15 +1116,14 @@
     (hanyu-dazidian-page . 260)
     (hanyu-dazidian-char . 12)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
      ((ucs		  . #x8345)	; 荅
       ))
     (chinese-cns11643-2 . #x3A46)	; ø»“±³
-    (chinese-big5	. #xD862)	; øº¢Š™
     (ideograph-daikanwa . 02552)	; ø¸€§¸
     ))
 (define-char
@@ -1044,13 +1132,14 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (ucs		  . #x2FF4)	; â¿´
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
       )
      ((ucs		  . #x52F9)	; 勹
       )
      ((ucs		  . #x8345)	; 荅
       ))
+    (chinese-big5	. #xD862)	; øº¢Š™
     (ucs		. #x5312)	; 匒
     ))
 (define-char
@@ -1092,12 +1181,34 @@
     (ucs		. #x208F9)	; ð £¹
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((=>ucs		. #x5313)	; 匓
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x3423)	; ø»‹€Œ
-    (chinese-cns11643-6 . #x5074)	; ø»œ»…
     (ideograph-daikanwa . 02556)	; ø¸€§¼
+    ))
+(define-char
+  '((=>ucs		. #x5313)	; 匓
+    (morohashi-daikanwa	2556 0 0)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (chinese-cns11643-6 . #x5074)	; ø»œ»…
+    ))
+(define-char
+  '((morohashi-daikanwa	2556 0 5)
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((chinese-big5-cdp	  . #x8AD4)	; ý¢€ˆ«”
+      ))
     (ucs		. #x5313)	; 匓
     ))
 (define-char
@@ -1188,6 +1299,14 @@
     (ideographic-strokes . 14)
     (kangxi-strokes	 . 13)
     (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (ucs		  . #x2FF9)	; ⿹
+      )
+     ((ucs		  . #x52F9)	; 勹
+      )
+     ((chinese-big5-cdp	  . #x8AE0)	; ý¢€ˆ« 
+      ))
     (chinese-cns11643-3 . #x5038)	; ø»–›½
     (ideograph-daikanwa . 02563)	; ø¸€¨ƒ
     (ucs		. #x5314)	; 匔