X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R020-Wrap.el;h=8e960e085f9d416d79e4a5f74e879b79156b39ab;hb=68fac85782ad521c2f86ffdb00e64f39d4f75292;hp=f740a768d56567d61cd6a7635cb0bbf72eb6898b;hpb=4af06574129b7d9eaa83618998bf5c8b0cdfbd4e;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el
index f740a76..8e960e0 100644
--- a/lisp/utf-2000/Ideograph-R020-Wrap.el
+++ b/lisp/utf-2000/Ideograph-R020-Wrap.el
@@ -180,7 +180,7 @@
     (==>ucs@bucs	. #x52FB)	; &BUCS+52FB;
     (=>ucs@component	. #x52FB)	; &BUCS+52FB;
     (=ucs@big5		. #x52FB)	; &BUCS+52FB;
-    (=big5		. #xA4C3)	; &BUCS+52FB;
+    (=big5		. #xA4C3)	; &I-B-A4C3;
     (=>iwds-1		.  0048)	; &BUCS+52FB;
     ))
 (define-char
@@ -193,14 +193,24 @@
     (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)	; 二
+      ))
     (=ucs		. #x52FB)	; 勻
+    (=adobe-japan1-5	. 16799)	; &I-AJ1-16799;
+    (=ks-x1001		. #x5032)	; &I-K0-5032; [48-18]
+    (=cns11643-1	. #x4524)	; &I-C1-4524; [37-04]
+    (=jis-x0213-1	. #x2E6A)	; &I-JX1-2E6A; [14-74]
+    (=daikanwa		. 02496)	; &I-M-02496;
+    (=shinjigen		.  0764)	; 勻
+    (=jef-china3	. #x45A2)	; &I-JC3-45A2;
     (->subsumptive
-     ((=decomposition@cid
-       ((=ucs		    . #x52FB)	; 勻
-	)
-       ((=ucs		    . #xE0100)	; 󠄀
-	))
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
 	(=ucs		    . #x2FF9)	; ⿹
 	)
@@ -208,17 +218,54 @@
 	)
        ((=ucs		    . #x4E8C)	; 二
 	))
-      (=ucs@unicode	  . #x52FB)	; &AJ1-16799;
-      (=adobe-japan1-5	  . 16799)	; &AJ1-16799;
-      (=jis-x0213-1	  . #x2E6A)	; &I-JX1-2E6A; [14-74]
-      (=daikanwa	  . 02496)	; &I-M-02496;
-      (=shinjigen	  .  0764)	; &AJ1-16799;
-      (=jef-china3	  . #x45A2)	; &I-JC3-45A2;
+      (=>>ucs@unicode	  . #x52FB)	; &G-AJ1-16799;
+      (=>>adobe-japan1-5  . 16799)	; &G-AJ1-16799;
+      (=>>jis-x0213-1	  . #x2E6A)	; &G-AJ1-16799; [14-74]
+      (=>>daikanwa	  . 02496)	; &G-AJ1-16799;
+      (->subsumptive
+       ((=decomposition@cid
+	 ((=ucs		      . #x52FB)	; 勻
+	  )
+	 ((=ucs		      . #xE0100)	; 󠄀
+	  ))
+	(==ucs@unicode	    . #x52FB)	; &g2-AJ1-16799;
+	(==ucs@ks	    . #x52FB)	; &g2-AJ1-16799;
+	(==adobe-japan1-5   . 16799)	; &g2-AJ1-16799;
+	(==ks-x1001	    . #x5032)	; &g2-AJ1-16799; [48-18]
+	(==jis-x0213-1	    . #x2E6A)	; &g2-AJ1-16799; [14-74]
+	(==daikanwa	    . 02496)	; &g2-AJ1-16799;
+	(==shinjigen	    .  0764)	; &g2-AJ1-16799;
+	(==jef-china3	    . #x45A2)	; &g2-AJ1-16799;
+	(->subsumptive
+	 ((===daikanwa	      . 02496)	; &R-M-02496;
+	  )
+	 ((===jis-x0213-1     . #x2E6A)	; &R-JX1-2E6A; [14-74]
+	  )
+	 ((===adobe-japan1-5  . 16799)	; &R-AJ1-16799;
+	  )
+	 ((===jef-china3      . #x45A2)	; &R-JC3-45A2;
+	  )
+	 ((===ucs@ks	      . #x52FB)	; &R-K0-5032;
+	  (===ks-x1001	      . #x5032)	; &R-K0-5032; [48-18]
+	  )
+	 ((===ucs@unicode     . #x52FB)	; &R-UU+52FB;
+	  ))
+	))
       )
-     ((=ucs@cns		  . #x52FB)	; &C1-4524;
-      (=ucs@ks		  . #x52FB)	; &C1-4524;
-      (=ks-x1001	  . #x5032)	; &C1-4524; [48-18]
-      (=cns11643-1	  . #x4524)	; &I-C1-4524; [37-04]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	(=ucs		    . #x2FF9)	; ⿹
+	)
+       ((=ucs		    . #x52F9)	; 勹
+	)
+       ((=ucs		    . #x20120)	; 𠄠
+	))
+      (=>>ucs@cns	  . #x52FB)	; &G-CU+52FB;
+      (=>>cns11643-1	  . #x4524)	; &G-CU+52FB; [37-04]
+      (->subsumptive
+       ((==ucs@cns	    . #x52FB)	; &g2-CU+52FB;
+	(==cns11643-1	    . #x4524)	; &g2-CU+52FB; [37-04]
+	))
       ))
     ))
 (define-char
@@ -230,6 +277,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)	; 冫
+      ))
     (=ucs		. #x5300)	; 匀
     ))
 (define-char
@@ -239,10 +294,13 @@
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (=decomposition@cid
-     ((=ucs		  . #x5300)	; 匀
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((=ucs		  . #xE0100)	; 󠄀
+     ((=gt-k		  . 00083)	; &GT-K00083;
       ))
     (=ucs@jis		. #x5300)	; &AJ1-08403;
     (=adobe-japan1-2	. 08403)	; &AJ1-08403;
@@ -252,13 +310,36 @@
     (=shinjigen		.  0765)	; &AJ1-08403;
     (=jef-china3	. #x45A3)	; &I-JC3-45A3;
     (<-vulgar
-     ((=ucs@unicode	  . #x52FB)	; &AJ1-16799;
-      (=adobe-japan1-5	  . 16799)	; &AJ1-16799;
+     ((=ucs		  . #x52FB)	; 勻
       (=daikanwa	  . 02496)	; &I-M-02496;
-      (=shinjigen	  .  0764)	; &AJ1-16799;
+      (=shinjigen	  .  0764)	; 勻
       ))
     (<-vulgar*sources
      zhengzitong daikanwa shinjigen)
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5300)	; 匀
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@jis	  . #x5300)	; &g2-AJ1-08403;
+      (==adobe-japan1-2	  . 08403)	; &g2-AJ1-08403;
+      (==jis-x0212	  . #x337B)	; &g2-AJ1-08403; [19-91]
+      (==jis-x0213-1	  . #x2E6B)	; &g2-AJ1-08403; [14-75]
+      (==daikanwa	  . 02497)	; &g2-AJ1-08403;
+      (==shinjigen	  .  0765)	; &g2-AJ1-08403;
+      (==jef-china3	  . #x45A3)	; &g2-AJ1-08403;
+      (->subsumptive
+       ((===daikanwa	    . 02497)	; &R-M-02497;
+	)
+       ((===jis-x0212	    . #x337B)	; &R-JX1-2E6B; [19-91]
+	(===jis-x0213-1	    . #x2E6B)	; &R-JX1-2E6B; [14-75]
+	)
+       ((===adobe-japan1-2  . 08403)	; &R-AJ1-08403;
+	)
+       ((===jef-china3	    . #x45A3)	; &R-JC3-45A3;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -273,7 +354,8 @@
       )
      ((=ucs		  . #x52F9)	; 勹
       )
-     ((=ucs		  . #x51AB)	; 冫
+     ((=ucs@unicode	  . #x51AB)	; &AJ1-04233;
+      (=adobe-japan1-0	  . 04233)	; &AJ1-04233;
       ))
     (=ucs@unicode	. #x5300)	; &AJ1-14287;
     (=ucs@JP/hanazono	. nil)
@@ -570,29 +652,15 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (hanyu-dazidian	1 257 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs		  . #x2FF9)	; ⿹
-      )
-     ((=ucs		  . #x52F9)	; 勹
-      )
-     ((=ucs		  . #x4EBE)	; 亾
-      ))
     (=ucs		. #x5303)	; 匃
     (->subsumptive
-     ((=decomposition@cid
-       ((=ucs		    . #x5303)	; 匃
-	)
-       ((=ucs		    . #xE0100)	; 󠄀
-	))
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
 	(=ucs		    . #x2FF9)	; ⿹
 	)
        ((=ucs		    . #x52F9)	; 勹
 	)
-       ((=ucs@unicode	    . #x4EBE)	; &CDP-8CA1;
-	(=big5-cdp	    . #x8CA1)	; &CDP-8CA1;
+       ((=ucs		    . #x4EBE)	; 亾
 	))
       (=ucs@unicode	  . #x5303)	; &AJ1-19201;
       (=adobe-japan1-5	  . 19201)	; &AJ1-19201;
@@ -602,6 +670,38 @@
       (=daikanwa	  . 02504)	; &I-M-02504;
       (=cbeta		  . 00456)	; &I-CB00456;
       (=jef-china3	  . #x45A4)	; &I-JC3-45A4;
+      (->subsumptive
+       ((=decomposition@cid
+	 ((=ucs		      . #x5303)	; 匃
+	  )
+	 ((=ucs		      . #xE0100)	; 󠄀
+	  ))
+	(==ucs@unicode	    . #x5303)	; &g2-AJ1-19201;
+	(==adobe-japan1-5   . 19201)	; &g2-AJ1-19201;
+	(==jis-x0212	    . #x337C)	; &g2-AJ1-19201; [19-92]
+	(==cns11643-3	    . #x2223)	; &g2-AJ1-19201; [02-03]
+	(==big5-cdp	    . #x8CA2)	; &g2-AJ1-19201;
+	(==daikanwa	    . 02504)	; &g2-AJ1-19201;
+	(==cbeta	    . 00456)	; &g2-AJ1-19201;
+	(==jef-china3	    . #x45A4)	; &g2-AJ1-19201;
+	(->subsumptive
+	 ((===daikanwa	      . 02504)	; &R-M-02504;
+	  )
+	 ((===jis-x0212	      . #x337C)	; &R-JSP-337C; [19-92]
+	  )
+	 ((===adobe-japan1-5  . 19201)	; &R-AJ1-19201;
+	  )
+	 ((===big5-cdp	      . #x8CA2)	; &R-CDP-8CA2;
+	  )
+	 ((===cns11643-3      . #x2223)	; &R-C3-2223; [02-03]
+	  )
+	 ((===jef-china3      . #x45A4)	; &R-JC3-45A4;
+	  )
+	 ((===ucs@unicode     . #x5303)	; &R-UU+5303;
+	  )
+	 ((===cbeta	      . 00456)	; &R-CB00456;
+	  ))
+	))
       ))
     ))
 (define-char
@@ -698,6 +798,15 @@
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (ideographic-structure
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (=ucs		  . #x2FFB)	; â¿»
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=>ucs@component	  . #x5DF3)	; &A-compU+5DF3;
+      (=>iwds-1		  .  0121)	; &A-compU+5DF3;
+      ))
     (=ucs		. #x5305)	; 包
     (=>jis-x0208	. #x4A71)	; 包 [42-81]
     (=>jis-x0213-1	. #x4A71)	; 包 [42-81]
@@ -1091,9 +1200,9 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component	  . #x56F1)	; &IWDS1-361;
-      (=ucs@big5	  . #x56EA)	; &IWDS1-361;
-      (=>iwds-1		  .  0361)	; &IWDS1-361;
+     ((=>ucs@component	  . #x56F1)	; &A-compU+56F1;
+      (=ucs@big5	  . #x56EA)	; &A-compU+56F1;
+      (=>iwds-1		  .  0361)	; &A-compU+56F1;
       ))
     (ideographic-radical@ucs . 31)	; ⼞
     (ideographic-radical@ucs*sources
@@ -1143,10 +1252,24 @@
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (->subsumptive
-     ((=daikanwa	  . 02513)	; &M-02513;
+    (ideographic-structure
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (=ucs		  . #x2FFB)	; â¿»
+      )
+     ((=ucs		  . #x52F9)	; 勹
       )
-     ((=ucs@iso		  . #x208D1)	; &U-000208D1;
+     ((=ucs		  . #x5143)	; 元
+      ))
+    (=ucs@iso		. #x208D1)	; &M-02513;
+    (=daikanwa		. 02513)	; &M-02513;
+    (->subsumptive
+     ((==ucs@iso	  . #x208D1)	; &g2-M-02513;
+      (==daikanwa	  . 02513)	; &g2-M-02513;
+      (->subsumptive
+       ((===daikanwa	    . 02513)	; &R-M-02513;
+	)
+       ((===ucs@iso	    . #x208D1)	; &R-U-000208D1;
+	))
       ))
     ))
 (define-char
@@ -1156,7 +1279,20 @@
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x5143)	; 元
+      ))
+    (=ucs@cns		. #x208D1)	; &C5-2234;
     (=cns11643-5	. #x2234)	; &C5-2234; [02-20]
+    (->subsumptive
+     ((==ucs@cns	  . #x208D1)	; &g2-CU+208D1;
+      (==cns11643-5	  . #x2234)	; &g2-CU+208D1; [02-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -1168,6 +1304,49 @@
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (=>big5-cdp		. #x8C40)	; &A-CDP-8C40;
+    ))
+(define-char
+  '((<-denotational
+     ((=>big5-cdp	  . #x8C40)	; &A-CDP-8C40;
+      ))
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=big5-cdp	  . #x8873)	; &CDP-8873;
+      )
+     ((=ucs		  . #x706C)	; 灬
+      ))
+    (=big5-cdp-itaiji-001 . #x8C40)	; &CDP-i001-8C40;
+    ))
+(define-char
+  '((<-denotational
+     ((=>big5-cdp	  . #x8C40)	; &A-CDP-8C40;
+      ))
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x706C)	; 灬
+      ))
+    (=big5-cdp		. #x8C40)	; &CDP-8C40;
+    (->subsumptive
+     ((==big5-cdp	  . #x8C40)	; &g2-CDP-8C40;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (hanyu-dazidian	1 258 7)
@@ -1417,6 +1596,23 @@
     (=jef-china3	. #x45A7)	; &I-JC3-45A7;
     ))
 (define-char
+  '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x52FF)	; 勿
+      )
+     ((=ucs		  . #x52FF)	; 勿
+      ))
+    (=ucs-itaiji-001	. #x8C9D)	; &U-i001+8C9D;
+    (<-ancient
+     ((=ucs		  . #x8C9D)	; 貝
+      ))
+    ))
+(define-char
   '((ideographic-radical@ucs . 20)	; ⼓
     (ideographic-strokes@ucs . 7)
     (ideographic-radical@ucs*sources
@@ -2000,8 +2196,8 @@
       )
      ((=ucs		  . #x52F9)	; 勹
       )
-     ((=ucs@unicode	  . #x8345)	; &AJ1-06354;
-      (=adobe-japan1-0	  . 06354)	; &AJ1-06354;
+     ((=ucs@unicode	  . #x8345)	; &MJ021865;
+      (=mj		  . 021865)	; &MJ021865;
       ))
     (=ucs@unicode	. #x5312)	; &UU+5312;
     (->subsumptive