X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Futf-2000%2FIdeograph-R201-Yellow.el;h=0b6751001bb97623789f08bf11569548688b0a56;hb=4ada388660dba5a2c6f57986d3e35c85d7c1da97;hp=4d0bda5d5158a8c103e05bd2b92238f1c480d8ad;hpb=7010540f14e40253fa243ef6db1b72cf114b3961;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R201-Yellow.el b/lisp/utf-2000/Ideograph-R201-Yellow.el
index 4d0bda5..0b67510 100644
--- a/lisp/utf-2000/Ideograph-R201-Yellow.el
+++ b/lisp/utf-2000/Ideograph-R201-Yellow.el
@@ -34,19 +34,43 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 11)
     (=ucs		. #x9EC4)	; 黄
-    (=jis-x0208		. #x322B)	; &I-J90-322B; [18-11]
-    (=gb2312		. #x3B46)	; &I-G0-3B46; [27-38]
-    (=cns11643-3	. #x396A)	; &I-C3-396A; [25-74]
-    (=jis-x0213-1	. #x322B)	; &I-JX1-322B; [18-11]
-    (=gt		. 65323)	; &I-GT-65323;
-    (=gt-k		. 07722)	; &I-GT-K07722;
-    (=gt-pj-1		. #x322B)	; &I-GT-65323; [18-11]
-    (=daikanwa/+p	. 47926)	; 黄
-    (<-simplified@JP/Jouyou
-     ((=ucs@unicode	  . #x9EC3)	; &GT-65324;
-      (=ks-x1001	  . #x7C5C)	; &GT-65324; [92-60]
-      (=jis-x0213-1	  . #x7E71)	; &I-JX1-7E71; [94-81]
-      (=daikanwa	  . 47926)	; &I-M-47926;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=gt-k		    . 00694)	; &GT-K00694;
+	)
+       ((=ucs		    . #x7531)	; 由
+	)
+       ((=gt-k		    . 00059)	; &GT-K00059;
+	))
+      (=ucs@unicode	  . #x9EC4)	; &GT-65323;
+      (=jis-x0208	  . #x322B)	; &GT-65323; [18-11]
+      (=gb2312		  . #x3B46)	; &I-G0-3B46; [27-38]
+      (=jis-x0213-1	  . #x322B)	; &I-JX1-322B; [18-11]
+      (=gt		  . 65323)	; &I-GT-65323;
+      (=gt-k		  . 07722)	; &I-GT-K07722;
+      (=gt-pj-1		  . #x322B)	; &I-GT-65323; [18-11]
+      (=daikanwa/+p	  . 47926)	; &GT-65323;
+      (<-simplified@JP/Jouyou
+       ((=ucs@unicode	    . #x9EC3)	; &GT-65324;
+	(=ks-x1001	    . #x7C5C)	; &GT-65324; [92-60]
+	(=jis-x0213-1	    . #x7E71)	; &I-JX1-7E71; [94-81]
+	(=daikanwa	    . 47926)	; &I-M-47926;
+	))
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=gt-k		    . 00694)	; &GT-K00694;
+	)
+       ((=ucs		    . #x7530)	; 田
+	)
+       ((=gt-k		    . 00059)	; &GT-K00059;
+	))
+      (=cns11643-3	  . #x396A)	; &C3-396A; [25-74]
       ))
     ))
 (define-char
@@ -583,13 +607,13 @@
     (->subsumptive
      ((=daikanwa	  . 47956)	; &M-47956;
       )
-     ((=>>ucs@iso	  . #x2A3CB)	; &C7-5254;
-      (=ucs@iso		  . #x2A3CB)	; &C7-5254;
+     ((=ucs@iso		  . #x2A3CB)	; &C7-5254;
       (=cns11643-7	  . #x5254)	; &C7-5254; [50-52]
       (->subsumptive
-       ((==ucs@iso	    . #x2A3CB)	; &R-U-0002A3CB;
+       ((==ucs@iso	    . #x2A3CB)	; &g2-IU-0002A3CB;
 	)
-       ((==cns11643-7	    . #x5254)	; &R-C7-5254; [50-52]
+       ((==ucs@cns	    . #x2A3CB)	; &g2-CU+2A3CB;
+	(==cns11643-7	    . #x5254)	; &g2-CU+2A3CB; [50-52]
 	))
       ))
     ))
@@ -613,13 +637,13 @@
     (->subsumptive
      ((=daikanwa	  . 47958)	; &M-47958;
       )
-     ((=>>ucs@iso	  . #x2A3CD)	; &C7-5256;
-      (=ucs@iso		  . #x2A3CD)	; &C7-5256;
+     ((=ucs@iso		  . #x2A3CD)	; &C7-5256;
       (=cns11643-7	  . #x5256)	; &C7-5256; [50-54]
       (->subsumptive
-       ((==ucs@iso	    . #x2A3CD)	; &R-U-0002A3CD;
+       ((==ucs@iso	    . #x2A3CD)	; &g2-IU-0002A3CD;
 	)
-       ((==cns11643-7	    . #x5256)	; &R-C7-5256; [50-54]
+       ((==ucs@cns	    . #x2A3CD)	; &g2-CU+2A3CD;
+	(==cns11643-7	    . #x5256)	; &g2-CU+2A3CD; [50-54]
 	))
       ))
     ))
@@ -772,13 +796,16 @@
     (->subsumptive
      ((=daikanwa	  . 47973)	; &M-47973;
       )
-     ((=>>ucs@iso	  . #x2A3DC)	; &C7-5B23;
-      (=ucs@iso		  . #x2A3DC)	; &C7-5B23;
+     ((=ucs@iso		  . #x2A3DC)	; &C7-5B23;
       (=cns11643-7	  . #x5B23)	; &C7-5B23; [59-03]
       (->subsumptive
-       ((==cns11643-7	    . #x5B23)	; &R-C7-5B23; [59-03]
-	)
-       ((==ucs@iso	    . #x2A3DC)	; &R-U-0002A3DC;
+       ((==ucs@iso	    . #x2A3DC)	; &g2-IU-0002A3DC;
+	(==cns11643-7	    . #x5B23)	; &g2-IU-0002A3DC; [59-03]
+	(->subsumptive
+	 ((===cns11643-7      . #x5B23)	; &R-C7-5B23; [59-03]
+	  )
+	 ((===ucs@iso	      . #x2A3DC)	; &R-U-0002A3DC;
+	  ))
 	))
       ))
     ))
@@ -987,13 +1014,13 @@
     (ideographic-radical . 201)	; ⿈
     (ideographic-strokes . 13)
     (total-strokes	 . 25)
-    (=>>ucs@iso		. #x2A3E7)	; &C7-6179;
     (=ucs@iso		. #x2A3E7)	; &C7-6179;
     (=cns11643-7	. #x6179)	; &C7-6179; [65-89]
     (->subsumptive
-     ((==ucs@iso	  . #x2A3E7)	; &R-U-0002A3E7;
+     ((==ucs@iso	  . #x2A3E7)	; &g2-IU-0002A3E7;
       )
-     ((==cns11643-7	  . #x6179)	; &R-C7-6179; [65-89]
+     ((==ucs@cns	  . #x2A3E7)	; &g2-CU+2A3E7;
+      (==cns11643-7	  . #x6179)	; &g2-CU+2A3E7; [65-89]
       ))
     ))
 (define-char