X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R115-Grain.el;h=59934d263e7007adffbc8e87338566c94939573b;hb=2d4e6297ef09f2ce1842258190b5f0551520ba48;hp=1c5fddc1a05f1977f1995e3bb2b8ef73e78ddd56;hpb=d51375325f61bb809ab25f70e2ee85850cf263eb;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R115-Grain.el b/lisp/utf-2000/Ideograph-R115-Grain.el
index 1c5fddc..59934d2 100644
--- a/lisp/utf-2000/Ideograph-R115-Grain.el
+++ b/lisp/utf-2000/Ideograph-R115-Grain.el
@@ -49,16 +49,6 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x79BE)	; 禾
-      ))
-    (ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 0)
-    (total-strokes	 . 5)
-    (=gt-k		. 00899)	; &GT-K00899;
-    (=gt-pj-k1		. #x345F)	; &GT-K00899; [20-63]
-    ))
-(define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
@@ -67,10 +57,28 @@
     (=daikanwa		. 24907)	; &I-M-24907;
     ))
 (define-char
-  '((ideographic-radical . 115)	; â½²
+  '((<-denotational
+     ((=ucs		  . #x79BE)	; 禾
+      ))
+    (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
-    (=daikanwa		. 24908)	; &M-24908;
+    (=gt-k		. 00899)	; &M-24908;
+    (=gt-pj-k1		. #x345F)	; &M-24908; [20-63]
+    (=daikanwa		. 24908)	; &I-M-24908;
+    (<-formed@component/connect-right
+     ((=ucs		  . #x79BE)	; 禾
+      ))
+    (->subsumptive
+     ((==daikanwa	  . 24908)	; &g2-M-24908;
+      )
+     ((==gt-k		  . 00899)	; &g2-GT-K00899;
+      (==gt-pj-k1	  . #x345F)	; &g2-GT-K00899; [20-63]
+      (<-identical@component/connect-right
+       ((=gt-k		    . 00899)	; &M-24908;
+	(=daikanwa	    . 24908)	; &I-M-24908;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -82,8 +90,42 @@
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
+    (==>ucs@bucs	. #x79BF)	; &BUCS+79BF;
+    ))
+(define-char
+  '((<-denotational
+     ((==>ucs@bucs	  . #x79BF)	; &BUCS+79BF;
+      ))
+    (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 2)
     (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=>ucs@component	  . #x51E0)	; &A-compU+51E0;
+      (=>iwds-1		  .  0119)	; &A-compU+51E0;
+      ))
+    (=>ucs@iwds-1	. #x79BF)	; &A-IWDSU+79BF;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x79BF)	; &A-IWDSU+79BF;
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 2)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs		  . #x513F)	; 儿
+      ))
+    (sound@ja/on	"toku")
     (=ucs		. #x79BF)	; 禿
     (=adobe-japan1-0	. 03229)	; &I-AJ1-03229;
     (=jis-x0208		. #x4645)	; &I-J90-4645; [38-37]
@@ -95,7 +137,68 @@
     (=gt-k		. 02621)	; &I-GT-K02621;
     (=gt-pj-1		. #x4645)	; &I-GT-32132; [38-37]
     (=daikanwa		. 24910)	; &I-M-24910;
-    (=shinjigen@rev	.  5591)	; 禿
+    (=shinjigen		.  5591)	; 禿
+    (->subsumptive
+     ((==ucs@unicode	  . #x79BF)	; &g2-AJ1-03229;
+      (==adobe-japan1-0	  . 03229)	; &g2-AJ1-03229;
+      (==ks-x1001	  . #x543E)	; &g2-AJ1-03229; [52-30]
+      (==jis-x0208	  . #x4645)	; &g2-AJ1-03229; [38-37]
+      (==cns11643-1	  . #x4B35)	; &g2-AJ1-03229; [43-21]
+      (==jis-x0213-1	  . #x4645)	; &g2-AJ1-03229; [38-37]
+      (==gt		  . 32132)	; &g2-AJ1-03229;
+      (==gt-k		  . 02621)	; &g2-AJ1-03229;
+      (==daikanwa	  . 24910)	; &g2-AJ1-03229;
+      (==shinjigen	  .  5591)	; &g2-AJ1-03229;
+      (->subsumptive
+       ((===daikanwa	    . 24910)	; &R-M-24910;
+	)
+       ((===jis-x0208	    . #x4645)	; &R-J0-4645; [38-37]
+	(===jis-x0213-1	    . #x4645)	; &R-J0-4645; [38-37]
+	)
+       ((===adobe-japan1-0  . 03229)	; &R-AJ1-03229;
+	)
+       ((===cns11643-1	    . #x4B35)	; &R-C1-4B35; [43-21]
+	)
+       ((===gt		    . 32132)	; &R-GT-32132;
+	(===gt-k	    . 02621)	; &R-GT-32132;
+	)
+       ((===ucs@ks	    . #x79BF)	; &R-K0-543E;
+	(===ks-x1001	    . #x543E)	; &R-K0-543E; [52-30]
+	)
+       ((===ucs@unicode	    . #x79BF)	; &R-UU+79BF;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x79BF)	; &A-IWDSU+79BF;
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes@cns . 3)
+    (total-strokes@cns	     . 8)
+    (ideographic-strokes . 2)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs		  . #x51E0)	; 几
+      ))
+    (=ucs		. #x79C3)	; 秃
+    (=gb2312		. #x4D3A)	; &I-G0-4D3A; [45-26]
+    (=cns11643-3	. #x2A3E)	; &I-C3-2A3E; [10-30]
+    (->subsumptive
+     ((==ucs@unicode	  . #x79C3)	; &g2-UU+79C3;
+      (==gb2312		  . #x4D3A)	; &g2-UU+79C3; [45-26]
+      (->subsumptive
+       ((===ucs@unicode	    . #x79C3)	; &R-UU+79C3;
+	))
+      )
+     ((==ucs@cns	  . #x79C3)	; &g2-CU+79C3;
+      (==cns11643-3	  . #x2A3E)	; &g2-CU+79C3; [10-30]
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -256,13 +359,6 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 2)
     (total-strokes	 . 7)
-    (=ucs		. #x79C3)	; 秃
-    (=gb2312		. #x4D3A)	; &I-G0-4D3A; [45-26]
-    ))
-(define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 2)
-    (total-strokes	 . 7)
     (=ucs		. #x25750)	; 𥝐
     (=cns11643-6	. #x286F)	; &I-C6-286F; [08-79]
     ))
@@ -566,7 +662,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=gt-k		    . 00899)	; &GT-K00899;
+       ((==gt-k		    . 00899)	; &g2-GT-K00899;
 	)
        ((==ucs@unicode	    . #x4E5F)	; &g2-AJ1-03829;
 	(==adobe-japan1-0   . 03829)	; &g2-AJ1-03829;
@@ -583,7 +679,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=gt-k		    . 00899)	; &GT-K00899;
+       ((==gt-k		    . 00899)	; &g2-GT-K00899;
 	)
        ((==ucs@cns	    . #x4E5F)	; &g2-CU+4E5F;
 	(==cns11643-1	    . #x443E)	; &g2-CU+4E5F; [36-30]
@@ -638,13 +734,6 @@
     (=cns11643-3	. #x2A40)	; &I-C3-2A40; [10-32]
     ))
 (define-char
-  '((=>ucs		. #x79C3)	; 秃
-    (ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 3)
-    (total-strokes	 . 8)
-    (=cns11643-3	. #x2A3E)	; &C3-2A3E; [10-30]
-    ))
-(define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
@@ -1290,9 +1379,11 @@
       )
      ((=ucs		  . #x5C24)	; å°¤
       ))
-    (=cbeta		. 08298)	; &CB08298;
+    (=ucs		. #x2E0B1)	; 𮂱
+    (=cbeta		. 08298)	; &I-CB08298;
     (->subsumptive
-     ((==cbeta		  . 08298)	; &g2-CB08298;
+     ((==ucs@JP/hanazono  . #x2E0B1)	; &g2-CB08298;
+      (==cbeta		  . 08298)	; &g2-CB08298;
       ))
     ))
 (define-char
@@ -2215,6 +2306,32 @@
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
+    (=ucs		. #x257A4)	; 𥞤
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x257A4)	; 𥞤
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8D44)	; &CDP-8D44;
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
+    (=gt-k		. 07493)	; &GT-K07493;
+    (=gt-pj-k1		. #x5326)	; &GT-K07493; [51-06]
+    (->subsumptive
+     ((==gt-k		  . 07493)	; &g2-GT-K07493;
+      (==gt-pj-k1	  . #x5326)	; &g2-GT-K07493; [51-06]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x79F1)	; 秱
@@ -2456,10 +2573,19 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
+    (=+>ucs@cns		. #x4143)	; &o-CU+4143;
     (->subsumptive
      ((=daikanwa	  . 25040)	; &M-25040;
+      (->subsumptive
+       ((==daikanwa	    . 25040)	; &g2-M-25040;
+	))
       )
-     ((=cns11643-4	  . #x336B)	; &C4-336B; [19-75]
+     ((=ucs@cns		  . #x4143)	; &C4-336B;
+      (=cns11643-4	  . #x336B)	; &C4-336B; [19-75]
+      (->subsumptive
+       ((==ucs@cns	    . #x4143)	; &g2-CU+4143;
+	(==cns11643-4	    . #x336B)	; &g2-CU+4143; [19-75]
+	))
       ))
     ))
 (define-char
@@ -2470,6 +2596,12 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs@unicode	. #x4143)	; &UU+4143;
+    (->subsumptive
+     ((==ucs@unicode	  . #x4143)	; &g2-UU+4143;
+      (->subsumptive
+       ((===ucs@unicode	    . #x4143)	; &R-UU+4143;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -2773,6 +2905,33 @@
     (=cns11643-5	. #x3437)	; &I-C5-3437; [20-23]
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x257A4)	; 𥞤
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8D44)	; &CDP-8D44;
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      ))
+    (=ucs@iso		. #x257A4)	; &CDP-8D78;
+    (=big5-cdp		. #x8D78)	; &CDP-8D78;
+    (->subsumptive
+     ((==ucs@iso	  . #x257A4)	; &g2-CDP-8D78;
+      (==big5-cdp	  . #x8D78)	; &g2-CDP-8D78;
+      (->subsumptive
+       ((===big5-cdp	    . #x8D78)	; &R-CDP-8D78;
+	)
+       ((===ucs@iso	    . #x257A4)	; &R-U-000257A4;
+	))
+      ))
+    ))
+(define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
@@ -3061,6 +3220,16 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs		  . #x590B)	; 夋
+      ))
+    (sound@ja/on/go	"siki")
+    (sound@ja/on/kan	"syoku")
     (=ucs		. #x7A04)	; 稄
     (=big5		. #xDADA)	; &I-B-DADA;
     ))
@@ -3071,10 +3240,31 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs@cns		  . #x590C)	; &C2-2623;
+      (=cns11643-2	  . #x2623)	; &C2-2623; [06-03]
+      (=daikanwa	  . 05714)	; &I-M-05714;
+      ))
+    (=ucs@cns		. #x7A04)	; &C2-3E5E;
+    (=cns11643-2	. #x3E5E)	; &C2-3E5E; [30-62]
+    (=daikanwa		. 25069)	; &I-M-25069;
+    (->formed
+     ((=ucs@iso		  . #x257D4)	; &C5-4132;
+      (=cns11643-5	  . #x4132)	; &C5-4132; [33-18]
+      (=daikanwa	  . 25128)	; &I-M-25128;
+      ))
+    (->formed*sources
+     guangyun daikanwa)
     (->subsumptive
-     ((=daikanwa	  . 25069)	; &M-25069;
+     ((==daikanwa	  . 25069)	; &g2-M-25069;
       )
-     ((=cns11643-2	  . #x3E5E)	; &C2-3E5E; [30-62]
+     ((==ucs@cns	  . #x7A04)	; &g2-CU+7A04;
+      (==cns11643-2	  . #x3E5E)	; &g2-CU+7A04; [30-62]
       ))
     ))
 (define-char
@@ -3084,7 +3274,20 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs@unicode	  . #x590B)	; &AJ1-08425;
+      (=adobe-japan1-2	  . 08425)	; &AJ1-08425;
+      ))
     (=ucs@unicode	. #x7A04)	; &UU+7A04;
+    (->subsumptive
+     ((==ucs@unicode	  . #x7A04)	; &g2-UU+7A04;
+      (==ucs@JP/hanazono  . nil)
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -3368,7 +3571,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=gt-k		    . 00899)	; &GT-K00899;
+       ((==gt-k		    . 00899)	; &g2-GT-K00899;
 	)
        ((==ucs@cns	    . #x5448)	; &g2-MJ008132;
 	(==mj		    . 008132)	; &g2-MJ008132;
@@ -3382,7 +3585,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=gt-k		    . 00899)	; &GT-K00899;
+       ((==gt-k		    . 00899)	; &g2-GT-K00899;
 	)
        ((==adobe-japan1-4   . 13942)	; &g2-AJ1-13942;
 	))
@@ -4276,13 +4479,57 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs		  . #x23173)	; 𣅳
+      ))
     (=ucs		. #x257D4)	; 𥟔
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x257D4)	; 𥟔
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs@iso		  . #x23173)	; &C6-2B72;
+      (=cns11643-6	  . #x2B72)	; &C6-2B72; [11-82]
+      (=daikanwa	  . 13787)	; &I-M-13787;
+      ))
+    (=ucs@iso		. #x257D4)	; &C5-4132;
+    (=cns11643-5	. #x4132)	; &C5-4132; [33-18]
+    (=daikanwa		. 25128)	; &I-M-25128;
+    (<-formed
+     ((=ucs@cns		  . #x7A04)	; &C2-3E5E;
+      (=cns11643-2	  . #x3E5E)	; &C2-3E5E; [30-62]
+      (=daikanwa	  . 25069)	; &I-M-25069;
+      ))
+    (<-formed*sources
+     guangyun)
+    (<-same
+     ((=ucs@cns		  . #x7A04)	; &C2-3E5E;
+      (=cns11643-2	  . #x3E5E)	; &C2-3E5E; [30-62]
+      (=daikanwa	  . 25069)	; &I-M-25069;
+      ))
+    (<-same*sources
+     guangyun daikanwa)
     (->subsumptive
-     ((=daikanwa	  . 25128)	; &M-25128;
+     ((==daikanwa	  . 25128)	; &g2-M-25128;
       )
-     ((=ucs@iso		  . #x257D4)	; &U-000257D4;
+     ((==ucs@iso	  . #x257D4)	; &g2-IU-000257D4;
       )
-     ((=cns11643-5	  . #x4132)	; &C5-4132; [33-18]
+     ((==ucs@cns	  . #x257D4)	; &g2-CU+257D4;
+      (==cns11643-5	  . #x4132)	; &g2-CU+257D4; [33-18]
       ))
     ))
 (define-char
@@ -4429,7 +4676,8 @@
       )
      ((=ucs		  . #x79BE)	; 禾
       )
-     ((=>jis-x0208@1997	  . #x5675)	; &J97-5675; [54-85]
+     ((=>ucs@iwds-1	  . #x5E77)	; &J97-5675;
+      (=>jis-x0208@1997	  . #x5675)	; &J97-5675; [54-85]
       ))
     (=ucs		. #x257A9)	; 𥞩
     ))
@@ -4454,7 +4702,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=gt-k		    . 00899)	; &GT-K00899;
+       ((==gt-k		    . 00899)	; &g2-GT-K00899;
 	)
        ((==ucs@jis	    . #x5E77)	; &g2-AJ1-19346;
 	(==ucs@ks	    . #x5E77)	; &g2-AJ1-19346;
@@ -4857,7 +5105,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=gt-k		    . 00899)	; &GT-K00899;
+       ((==gt-k		    . 00899)	; &g2-GT-K00899;
 	)
        ((==ucs@unicode	    . #x6241)	; &g2-UU+6241;
 	))
@@ -4961,14 +5209,58 @@
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs		  . #x7550)	; 畐
+      ))
+    (sound@ja/on/go	"hiki")
+    (sound@ja/on/kan	"hyoku")
+    (=ucs		. #x7A2B)	; 稫
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7A2B)	; 稫
+      ))
+    (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (=ucs		. #x7A2B)	; 稫
-    (=jis-x0212		. #x5136)	; &I-JSP-5136; [49-22]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs@unicode	  . #x7550)	; &AJ1-18129;
+      (=adobe-japan1-5	  . 18129)	; &AJ1-18129;
+      ))
+    (=ucs@unicode	. #x7A2B)	; &JSP-5136;
+    (=jis-x0212		. #x5136)	; &JSP-5136; [49-22]
     (=cns11643-2	. #x4C4B)	; &I-C2-4C4B; [44-43]
     (=big5		. #xE344)	; &I-B-E344;
     (=daikanwa		. 25164)	; &I-M-25164;
     (=jef-china3	. #x5DB6)	; &I-JC3-5DB6;
+    (->subsumptive
+     ((==ucs@unicode	  . #x7A2B)	; &g2-JSP-5136;
+      (==jis-x0212	  . #x5136)	; &g2-JSP-5136; [49-22]
+      (==cns11643-2	  . #x4C4B)	; &g2-JSP-5136; [44-43]
+      (==daikanwa	  . 25164)	; &g2-JSP-5136;
+      (==jef-china3	  . #x5DB6)	; &g2-JSP-5136;
+      (->subsumptive
+       ((===daikanwa	    . 25164)	; &R-M-25164;
+	)
+       ((===jis-x0212	    . #x5136)	; &R-JSP-5136; [49-22]
+	)
+       ((===cns11643-2	    . #x4C4B)	; &R-C2-4C4B; [44-43]
+	)
+       ((===jef-china3	    . #x5DB6)	; &R-JC3-5DB6;
+	)
+       ((===ucs@unicode	    . #x7A2B)	; &R-UU+7A2B;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -5461,7 +5753,7 @@
       )
      ((=ucs		  . #x79BE)	; 禾
       )
-     ((=gt-k		  . 06065)	; &GT-K06065;
+     ((=gt-k		  . 06065)	; &U-v001+8200;
       ))
     (=ucs@unicode	. #x7A32)	; &AJ1-01204;
     (=adobe-japan1-0	. 01204)	; &AJ1-01204;
@@ -5521,7 +5813,7 @@
     (=>ucs*		. #x7A40)	; 穀
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 9)
-    (japanese-strokes	 . 14)
+    (total-strokes	 . 14)
     (=ucs		. #x2F959)	; 穀
     (=ucs@jis		. #x7A40)	; 穀
     (=adobe-japan1-0	. 02052)	; &I-AJ1-02052;
@@ -5567,6 +5859,23 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x7A40)	; 穀
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=gt-k		  . 07493)	; &GT-K07493;
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
+    (=ucs-itaiji-001	. #x7A40)	; &U-i001+7A40;
+    ))
+(define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
@@ -6954,19 +7263,21 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=cbeta		  . 08298)	; &CB08298;
+     ((=ucs		  . #x2E0B1)	; 𮂱
       )
      ((=ucs		  . #x23140)	; 𣅀
       ))
-    (=mj		. 058231)	; &MJ058231;
-    (=koseki		. 282550)	; &MJ058231;
+    (=ucs		. #x2E0DB)	; 𮃛
+    (=mj		. 058231)	; &I-MJ058231;
+    (=koseki		. 282550)	; 𮃛
     (<-formed
      ((=ucs		  . #x25874)	; 𥡴
       )
      ((=ucs		  . #x7A3D)	; 稽
       ))
     (->subsumptive
-     ((==mj		  . 058231)	; &g2-MJ058231;
+     ((==ucs@JP/hanazono  . #x2E0DB)	; &g2-MJ058231;
+      (==mj		  . 058231)	; &g2-MJ058231;
       (==koseki		  . 282550)	; &g2-MJ058231;
       (->subsumptive
        ((===hng-khm	    . 01020)	; &HNG011-01020;
@@ -7117,14 +7428,34 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
     (=ucs		. #x25864)	; 𥡤
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25864)	; 𥡤
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=ucs@iso		. #x25864)	; &M-25247;
+    (=daikanwa		. 25247)	; &M-25247;
     (->subsumptive
-     ((->subsumptive
-       ((=daikanwa	    . 25247)	; &M-25247;
-	)
-       ((=ucs@iso	    . #x25864)	; &U-00025864;
-	))
+     ((==daikanwa	  . 25247)	; &g2-M-25247;
       )
-     ((=cns11643-5	  . #x563E)	; &C5-563E; [54-30]
+     ((==ucs@iso	  . #x25864)	; &g2-IU-00025864;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25864)	; 𥡤
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=ucs@cns		. #x25864)	; &C5-563E;
+    (=cns11643-5	. #x563E)	; &C5-563E; [54-30]
+    (->subsumptive
+     ((==ucs@cns	  . #x25864)	; &g2-CU+25864;
+      (==cns11643-5	  . #x563E)	; &g2-CU+25864; [54-30]
       ))
     ))
 (define-char
@@ -7911,7 +8242,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=cbeta		  . 08298)	; &CB08298;
+     ((=ucs		  . #x2E0B1)	; 𮂱
       )
      ((=ucs		  . #x65E8)	; 旨
       ))
@@ -7931,7 +8262,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=cbeta		  . 08298)	; &CB08298;
+     ((=ucs		  . #x2E0B1)	; 𮂱
       )
      ((=ucs		  . #x3AD6)	; 㫖
       ))
@@ -8031,19 +8362,58 @@
       )
      ((=ucs		  . #x79BE)	; 禾
       )
+     ((=>ucs-itaiji-001	  . #x21569)	; &A-U-i001+21569;
+      ))
+    (=ucs		. #x25884)	; 𥢄
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25884)	; 𥢄
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs-itaiji-001	  . #x21569)	; &U-i001+21569;
+      ))
+    (=ucs@iso		. #x25884)	; &U-00025884;
+    (->subsumptive
+     ((==ucs@iso	  . #x25884)	; &g2-IU-00025884;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
      ((=ucs		  . #x9B5A)	; 魚
       ))
     (sound@ja/on	"so")
-    (=mj		. 058233)	; &MJ058233;
-    (=koseki		. 283040)	; &MJ058233;
+    (=ucs		. #x2E0E3)	; 𮃣
+    (=mj		. 058233)	; &I-MJ058233;
+    (=koseki		. 283040)	; 𮃣
     (<-formed
      ((=ucs		  . #x7A4C)	; 穌
       ))
     (<-formed*sources
      koseki)
     (->subsumptive
-     ((==mj		  . 058233)	; &g2-MJ058233;
+     ((==ucs@JP/hanazono  . #x2E0E3)	; &g2-MJ058233;
+      (==mj		  . 058233)	; &g2-MJ058233;
       (==koseki		  . 283040)	; &g2-MJ058233;
+      (->subsumptive
+       ((===mj		    . 058233)	; &R-MJ058233;
+	))
       ))
     ))
 (define-char
@@ -9411,10 +9781,27 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (->subsumptive
-     ((=daikanwa	  . 25346)	; &M-25346;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=cns11643-1	  . #x7857)	; &C1-7857; [88-55]
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=big5-cdp	  . #x8CB0)	; &GT-42188;
+      (=daikanwa	  . 31582)	; &I-M-31582;
+      ))
+    (=ucs@cns		. #x7A6B)	; &C1-7857;
+    (=cns11643-1	. #x7857)	; &C1-7857; [88-55]
+    (=daikanwa		. 25346)	; &I-M-25346;
+    (->subsumptive
+     ((==ucs@cns	  . #x7A6B)	; &g2-M-25346;
+      (==cns11643-1	  . #x7857)	; &g2-M-25346; [88-55]
+      (==daikanwa	  . 25346)	; &g2-M-25346;
+      (->subsumptive
+       ((===daikanwa	    . 25346)	; &R-M-25346;
+	)
+       ((===cns11643-1	    . #x7857)	; &R-C1-7857; [88-55]
+	))
       ))
     ))
 (define-char
@@ -9494,6 +9881,14 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs		  . #x7FDF)	; 翟
+      ))
     (=ucs		. #x258DE)	; 𥣞
     ))
 (define-char
@@ -9503,7 +9898,25 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs@jis		  . #x7FDF)	; &JX1-7A40;
+      (=ks-x1001	  . #x6E61)	; &JX1-7A40; [78-65]
+      (=jis-x0212	  . #x553C)	; &I-JSP-553C; [53-28]
+      (=jis-x0213-1	  . #x7A40)	; &I-JX1-7A40; [90-32]
+      (=daikanwa	  . 28727)	; &I-M-28727;
+      ))
     (=daikanwa		. 25352)	; &M-25352;
+    (<-formed
+     ((=daikanwa	  . 27172)	; &M-27172;
+      ))
+    (->subsumptive
+     ((==daikanwa	  . 25352)	; &g2-M-25352;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -9512,8 +9925,27 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs@unicode	  . #x7FDF)	; &C1-6A4B;
+      (=gb2312		  . #x3554)	; &C1-6A4B; [21-52]
+      (=cns11643-1	  . #x6A4B)	; &I-C1-6A4B; [74-43]
+      ))
     (=ucs@iso		. #x258DE)	; &C4-6046;
     (=cns11643-4	. #x6046)	; &C4-6046; [64-38]
+    (->subsumptive
+     ((==ucs@iso	  . #x258DE)	; &g2-IU-000258DE;
+      (==cns11643-4	  . #x6046)	; &g2-IU-000258DE; [64-38]
+      (->subsumptive
+       ((===cns11643-4	    . #x6046)	; &R-C4-6046; [64-38]
+	)
+       ((===ucs@iso	    . #x258DE)	; &R-U-000258DE;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -10535,6 +10967,23 @@
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 19)
+    (total-strokes	 . 24)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79BE)	; 禾
+      )
+     ((=ucs-itaiji-005	  . #x9F9C)	; &U-i005+9F9C;
+      ))
+    (=ucs-itaiji-001	. #x9F9D)	; &U-i001+9F9D;
+    (<-formed@component
+     ((=ucs		  . #x9F9D)	; 龝
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 20)
     (total-strokes	 . 25)
     (=ucs		. #x25917)	; 𥤗