X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R020-Wrap.el;h=b787081ae173dd12946ebf2a1c4be65c2875bc7e;hb=456e3886a9abad1972184755a6105c3ebb4ed184;hp=376920c323456586dc803d6413fcfa27ca5573ff;hpb=ffe143c4a3bf580720cd2774d8b0122256b295c5;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el
index 376920c..b787081 100644
--- a/lisp/utf-2000/Ideograph-R020-Wrap.el
+++ b/lisp/utf-2000/Ideograph-R020-Wrap.el
@@ -16,7 +16,18 @@
     (=daikanwa		. 02493)	; &I-M-02493;
     ))
 (define-char
-  '((=>ucs*		. #x52FA)	; 勺
+  '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 1)
+    (total-strokes	 . 3)
+    (=ucs		. #x52FA)	; 勺
+    (=big5		. #xA463)	; &I-B-A463;
+    (=jis-x0208@1997	. #x3C5B)	; 勺 [28-59]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x52FA)	; 勺
+      ))
+    (=>ucs*		. #x52FA)	; 勺
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
@@ -33,7 +44,6 @@
     (=ucs		. #x2F828)	; 勺
     (=ks-x1001		. #x6D43)	; &I-K0-6D43; [77-35]
     (=cns11643-4	. #x212F)	; &I-C4-212F; [01-15]
-    (=big5-cdp		. #xA463)	; &I-B-A463;
     (=gt		. 03203)	; &I-GT-03203;
     (=gt-k		. 00184)	; &I-GT-K00184;
     (=gt-pj-2		. #x4634)	; &I-GT-03203; [38-20]
@@ -42,7 +52,11 @@
     (=ucs@ks		. #x52FA)	; 勺
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((<-denotational
+     ((=ucs		  . #x52FA)	; 勺
+      ))
+    (=>ucs*		. #x52FA)	; 勺
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
     (hanyu-dazidian	1 254 14)
@@ -56,60 +70,75 @@
       ))
     (shinjigen-1	. 762)
     (shinjigen-2	. 762)
-    (=ucs		. #x52FA)	; 勺
+    (=ucs		. #xFA77)	; ï©·
     (=jis-x0208		. #x3C5B)	; &I-J90-3C5B; [28-59]
     (=gb2312		. #x4957)	; &I-G0-4957; [41-55]
     (=cns11643-1	. #x4444)	; &I-C1-4444; [36-36]
-    (=big5		. #xA463)	; &I-B-A463;
     (=gt		. 03204)	; &I-GT-03204;
     (=gt-k		. 00183)	; &I-GT-K00183;
     (=gt-pj-1		. #x3C5B)	; &I-GT-03204; [28-59]
     (=daikanwa		. 02495)	; &I-M-02495;
+    (=ucs@unicode	. #x52FA)	; ï©·
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
+  '((<-denotational
+     ((=big5		  . #xA4C3)	; &B-A4C3;
+      ))
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
     (hanyu-dazidian	1 255 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs		  . #x2FF9)	; ⿹
-      )
-     ((=ucs		  . #x52F9)	; 勹
-      )
-     ((=ucs		  . #x4E8C)	; 二
-      ))
-    (shinjigen-1	. 764)
-    (shinjigen-2	. 764)
     (=ucs		. #x52FB)	; 勻
-    (=ks-x1001		. #x5032)	; &I-K0-5032; [48-18]
-    (=cns11643-1	. #x4524)	; &I-C1-4524; [37-04]
-    (=jis-x0213-1-2000	. #x2E6A)	; &I-JX1-2E6A; [14-74]
-    (=big5		. #xA4C3)	; &I-B-A4C3;
-    (=daikanwa		. 02496)	; &I-M-02496;
-    (=jef-china3	. #x45A2)	; &I-JC3-45A2;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	(=ucs		    . #x2FF9)	; ⿹
+	)
+       ((=ucs		    . #x52F9)	; 勹
+	)
+       ((=ucs		    . #x4E8C)	; 二
+	))
+      (shinjigen-1	  . 764)
+      (shinjigen-2	  . 764)
+      (=jis-x0213-1-2000  . #x2E6A)	; &M-02496; [14-74]
+      (=daikanwa	  . 02496)	; &I-M-02496;
+      (=jef-china3	  . #x45A2)	; &I-JC3-45A2;
+      (=ucs@unicode	  . #x52FB)	; &M-02496;
+      )
+     ((=ks-x1001	  . #x5032)	; &C1-4524; [48-18]
+      (=cns11643-1	  . #x4524)	; &I-C1-4524; [37-04]
+      ))
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=big5		. #xA4C3)	; &B-A4C3;
+    (=ucs@big5		. #x52FB)	; &B-A4C3;
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xA4C3)	; &B-A4C3;
+      ))
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
     (=ucs		. #x5300)	; 匀
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 764)
-	(=ucs		    . #x52FB)	; 勻
-	(=jis-x0213-1-2000  . #x2E6A)	; &I-JX1-2E6A; [14-74]
-	(=daikanwa	    . 02496)	; &I-M-02496;
-	))
-      (<-vulgar*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (shinjigen-1	  . 764)
+     ((shinjigen-1	  . 764)
       (shinjigen-2	  . 765)
       (=jis-x0212	  . #x337B)	; &M-02497; [19-91]
       (=jis-x0213-1-2000  . #x2E6B)	; &I-JX1-2E6B; [14-75]
       (=daikanwa	  . 02497)	; &I-M-02497;
       (=jef-china3	  . #x45A3)	; &I-JC3-45A3;
       (=ucs@jis		  . #x5300)	; &M-02497;
+      (<-vulgar
+       ((shinjigen-1	    . 764)
+	(=jis-x0213-1-2000  . #x2E6A)	; &M-02496; [14-74]
+	(=daikanwa	    . 02496)	; &I-M-02496;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa shinjigen-1)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
@@ -231,10 +260,6 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (<-same
-     ((=gt		  . 00176)	; &GT-00176;
-      (=daikanwa	  . 00129)	; &I-M-00129;
-      ))
     (ideographic-structure
      ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
       (=ucs		  . #x2FFB)	; â¿»
@@ -250,6 +275,10 @@
     (=gt		. 03212)	; &I-GT-03212;
     (=gt-pj-1		. #x4C68)	; &I-GT-03212; [44-72]
     (=daikanwa		. 02502)	; &I-M-02502;
+    (<-same
+     ((=gt		  . 00176)	; &GT-00176;
+      (=daikanwa	  . 00129)	; &I-M-00129;
+      ))
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -436,16 +465,13 @@
     (=cns11643-5	. #x213D)	; &I-C5-213D; [01-29]
     ))
 (define-char
-  '((=>ucs*		. #x5306)	; 匆
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x5232)	; &J97-5232; [50-18]
+      ))
+    (=>ucs*		. #x5306)	; 匆
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (->ideographic-variants
-     ((shinjigen-1	  . 772)
-      (=ucs		  . #x5306)	; 匆
-      ))
-    (->ideographic-variants*sources
-     shinjigen-1)
     (ideographic-structure
      ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
       (=ucs		  . #x2FFB)	; â¿»
@@ -459,9 +485,24 @@
     (=ucs		. #x2F82A)	; 匆
     (=cns11643-3	. #x2225)	; &I-C3-2225; [02-05]
     (=daikanwa		. 02511)	; &I-M-02511;
+    (<-formed
+     ((shinjigen-1	  . 772)
+      (=ucs		  . #x5306)	; 匆
+      (=jis-x0208	  . #x5232)	; &I-J90-5232; [50-18]
+      ))
+    (<-formed*sources
+     shinjigen-1)
+    ))
+(define-char
+  '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (=jis-x0208@1997	. #x5232)	; &J97-5232; [50-18]
     ))
 (define-char
-  '((morohashi-daikanwa	2511 0 2)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x5232)	; &J97-5232; [50-18]
+      ))
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
@@ -486,26 +527,21 @@
     (=gt-pj-1		. #x5232)	; &I-GT-03219; [50-18]
     ))
 (define-char
-  '((=>ucs		. #x5307)	; 匇
-    (morohashi-daikanwa	2511 0 7)
-    (ideographic-radical . 20)	; ⼓
+  '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (->ideographic-variants
-     ((=daikanwa	  . 02511)	; &I-M-02511;
+    (=ucs		. #x5307)	; 匇
+    (<-formed
+     ((=ucs		  . #x2F82A)	; 匆
       ))
-    (=jis-x0213-1-2000	. #x2E6C)	; &CB05526; [14-76]
-    (=cbeta		. 05526)	; &I-CB05526;
-    (=ucs@jis		. #x5307)	; &CB05526;
     ))
 (define-char
-  '((morohashi-daikanwa	2511 0 8)
+  '((<-denotational
+     ((=ucs		  . #x5307)	; 匇
+      ))
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (->ideographic-variants
-     ((=daikanwa	  . 02511)	; &I-M-02511;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
       (=ucs		  . #x2FF9)	; ⿹
@@ -514,9 +550,20 @@
       )
      ((=ucs		  . #x5915)	; 夕
       ))
-    (=ucs		. #x5307)	; 匇
-    (=cns11643-3	. #x2224)	; &I-C3-2224; [02-04]
+    (=cns11643-3	. #x2224)	; &C3-2224; [02-04]
     (=jef-china3	. #x45A8)	; &I-JC3-45A8;
+    (=ucs@unicode	. #x5307)	; &C3-2224;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5307)	; 匇
+      ))
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (=jis-x0213-1-2000	. #x2E6C)	; &CB05526; [14-76]
+    (=cbeta		. 05526)	; &I-CB05526;
+    (=ucs@jis		. #x5307)	; &CB05526;
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -674,38 +721,28 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 259 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs		  . #x2FF9)	; ⿹
-      )
-     ((=ucs		  . #x52F9)	; 勹
-      )
-     ((=ucs		  . #x7C73)	; ç±³
-      ))
     (=ucs		. #x530A)	; 匊
-    (=jis-x0212		. #x337D)	; &I-JSP-337D; [19-93]
-    (=iso-ir165		. #x2E29)	; &I-EGB-2E29; [14-09]
-    (=jis-x0213-2-2000	. #x234C)	; &I-JX2-234C; [03-44]
-    (=big5		. #xCBD6)	; &I-B-CBD6;
-    (=daikanwa		. 02523)	; &I-M-02523;
-    (=jef-china3	. #x45A6)	; &I-JC3-45A6;
-    ))
-(define-char
-  '((=>ucs		. #x530A)	; 匊
-    (morohashi-daikanwa	2523 0 0)
-    (ideographic-radical . 20)	; ⼓
-    (ideographic-strokes . 6)
-    (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs		  . #x2FF9)	; ⿹
-      )
-     ((=ucs		  . #x52F9)	; 勹
+    (->subsumptive
+     ((hanyu-dazidian	  1 259 1)
+      (=jis-x0212	  . #x337D)	; &M-02523; [19-93]
+      (=iso-ir165	  . #x2E29)	; &I-EGB-2E29; [14-09]
+      (=jis-x0213-2-2000  . #x234C)	; &I-JX2-234C; [03-44]
+      (=big5		  . #xCBD6)	; &I-B-CBD6;
+      (=daikanwa	  . 02523)	; &I-M-02523;
+      (=jef-china3	  . #x45A6)	; &I-JC3-45A6;
+      (=ucs@unicode	  . #x530A)	; &M-02523;
       )
-     ((=cns11643-1	  . #x484D)	; &C1-484D; [40-45]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	(=ucs		    . #x2FF9)	; ⿹
+	)
+       ((=ucs		    . #x52F9)	; 勹
+	)
+       ((=cns11643-1	    . #x484D)	; &C1-484D; [40-45]
+	))
+      (=cns11643-2	  . #x2556)	; &C2-2556; [05-54]
+      (=ucs@cns		  . #x530A)	; &C2-2556;
       ))
-    (=cns11643-2	. #x2556)	; &C2-2556; [05-54]
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -1074,19 +1111,35 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 260 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs		  . #x2FF9)	; ⿹
-      )
-     ((=ucs		  . #x52F9)	; 勹
-      )
-     ((=ucs		  . #x8EAC)	; 躬
-      ))
     (=ucs		. #x5311)	; 匑
-    (=jis-x0212		. #x3422)	; &I-JSP-3422; [20-02]
-    (=cns11643-2	. #x3A47)	; &I-C2-3A47; [26-39]
     (=big5		. #xD863)	; &I-B-D863;
-    (=daikanwa		. 02549)	; &I-M-02549;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	(=ucs		    . #x2FF9)	; ⿹
+	)
+       ((=ucs		    . #x52F9)	; 勹
+	)
+       ((=jis-x0208	    . #x6D3B)	; &GT-50812; [77-27]
+	(=ks-x1001	    . #x4F65)	; &I-K0-4F65; [47-69]
+	(=cns11643-1	    . #x5845)	; &I-C1-5845; [56-37]
+	(=daikanwa	    . 38038)	; &I-M-38038;
+	))
+      (=jis-x0212	  . #x3422)	; &M-02549; [20-02]
+      (=cns11643-2	  . #x3A47)	; &I-C2-3A47; [26-39]
+      (=daikanwa	  . 02549)	; &I-M-02549;
+      (=ucs@jis		  . #x5311)	; &M-02549;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	(=ucs		    . #x2FF9)	; ⿹
+	)
+       ((=ucs		    . #x52F9)	; 勹
+	)
+       ((=gb2312	    . #x392A)	; &G0-392A; [25-10]
+	))
+      (=ucs@unicode	  . #x5311)	; &UU+5311;
+      ))
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -1101,11 +1154,23 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (=ucs		. #x208F5)	; ð £µ
-    (=cns11643-4	. #x364E)	; &I-C4-364E; [22-46]
-    (=daikanwa		. 02551)	; &I-M-02551;
+    (->subsumptive
+     ((=daikanwa	  . 02551)	; &M-02551;
+      )
+     ((=cns11643-4	  . #x364E)	; &C4-364E; [22-46]
+      (=ucs@iso		  . #x208F5)	; &C4-364E;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5312)	; 匒
+  '((ideographic-radical . 20)	; ⼓
+    (hanyu-dazidian	1 260 12)
+    (=ucs		. #x5312)	; 匒
+    (=big5		. #xD862)	; &I-B-D862;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5312)	; 匒
+      ))
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
@@ -1115,42 +1180,55 @@
       )
      ((=ucs		  . #x52F9)	; 勹
       )
-     ((=ucs		  . #x8345)	; 荅
+     ((=cns11643-2	  . #x3251)	; &M-30937; [18-49]
+      (=daikanwa	  . 30937)	; &I-M-30937;
       ))
     (=cns11643-2	. #x3A46)	; &M-02552; [26-38]
     (=daikanwa		. 02552)	; &I-M-02552;
+    (=ucs@cns		. #x5312)	; &M-02552;
     ))
 (define-char
-  '((morohashi-daikanwa	2552 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5312)	; 匒
+      ))
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 260 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
       (=ucs		  . #x2FF9)	; ⿹
       )
      ((=ucs		  . #x52F9)	; 勹
       )
-     ((=ucs		  . #x8345)	; 荅
+     ((=jis-x0208	  . #x6829)	; &GT-40184; [72-09]
+      (=iso-ir165	  . #x7E3E)	; &I-EGB-7E3E; [94-30]
       ))
-    (=ucs		. #x5312)	; 匒
-    (=big5		. #xD862)	; &I-B-D862;
+    (=ucs@unicode	. #x5312)	; &UU+5312;
+    ))
+(define-char
+  '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (=ucs		. #x208F8)	; 𠣸
     ))
 (define-char
-  '((=>ucs		. #x208F8)	; 𠣸
+  '((<-denotational
+     ((=ucs		  . #x208F8)	; 𠣸
+      ))
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (=daikanwa		. 02553)	; &M-02553;
     ))
 (define-char
-  '((morohashi-daikanwa	2553 0 0)
+  '((<-denotational
+     ((=ucs		  . #x208F8)	; 𠣸
+      ))
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (=ucs		. #x208F8)	; 𠣸
-    (=cns11643-6	. #x5073)	; &I-C6-5073; [48-83]
+    (=cns11643-6	. #x5073)	; &C6-5073; [48-83]
+    (=ucs@iso		. #x208F8)	; &C6-5073;
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓