X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R072-Sun.el;h=cf73980719441cbede92877b798bfde020b396f9;hb=8767b0c2806633bdfda364e8f32a3c4c03e6ec31;hp=b58cab693bb6ca19cb90fbfa40b2de501d063d25;hpb=2d94a69f62892cf2117f8f2812e4fb6144790903;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index b58cab6..cf73980 100644
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -3,7 +3,19 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=>ucs@component	. #x65E5)	; &A-compU+65E5;
+    (=>iwds-1		.  0118)	; &A-compU+65E5;
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 0)
+    (total-strokes	 . 4)
     (=ucs		. #x65E5)	; 日
+    (=mj		. 013151)	; &I-MJ013151;
     (=adobe-japan1-0	. 03284)	; &I-AJ1-03284;
     (=jis-x0208		. #x467C)	; &I-J90-467C; [38-92]
     (=gb2312		. #x4855)	; &I-G0-4855; [40-53]
@@ -11,51 +23,105 @@
     (=cns11643-1	. #x454A)	; &I-C1-454A; [37-42]
     (=jis-x0213-1	. #x467C)	; &I-JX1-467C; [38-92]
     (=big5		. #xA4E9)	; &I-B-A4E9;
+    (=koseki		. 154310)	; 日
     (=gt		. 17359)	; &I-GT-17359;
     (=gt-k		. 00473)	; &I-GT-K00473;
     (=gt-pj-1		. #x467C)	; &I-GT-17359; [38-92]
     (=daikanwa		. 13733)	; &I-M-13733;
     (=shinjigen		.  3263)	; 日
     (->subsumptive
-     ((==daikanwa	  . 13733)	; &g2-M-13733;
-      (=shinjigen	  .  3264)	; &g2-M-13733;
+     ((=mj		  . 013152)	; &MJ013152;
+      (=koseki		  . 154330)	; &MJ013152;
+      (=>>daikanwa	  . 13733)	; &MJ013152;
+      (=shinjigen	  .  3264)	; &MJ013152;
+      (<-formed
+       ((=ucs		    . #x65E5)	; 日
+	(=koseki	    . 154310)	; 日
+	))
+      (<-formed*sources
+       koseki)
       (->subsumptive
-       ((===daikanwa	    . 13733)	; &R-M-13733;
-	))
-      )
-     ((==ucs@unicode	  . #x65E5)	; &g2-GT-17359;
-      (==gb2312		  . #x4855)	; &g2-GT-17359; [40-53]
-      (==ks-x1001	  . #x6C6D)	; &g2-GT-17359; [76-77]
-      (==jis-x0208	  . #x467C)	; &g2-GT-17359; [38-92]
-      (==cns11643-1	  . #x454A)	; &g2-GT-17359; [37-42]
-      (==jis-x0213-1	  . #x467C)	; &g2-GT-17359; [38-92]
-      (==gt		  . 17359)	; &g2-GT-17359;
-      (==gt-k		  . 00473)	; &g2-GT-17359;
-      (==shinjigen	  .  3263)	; &g2-GT-17359;
+       ((==mj		    . 013152)	; &g2-MJ013152;
+	(==daikanwa	    . 13733)	; &g2-MJ013152;
+	(==shinjigen	    .  3264)	; &g2-MJ013152;
+	(->subsumptive
+	 ((===daikanwa	      . 13733)	; &R-M-13733;
+	  )
+	 ((===mj	      . 013152)	; &R-MJ013152;
+	  ))
+	))
+      )
+     ((=>>ucs@unicode	  . #x65E5)	; &G-MJ013151;
+      (=>>mj		  . 013151)	; &G-MJ013151;
+      (=>>adobe-japan1-0  . 03284)	; &G-MJ013151;
+      (=>>jis-x0208	  . #x467C)	; &G-MJ013151; [38-92]
+      (=>>cns11643-1	  . #x454A)	; &G-MJ013151; [37-42]
+      (=>>jis-x0213-1	  . #x467C)	; &G-MJ013151; [38-92]
+      (=>>gt		  . 17359)	; &G-MJ013151;
+      (=>>gt-k		  . 00473)	; &G-MJ013151;
       (->subsumptive
-       ((===jis-x0208	    . #x467C)	; &R-J0-467C; [38-92]
-	(===jis-x0213-1	    . #x467C)	; &R-J0-467C; [38-92]
-	)
-       ((===ucs@ks	    . #x65E5)	; &R-K0-6C6D;
-	(===ks-x1001	    . #x6C6D)	; &R-K0-6C6D; [76-77]
-	)
-       ((===ucs@unicode	    . #x65E5)	; &R-UU+65E5;
-	)
-       ((===cns11643-1	    . #x454A)	; &R-C1-454A; [37-42]
-	)
-       ((===gt		    . 17359)	; &R-GT-17359;
-	(===gt-k	    . 00473)	; &R-GT-17359;
-	)
-       ((===hng-kar	    . 09450)	; &HNG018-09450;
-	)
-       ((===hng-khi	    . 00860)	; &HNG010-00860;
-	)
-       ((===hng-khm	    . 03660)	; &HNG011-03660;
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
+	(==adobe-japan1-0   . 03284)	; &g2-MJ013151;
+	(==gb2312	    . #x4855)	; &g2-MJ013151; [40-53]
+	(==ks-x1001	    . #x6C6D)	; &g2-MJ013151; [76-77]
+	(==jis-x0208	    . #x467C)	; &g2-MJ013151; [38-92]
+	(==cns11643-1	    . #x454A)	; &g2-MJ013151; [37-42]
+	(==jis-x0213-1	    . #x467C)	; &g2-MJ013151; [38-92]
+	(==koseki	    . 154310)	; &g2-MJ013151;
+	(==gt		    . 17359)	; &g2-MJ013151;
+	(==gt-k		    . 00473)	; &g2-MJ013151;
+	(==shinjigen	    .  3263)	; &g2-MJ013151;
+	(->subsumptive
+	 ((===jis-x0208	      . #x467C)	; &R-J0-467C; [38-92]
+	  (===jis-x0213-1     . #x467C)	; &R-J0-467C; [38-92]
+	  )
+	 ((===adobe-japan1-0  . 03284)	; &R-AJ1-03284;
+	  )
+	 ((===mj	      . 013151)	; &R-MJ013151;
+	  )
+	 ((===ucs@ks	      . #x65E5)	; &R-K0-6C6D;
+	  (===ks-x1001	      . #x6C6D)	; &R-K0-6C6D; [76-77]
+	  )
+	 ((===ucs@unicode     . #x65E5)	; &R-UU+65E5;
+	  )
+	 ((===cns11643-1      . #x454A)	; &R-C1-454A; [37-42]
+	  )
+	 ((===gt	      . 17359)	; &R-GT-17359;
+	  (===gt-k	      . 00473)	; &R-GT-17359;
+	  )
+	 ((===hng-kar	      . 09450)	; &HNG018-09450;
+	  )
+	 ((===hng-khi	      . 00860)	; &HNG010-00860;
+	  )
+	 ((===hng-khm	      . 03660)	; &HNG011-03660;
+	  ))
 	))
       ))
     ))
 (define-char
-  '((ideographic-radical . 72)	; ⽇
+  '((<-denotational@component
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 0)
+    (total-strokes	 . 4)
+    (=ucs-var-002	. #x65E5)	; &U-v002+65E5;
+    (->subsumptive
+     ((==ucs-var-002	  . #x65E5)	; &g2-U-v002+65E5;
+      )
+     ((=ucs-var-003	  . #x65E5)	; &U-v003+65E5;
+      )
+     ((=ucs-var-004	  . #x65E5)	; &U-v004+65E5;
+      ))
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>ucs@component	  . #x4E14)	; &A-compU+4E14;
+      (=>iwds-1		  .  0114)	; &A-compU+4E14;
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
     (=ucs		. #x65E6)	; 旦
@@ -70,7 +136,7 @@
     (=gt-k		. 00977)	; &I-GT-K00977;
     (=gt-pj-1		. #x4336)	; &I-GT-17363; [35-22]
     (=daikanwa		. 13734)	; &I-M-13734;
-    (=shinjigen@rev	.  3265)	; 旦
+    (=shinjigen		.  3265)	; 旦
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -255,7 +321,11 @@
     (=daikanwa		. 13740)	; &I-M-13740;
     ))
 (define-char
-  '((ideographic-radical . 72)	; ⽇
+  '((<-denotational@component
+     ((=>ucs@component	  . #x7680)	; &A-compU+7680;
+      (=>iwds-1		  .  0355)	; &A-compU+7680;
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
     (ideographic-structure
@@ -266,6 +336,7 @@
       )
      ((=ucs		  . #x5315)	; 匕
       ))
+    (sound@ja/on	"Eu")
     (=ucs		. #x3AD0)	; 㫐
     (=cns11643-4	. #x2278)	; &I-C4-2278; [02-88]
     (=big5-cdp		. #x8AB7)	; &I-CDP-8AB7;
@@ -681,9 +752,11 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==daikanwa	    . 13733)	; &g2-M-13733;
+       ((==mj		    . 013152)	; &g2-MJ013152;
 	)
-       ((=ucs		    . #x2F828)	; 勺
+       ((==ucs@iso	    . #x2F828)	; &g2-MJ007744;
+	(==ucs@ks	    . #x52FA)	; &g2-MJ007744;
+	(==mj		    . 007744)	; &g2-MJ007744;
 	))
       (==daikanwa	  . 13760)	; &g2-M-13760;
       )
@@ -691,10 +764,12 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
-       ((=ucs		    . #x2F828)	; 勺
+       ((==ucs@iso	    . #x2F828)	; &g2-MJ007744;
+	(==ucs@ks	    . #x52FA)	; &g2-MJ007744;
+	(==mj		    . 007744)	; &g2-MJ007744;
 	))
       (==shinjigen	  .  5201)	; &g2-SJG2-5201;
       ))
@@ -712,11 +787,26 @@
       )
      ((=ucs		  . #x65E5)	; 日
       )
-     ((=ucs		  . #xFA77)	; ï©·
+     ((=ucs@unicode	  . #x52FA)	; &MJ007745;
+      (=mj		  . 007745)	; &MJ007745;
       ))
     (=ucs@unicode	. #x65F3)	; &C2-243B;
+    (=ucs@JP/hanazono	. nil)
     (=cns11643-2	. #x243B)	; &C2-243B; [04-27]
     (=jef-china3	. #x51B9)	; &I-JC3-51B9;
+    (->subsumptive
+     ((==ucs@unicode	  . #x65F3)	; &g2-UU+65F3;
+      (==ucs@JP/hanazono  . nil)
+      (==cns11643-2	  . #x243B)	; &g2-UU+65F3; [04-27]
+      (==jef-china3	  . #x51B9)	; &g2-UU+65F3;
+      (->subsumptive
+       ((===cns11643-2	    . #x243B)	; &R-C2-243B; [04-27]
+	)
+       ((===jef-china3	    . #x51B9)	; &R-JC3-51B9;
+	)
+       ((===ucs@unicode	    . #x65F3)	; &R-UU+65F3;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -930,6 +1020,79 @@
      shinjigen@1ed)
     ))
 (define-char
+  '((ideographic-radical@ucs . 72)	; ⽇
+    (ideographic-radical@daikanwa . 73)	; ⽈
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x5B50)	; 子
+      ))
+    (=ucs		. #x3AD7)	; 㫗
+    (=adobe-japan1-5	. 17758)	; &I-AJ1-17758;
+    (=cns11643-3	. #x2640)	; &I-C3-2640; [06-32]
+    (=jis-x0213-2	. #x2E36)	; &I-JX2-2E36; [14-22]
+    (=daikanwa		. 14285)	; &I-M-14285;
+    (<-original
+     ((=ucs		  . #x539A)	; 厚
+      (=daikanwa	  . 02949)	; &I-M-02949;
+      ))
+    (<-original*sources
+     shuowen shuowen-zhu daikanwa)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x66F0)	; 曰
+	)
+       ((=ucs		    . #x5B50)	; 子
+	))
+      (=>>daikanwa	  . 14285)	; &G-M-14285;
+      (->subsumptive
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((==ucs@unicode      . #x66F0)	; &g2-AJ1-05132;
+	  (==adobe-japan1-0   . 05132)	; &g2-AJ1-05132;
+	  )
+	 ((==ucs@unicode      . #x5B50)	; &g2-AJ1-02208;
+	  (==adobe-japan1-0   . 02208)	; &g2-AJ1-02208;
+	  ))
+	(==daikanwa	    . 14285)	; &g2-M-14285;
+	))
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
+	)
+       ((==ucs@unicode	    . #x5B50)	; &g2-AJ1-02208;
+	(==adobe-japan1-0   . 02208)	; &g2-AJ1-02208;
+	))
+      (==ucs@unicode	  . #x3AD7)	; &g2-AJ1-17758;
+      (==adobe-japan1-5	  . 17758)	; &g2-AJ1-17758;
+      (==cns11643-3	  . #x2640)	; &g2-AJ1-17758; [06-32]
+      (==jis-x0213-2	  . #x2E36)	; &g2-AJ1-17758; [14-22]
+      (->subsumptive
+       ((===jis-x0213-2	    . #x2E36)	; &R-JX2-2E36; [14-22]
+	)
+       ((===adobe-japan1-5  . 17758)	; &R-AJ1-17758;
+	)
+       ((===cns11643-3	    . #x2640)	; &R-C3-2640; [06-32]
+	)
+       ((===ucs@unicode	    . #x3AD7)	; &R-UU+3AD7;
+	))
+      ))
+    ))
+(define-char
   '((<-denotational
      ((=ucs		  . #x573C)	; 圼
       ))
@@ -982,6 +1145,59 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      )
+     ((=>ucs@component	  . #x4E8F)	; &A-compU+4E8F;
+      (=>iwds-1		  .  0093)	; &A-compU+4E8F;
+      ))
+    (=ucs		. #x23158)	; 𣅘
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23158)	; 𣅘
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x4E90)	; 亐
+      ))
+    (=ucs-var-001	. #x23158)	; &U-v001+23158;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23158)	; 𣅘
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x4E8F)	; 亏
+      ))
+    (=ucs@iso		. #x23158)	; &U-00023158;
+    (->subsumptive
+     ((==ucs@iso	  . #x23158)	; &g2-IU-00023158;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
     (=>ucs-itaiji-002	. #x81FD)	; &A-U-i002+81FD;
     ))
 (define-char
@@ -996,11 +1212,11 @@
       )
      ((=ucs		  . #x65E7)	; 旧
       ))
-    (=gt-k		. 03616)	; &GT-K03616;
-    (=>>gt-k		. 03318)	; &GT-K03616;
-    (=gt-pj-k1		. #x5E44)	; &GT-K03616; [62-36]
-    (=ucs-itaiji-002	. #x81FD)	; &GT-K03616;
-    (=ucs-itaiji-003	. #x81FD)	; &GT-K03616;
+    (=gt-k		. 03616)	; &U-i002+81FD;
+    (=>>gt-k		. 03318)	; &U-i002+81FD;
+    (=gt-pj-k1		. #x5E44)	; &U-i002+81FD; [62-36]
+    (=ucs-itaiji-002	. #x81FD)	; &U-i002+81FD;
+    (=ucs-itaiji-003	. #x81FD)	; &U-i002+81FD;
     (<-simplified@component
      ((=ucs		  . #x81FD)	; 臽
       ))
@@ -1017,8 +1233,8 @@
 	)
        ((=ucs		    . #x65E7)	; 旧
 	))
-      (==gt-k		  . 03616)	; &g2-GT-K03616;
-      (==ucs-itaiji-002	  . #x81FD)	; &g2-GT-K03616;
+      (==gt-k		  . 03616)	; &g2-U-i002+81FD;
+      (==ucs-itaiji-002	  . #x81FD)	; &g2-U-i002+81FD;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1032,8 +1248,8 @@
       (=gt-k		  . 03318)	; &GT-K03318;
       (=gt-pj-k1	  . #x357D)	; &GT-K03318; [21-93]
       (->subsumptive
-       ((==gt-k		    . 03318)	; &g2-GT-K03318;
-	(==ucs-itaiji-003   . #x81FD)	; &g2-GT-K03318;
+       ((==gt-k		    . 03318)	; &g2-U-i003+81FD;
+	(==ucs-itaiji-003   . #x81FD)	; &g2-U-i003+81FD;
 	))
       ))
     ))
@@ -1596,7 +1812,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==daikanwa	    . 13733)	; &g2-M-13733;
+       ((==mj		    . 013152)	; &g2-MJ013152;
 	)
        ((==ucs@cns	    . #x53CD)	; &g2-AJ1-03411;
 	(==ucs@jis	    . #x53CD)	; &g2-AJ1-03411;
@@ -1614,8 +1830,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@cns	    . #x53CD)	; &g2-AJ1-03411;
 	(==ucs@jis	    . #x53CD)	; &g2-AJ1-03411;
@@ -1644,8 +1860,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@unicode	    . #x53CD)	; &g2-GT-K00476;
 	))
@@ -1884,7 +2100,7 @@
       )
      ((=ucs		  . #x65E5)	; 日
       )
-     ((=>daikanwa	  . 11696)	; &A-M-11696;
+     ((=>iwds-1		  .  0007)	; &IWDS1-007;
       ))
     (=ucs		. #x6608)	; 昈
     (=big5		. #xCCC8)	; &I-B-CCC8;
@@ -1946,6 +2162,15 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=+>ucs@jis	  . #x6238)	; &o-J0-384D;
+      (=+>jis-x0208	  . #x384D)	; &o-J0-384D; [24-45]
+      ))
     (=ucs@unicode	. #x6608)	; &UU+6608;
     (=ucs@JP/hanazono	. nil)
     (->subsumptive
@@ -1953,8 +2178,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((=ucs		    . #x6237)	; 户
 	))
@@ -2099,6 +2324,15 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x5929)	; &A-compU+5929;
+      (=>iwds-1		  .  0008)	; &A-compU+5929;
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs		. #x660B)	; 昋
     ))
 (define-char
@@ -2108,11 +2342,29 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5929)	; 天
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (=ucs@unicode	. #x660B)	; &M-13800;
+    (=ucs@JP/hanazono	. nil)
+    (=daikanwa		. 13800)	; &M-13800;
+    (=jef-china3	. #x51B1)	; &I-JC3-51B1;
     (->subsumptive
-     ((=ucs@unicode	  . #x660B)	; &M-13800;
-      (=daikanwa	  . 13800)	; &M-13800;
+     ((=>>ucs@unicode	  . #x660B)	; &G-UU+660B;
+      (=>>daikanwa	  . 13800)	; &G-UU+660B;
+      (->subsumptive
+       ((==daikanwa	    . 13800)	; &g2-M-13800;
+	)
+       ((==ucs@unicode	    . #x660B)	; &g2-UU+660B;
+	(==ucs@JP/hanazono  . nil)
+	))
       )
-     ((=jef-china3	  . #x51B1)	; &JC3-51B1;
+     ((==jef-china3	  . #x51B1)	; &g2-JC3-51B1;
       ))
     ))
 (define-char
@@ -2122,10 +2374,21 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x592D)	; 夭
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs@cns		. #x660B)	; &C2-272C;
-    (=ucs@big5		. #x660B)	; &C2-272C;
     (=cns11643-2	. #x272C)	; &C2-272C; [07-12]
     (=big5		. #xCCCB)	; &I-B-CCCB;
+    (->subsumptive
+     ((==ucs@cns	  . #x660B)	; &g2-CU+660B;
+      (==cns11643-2	  . #x272C)	; &g2-CU+660B; [07-12]
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -2321,9 +2584,9 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	  (=ucs		      . #x2FF0)	; â¿°
 	  )
-	 ((==daikanwa	      . 13733)	; &g2-M-13733;
+	 ((==mj		      . 013152)	; &g2-MJ013152;
 	  )
-	 ((=mj		      . 013519)	; &MJ013519;
+	 ((==mj		      . 013519)	; &g2-MJ013519;
 	  ))
 	(==daikanwa	    . 13805)	; &g2-M-13805;
 	)
@@ -2336,10 +2599,10 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	  (=ucs		      . #x2FF0)	; â¿°
 	  )
-	 ((==ucs@unicode      . #x65E5)	; &g2-GT-17359;
-	  (==jis-x0208	      . #x467C)	; &g2-GT-17359; [38-92]
+	 ((==ucs@unicode      . #x65E5)	; &g2-MJ013151;
+	  (==mj		      . 013151)	; &g2-MJ013151;
 	  )
-	 ((=mj		      . 013519)	; &MJ013519;
+	 ((==mj		      . 013519)	; &g2-MJ013519;
 	  ))
 	(==adobe-japan1-4   . 14052)	; &g2-AJ1-14052;
 	(==hanyo-denshi/jt  . #xB27F)	; &g2-AJ1-14052;
@@ -2375,8 +2638,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@unicode	    . #x6708)	; &g2-MJ013520;
 	(==mj		    . 013520)	; &g2-MJ013520;
@@ -4114,6 +4377,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x3563)	; 㕣
+      ))
     (=ucs		. #x3ADF)	; 㫟
     ))
 (define-char
@@ -4123,10 +4394,23 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x3563)	; &AJ1-17344;
+      (=adobe-japan1-5	  . 17344)	; &AJ1-17344;
+      ))
+    (=ucs@cns		. #x3ADF)	; &C4-2965;
+    (=cns11643-4	. #x2965)	; &C4-2965; [09-69]
+    (=daikanwa		. 13861)	; &I-M-13861;
     (->subsumptive
-     ((=daikanwa	  . 13861)	; &M-13861;
+     ((==daikanwa	  . 13861)	; &g2-M-13861;
       )
-     ((=cns11643-4	  . #x2965)	; &C4-2965; [09-69]
+     ((==ucs@cns	  . #x3ADF)	; &g2-CU+3ADF;
+      (==cns11643-4	  . #x2965)	; &g2-CU+3ADF; [09-69]
       ))
     ))
 (define-char
@@ -4136,7 +4420,20 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs-var-001	  . #x3563)	; &U-v001+3563;
+      ))
     (=ucs@unicode	. #x3ADF)	; &UU+3ADF;
+    (=ucs@JP/hanazono	. nil)
+    (->subsumptive
+     ((==ucs@unicode	  . #x3ADF)	; &g2-UU+3ADF;
+      (==ucs@JP/hanazono  . nil)
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -4474,7 +4771,11 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 72)	; ⽇
+  '((<-denotational
+     ((=>ucs@component	  . #x6637)	; &A-compU+6637;
+      (=>iwds-1		  .  0320)	; &A-compU+6637;
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (ideographic-structure
@@ -5182,6 +5483,17 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=>ucs@component	. #x6649)	; &A-compU+6649;
+    (=>iwds-1		.  0388)	; &A-compU+6649;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@component	  . #x6649)	; &A-compU+6649;
+      (=>iwds-1		  .  0388)	; &A-compU+6649;
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
     (=ucs		. #x6649)	; 晉
     ))
 (define-char
@@ -5254,7 +5566,11 @@
     (=ucs		. #x2F8CD)	; 晉
     ))
 (define-char
-  '((ideographic-radical . 72)	; ⽇
+  '((<-denotational
+     ((=>ucs@component	  . #x6649)	; &A-compU+6649;
+      (=>iwds-1		  .  0388)	; &A-compU+6649;
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x664B)	; 晋
@@ -5891,6 +6207,21 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x5171)	; 共
+      ))
+    (=gt-k		. 07007)	; &GT-K07007;
+    (=gt-pj-k1		. #x383A)	; &GT-K07007; [24-26]
+    ))
+(define-char
+  '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x231B2)	; 𣆲
@@ -6690,6 +7021,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x8096)	; 肖
+      ))
     (=ucs		. #x231BA)	; 𣆺
     ))
 (define-char
@@ -6699,7 +7038,20 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@ks		  . #x8096)	; &GT-37890;
+      (=ks-x1001	  . #x752B)	; &GT-37890; [85-11]
+      (=daikanwa	  . 29263)	; &I-M-29263;
+      ))
     (=daikanwa		. 13955)	; &M-13955;
+    (->subsumptive
+     ((==daikanwa	  . 13955)	; &g2-M-13955;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -6708,10 +7060,22 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x8096)	; &MJ020928;
+      (=mj		  . 020928)	; &MJ020928;
+      ))
+    (=ucs@iso		. #x231BA)	; &C6-4050;
+    (=cns11643-6	. #x4050)	; &C6-4050; [32-48]
     (->subsumptive
-     ((=ucs@iso		  . #x231BA)	; &U-000231BA;
+     ((==ucs@iso	  . #x231BA)	; &g2-IU-000231BA;
       )
-     ((=cns11643-6	  . #x4050)	; &C6-4050; [32-48]
+     ((==ucs@cns	  . #x231BA)	; &g2-CU+231BA;
+      (==cns11643-6	  . #x4050)	; &g2-CU+231BA; [32-48]
       ))
     ))
 (define-char
@@ -7673,7 +8037,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((==daikanwa	    . 13733)	; &g2-M-13733;
+       ((==mj		    . 013152)	; &g2-MJ013152;
 	)
        ((==ucs@unicode	    . #x4EAC)	; &g2-AJ1-01688;
 	(==adobe-japan1-0   . 01688)	; &g2-AJ1-01688;
@@ -7689,8 +8053,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@unicode	    . #x4EAC)	; &g2-AJ1-01688;
 	(==adobe-japan1-0   . 01688)	; &g2-AJ1-01688;
@@ -8398,7 +8762,7 @@
        ((==ucs@cns	    . #x2020C)	; &g2-CU+2020C;
 	(==cns11643-4	    . #x2535)	; &g2-CU+2020C; [05-21]
 	)
-       ((==daikanwa	    . 13733)	; &g2-M-13733;
+       ((==mj		    . 013152)	; &g2-MJ013152;
 	))
       (==daikanwa	  . 14008)	; &g2-M-14008;
       )
@@ -8409,8 +8773,8 @@
        ((==ucs@cns	    . #x2020C)	; &g2-CU+2020C;
 	(==cns11643-4	    . #x2535)	; &g2-CU+2020C; [05-21]
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	))
       (==ucs@unicode	  . #x3AFA)	; &g2-UU+3AFA;
       (==ucs@JP/hanazono  . nil)
@@ -8721,21 +9085,67 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs		  . #x6797)	; 林
+     ((=>ucs@component	  . #x6797)	; &A-compU+6797;
+      (=>iwds-1		  .  0229)	; &A-compU+6797;
       )
      ((=ucs		  . #x65E5)	; 日
       ))
     (=ucs		. #x23205)	; 𣈅
-    (=daikanwa		. 14020)	; &I-M-14020;
-    (=cbeta		. 04877)	; &I-CB04877;
     ))
 (define-char
-  '((ideographic-radical . 72)	; ⽇
+  '((<-denotational
+     ((=ucs		  . #x23205)	; 𣈅
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x231F1)	; 𣇱
-    (=cns11643-6	. #x4976)	; &I-C6-4976; [41-86]
-    (=daikanwa		. 14021)	; &I-M-14021;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x6797)	; 林
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (=ucs@iso		. #x23205)	; &M-14020;
+    (=daikanwa		. 14020)	; &M-14020;
+    (=cbeta		. 04877)	; &I-CB04877;
+    (->subsumptive
+     ((==daikanwa	  . 14020)	; &g2-M-14020;
+      )
+     ((==ucs@iso	  . #x23205)	; &g2-CB04877;
+      (==cbeta		  . 04877)	; &g2-CB04877;
+      (->subsumptive
+       ((===ucs@iso	    . #x23205)	; &R-U-00023205;
+	)
+       ((===cbeta	    . 04877)	; &R-CB04877;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23205)	; 𣈅
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x233DF)	; 𣏟
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (=ucs-var-001	. #x23205)	; &U-v001+23205;
+    ))
+(define-char
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs		. #x231F1)	; 𣇱
+    (=cns11643-6	. #x4976)	; &I-C6-4976; [41-86]
+    (=daikanwa		. 14021)	; &I-M-14021;
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -9155,6 +9565,30 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x51FA)	; 出
+      )
+     ((=ucs		  . #x5927)	; 大
+      ))
+    (=gt-k		. 09590)	; &GT-K09590;
+    (=gt-pj-k1		. #x3B44)	; &GT-K09590; [27-36]
+    (<-simplified@component
+     ((=ucs		  . #x66D3)	; 曓
+      ))
+    (->subsumptive
+     ((==gt-k		  . 09590)	; &g2-GT-K09590;
+      (==gt-pj-k1	  . #x3B44)	; &g2-GT-K09590; [27-36]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x3B01)	; 㬁
@@ -9441,6 +9875,15 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((==>ucs@bucs	  . #x516A)	; &J97-5141;
+      (=>jis-x0208	  . #x5141)	; &J97-5141; [49-33]
+      ))
     (=ucs		. #x23225)	; 𣈥
     ))
 (define-char
@@ -9450,7 +9893,46 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=daikanwa		. 14042)	; &M-14042;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x516A)	; 兪
+      ))
+    (=>mj		. 037742)	; &A-MJ037742;
+    ))
+(define-char
+  '((<-denotational
+     ((=>mj		  . 037742)	; &A-MJ037742;
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@jis		  . #x516A)	; &AJ1-04216;
+      (=ucs@ks		  . #x516A)	; &AJ1-04216;
+      (=adobe-japan1-0	  . 04216)	; &AJ1-04216;
+      ))
+    (=mj		. 037742)	; &MJ037742;
+    (=koseki		. 158240)	; &MJ037742;
+    (=daikanwa		. 14042)	; &I-M-14042;
+    (->subsumptive
+     ((==mj		  . 037742)	; &g2-MJ037742;
+      (==koseki		  . 158240)	; &g2-MJ037742;
+      (==daikanwa	  . 14042)	; &g2-MJ037742;
+      (->subsumptive
+       ((===daikanwa	    . 14042)	; &R-M-14042;
+	)
+       ((===mj		    . 037742)	; &R-MJ037742;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -9459,10 +9941,40 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x4FDE)	; 俞
+      ))
+    (=>ucs@iso		. #x23225)	; &A-IU+23225;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iso	  . #x23225)	; &A-IU+23225;
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x4FDE)	; &C1-4F7E;
+      (=gb2312		  . #x5361)	; &C1-4F7E; [51-65]
+      (=cns11643-1	  . #x4F7E)	; &I-C1-4F7E; [47-94]
+      ))
+    (=ucs@iso		. #x23225)	; &C5-3F63;
+    (=cns11643-5	. #x3F63)	; &C5-3F63; [31-67]
     (->subsumptive
-     ((=ucs@iso		  . #x23225)	; &U-00023225;
+     ((==ucs@iso	  . #x23225)	; &g2-IU-00023225;
       )
-     ((=cns11643-5	  . #x3F63)	; &C5-3F63; [31-67]
+     ((==ucs@cns	  . #x23225)	; &g2-CU+23225;
+      (==cns11643-5	  . #x3F63)	; &g2-CU+23225; [31-67]
       ))
     ))
 (define-char
@@ -9582,7 +10094,7 @@
      ((=ucs		  . #x65E5)	; 日
       )
      ((=ucs@cns		  . #x82F1)	; &MJ021701;
-      (=mj		  . 021701)	; &I-MJ021701;
+      (=mj		  . 021701)	; &MJ021701;
       ))
     (=ucs@cns		. #x668E)	; &HD-KS-158300;
     (=cns11643-3	. #x415B)	; &HD-KS-158300; [33-59]
@@ -9655,7 +10167,7 @@
      ((=ucs		  . #x65E5)	; 日
       )
      ((=ucs@unicode	  . #x82F1)	; &MJ021700;
-      (=mj		  . 021700)	; &I-MJ021700;
+      (=mj		  . 021700)	; &MJ021700;
       ))
     (=ucs@unicode	. #x668E)	; &AJ1-05114;
     (=adobe-japan1-0	. 05114)	; &AJ1-05114;
@@ -9965,7 +10477,7 @@
 	)
        ((=ucs		    . #x65E5)	; 日
 	)
-       ((=big5-cdp	    . #x8B48)	; &GT-36329;
+       ((==ucs@unicode	    . #x2EAB)	; &g2-UU+2EAB;
 	)
        ((==ucs@unicode	    . #x65B9)	; &g2-AJ1-03661;
 	(==adobe-japan1-0   . 03661)	; &g2-AJ1-03661;
@@ -11098,6 +11610,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x7FC1)	; 翁
+      ))
     (=ucs		. #x66A1)	; 暡
     (=big5		. #xE1F6)	; &I-B-E1F6;
     ))
@@ -11108,7 +11628,20 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@ks		  . #x7FC1)	; &GT-36863;
+      (=ks-x1001	  . #x683A)	; &GT-36863; [72-26]
+      (=daikanwa	  . 28635)	; &I-M-28635;
+      ))
     (=daikanwa		. 14094)	; &M-14094;
+    (->subsumptive
+     ((==daikanwa	  . 14094)	; &g2-M-14094;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -11117,10 +11650,24 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x7FC1)	; &MJ020660;
+      (=mj		  . 020660)	; &MJ020660;
+      ))
+    (=ucs@unicode	. #x66A1)	; &C2-4A5D;
+    (=ucs@JP/hanazono	. nil)
+    (=cns11643-2	. #x4A5D)	; &C2-4A5D; [42-61]
     (->subsumptive
-     ((=cns11643-2	  . #x4A5D)	; &C2-4A5D; [42-61]
+     ((==ucs@cns	  . #x66A1)	; &g2-CU+66A1;
+      (==cns11643-2	  . #x4A5D)	; &g2-CU+66A1; [42-61]
       )
-     ((=ucs@unicode	  . #x66A1)	; &UU+66A1;
+     ((==ucs@unicode	  . #x66A1)	; &g2-UU+66A1;
+      (==ucs@JP/hanazono  . nil)
       ))
     ))
 (define-char
@@ -11273,9 +11820,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((==daikanwa	    . 13733)	; &g2-M-13733;
+       ((==mj		    . 013152)	; &g2-MJ013152;
 	)
-       ((=daikanwa	    . 27325)	; &M-27325;
+       ((==daikanwa	    . 27325)	; &g2-M-27325;
 	))
       (==daikanwa	  . 14099)	; &g2-M-14099;
       )
@@ -11283,10 +11830,10 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
-       ((=big5-cdp	    . #x8CE2)	; &CDP-8CE2;
+       ((==big5-cdp	    . #x8CE2)	; &g2-CDP-8CE2;
 	))
       (==ucs@cns	  . #x3B0E)	; &g2-AJ1-17752;
       (==ucs@jis	  . #x3B0E)	; &g2-AJ1-17752;
@@ -11338,6 +11885,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x768B)	; 皋
+      ))
     (=ucs		. #x66A4)	; 暤
     ))
 (define-char
@@ -11356,10 +11911,26 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x768B)	; &AJ1-05789;
+      (=adobe-japan1-0	  . 05789)	; &AJ1-05789;
+      ))
     (=ucs@unicode	. #x66A4)	; &AJ1-14610;
     (=adobe-japan1-4	. 14610)	; &AJ1-14610;
     (=jis-x0212		. #x4258)	; &I-JSP-4258; [34-56]
     (=cns11643-3	. #x4739)	; &I-C3-4739; [39-25]
+    (=shinjigen		.  5217)	; &AJ1-14610;
+    (<-formed
+     ((=ucs		  . #x769E)	; 皞
+      (=shinjigen	  .  5216)	; 皞
+      ))
+    (<-formed*sources
+     shinjigen)
     (->subsumptive
      ((==ucs@cns	  . #x66A4)	; &g2-CU+66A4;
       (==cns11643-3	  . #x4739)	; &g2-CU+66A4; [39-25]
@@ -11379,6 +11950,8 @@
 	)
        ((===ucs@unicode	    . #x66A4)	; &R-UU+66A4;
 	))
+      )
+     ((==shinjigen	  .  5217)	; &g2-SJG2-5217;
       ))
     ))
 (define-char
@@ -11735,6 +12308,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x79BB)	; 离
+      ))
     (=ucs		. #x2327D)	; 𣉽
     ))
 (define-char
@@ -11744,10 +12325,24 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x79BB)	; &JX2-726E;
+      (=gb2312		  . #x406B)	; &JX2-726E; [32-75]
+      (=jis-x0212	  . #x5073)	; &I-JSP-5073; [48-83]
+      (=jis-x0213-2	  . #x726E)	; &I-JX2-726E; [82-78]
+      (=daikanwa	  . 24888)	; &I-M-24888;
+      ))
+    (=ucs@iso		. #x2327D)	; &M-14116;
+    (=daikanwa		. 14116)	; &M-14116;
     (->subsumptive
-     ((=daikanwa	  . 14116)	; &M-14116;
+     ((==daikanwa	  . 14116)	; &g2-M-14116;
       )
-     ((=ucs@iso		  . #x2327D)	; &U-0002327D;
+     ((==ucs@iso	  . #x2327D)	; &g2-IU-0002327D;
       ))
     ))
 (define-char
@@ -11757,7 +12352,21 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@cns		  . #x79BB)	; &C2-3766;
+      (=cns11643-2	  . #x3766)	; &C2-3766; [23-70]
+      ))
+    (=ucs@cns		. #x2327D)	; &C7-235B;
     (=cns11643-7	. #x235B)	; &C7-235B; [03-59]
+    (->subsumptive
+     ((==ucs@cns	  . #x2327D)	; &g2-CU+2327D;
+      (==cns11643-7	  . #x235B)	; &g2-CU+2327D; [03-59]
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -11775,6 +12384,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x7FCF)	; 翏
+      ))
     (=ucs		. #x3B14)	; 㬔
     ))
 (define-char
@@ -11784,7 +12401,19 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@jis		  . #x7FCF)	; &AJ1-18400;
+      (=adobe-japan1-5	  . 18400)	; &AJ1-18400;
+      ))
     (=daikanwa		. 14118)	; &M-14118;
+    (->subsumptive
+     ((==daikanwa	  . 14118)	; &g2-M-14118;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -11793,10 +12422,24 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x7FCF)	; &C2-3841;
+      (=cns11643-2	  . #x3841)	; &C2-3841; [24-33]
+      ))
+    (=ucs@unicode	. #x3B14)	; &C3-4C42;
+    (=ucs@JP/hanazono	. nil)
+    (=cns11643-3	. #x4C42)	; &C3-4C42; [44-34]
     (->subsumptive
-     ((=ucs@unicode	  . #x3B14)	; &UU+3B14;
+     ((==ucs@unicode	  . #x3B14)	; &g2-UU+3B14;
+      (==ucs@JP/hanazono  . nil)
       )
-     ((=cns11643-3	  . #x4C42)	; &C3-4C42; [44-34]
+     ((==ucs@cns	  . #x3B14)	; &g2-CU+3B14;
+      (==cns11643-3	  . #x4C42)	; &g2-CU+3B14; [44-34]
       ))
     ))
 (define-char
@@ -11888,13 +12531,34 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x57F6)	; 埶
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs		. #x66AC)	; 暬
-    (->subsumptive
-     ((=daikanwa	  . 14122)	; &M-14122;
+    (=mj		. 013381)	; &I-MJ013381;
+    (=cns11643-3	. #x4C44)	; &I-C3-4C44; [44-36]
+    (=koseki		. 159180)	; 暬
+    (=daikanwa		. 14122)	; &I-M-14122;
+    (->subsumptive
+     ((==mj		  . 013381)	; &g2-MJ013381;
+      (==koseki		  . 159180)	; &g2-MJ013381;
+      (==daikanwa	  . 14122)	; &g2-MJ013381;
+      (->subsumptive
+       ((===daikanwa	    . 14122)	; &R-M-14122;
+	)
+       ((===mj		    . 013381)	; &R-MJ013381;
+	))
       )
-     ((=cns11643-3	  . #x4C44)	; &C3-4C44; [44-36]
+     ((==ucs@cns	  . #x66AC)	; &g2-CU+66AC;
+      (==cns11643-3	  . #x4C44)	; &g2-CU+66AC; [44-36]
       )
-     ((=ucs@unicode	  . #x66AC)	; &UU+66AC;
+     ((==ucs@unicode	  . #x66AC)	; &g2-UU+66AC;
+      (==ucs@JP/hanazono  . nil)
       ))
     ))
 (define-char
@@ -11946,6 +12610,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x7965)	; 祥
+      ))
     (=ucs		. #x3B15)	; 㬕
     ))
 (define-char
@@ -11955,10 +12627,23 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA1A")
+      (=ucs		  . #xFA1A)	; 祥
+      ))
+    (=ucs@cns		. #x3B15)	; &C3-4C45;
+    (=cns11643-3	. #x4C45)	; &C3-4C45; [44-37]
+    (=daikanwa		. 14124)	; &I-M-14124;
     (->subsumptive
-     ((=daikanwa	  . 14124)	; &M-14124;
+     ((==daikanwa	  . 14124)	; &g2-M-14124;
       )
-     ((=cns11643-3	  . #x4C45)	; &C3-4C45; [44-37]
+     ((==ucs@cns	  . #x3B15)	; &g2-CU+3B15;
+      (==cns11643-3	  . #x4C45)	; &g2-CU+3B15; [44-37]
       ))
     ))
 (define-char
@@ -11968,7 +12653,21 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x7965)	; &AJ1-02485;
+      (=adobe-japan1-0	  . 02485)	; &AJ1-02485;
+      ))
     (=ucs@unicode	. #x3B15)	; &UU+3B15;
+    (=ucs@JP/hanazono	. nil)
+    (->subsumptive
+     ((==ucs@unicode	  . #x3B15)	; &g2-UU+3B15;
+      (==ucs@JP/hanazono  . nil)
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -12088,7 +12787,16 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x83AB)	; 莫
+      ))
     (=ucs		. #x66AF)	; 暯
+    (=big5		. #xE5C9)	; &I-B-E5C9;
     ))
 (define-char
   '((<-denotational
@@ -12097,11 +12805,24 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@cns		  . #x83AB)	; &C1-5C7B;
+      (=cns11643-1	  . #x5C7B)	; &C1-5C7B; [60-91]
+      (=daikanwa	  . 31078)	; &I-M-31078;
+      ))
+    (=ucs@cns		. #x66AF)	; &C2-5070;
+    (=cns11643-2	. #x5070)	; &C2-5070; [48-80]
+    (=daikanwa		. 14129)	; &I-M-14129;
     (->subsumptive
-     ((=daikanwa	  . 14129)	; &M-14129;
+     ((==daikanwa	  . 14129)	; &g2-M-14129;
       )
-     ((=ucs@cns		  . #x66AF)	; &C2-5070;
-      (=cns11643-2	  . #x5070)	; &C2-5070; [48-80]
+     ((==ucs@cns	  . #x66AF)	; &g2-CU+66AF;
+      (==cns11643-2	  . #x5070)	; &g2-CU+66AF; [48-80]
       ))
     ))
 (define-char
@@ -12111,8 +12832,22 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x83AB)	; &MJ022034;
+      (=mj		  . 022034)	; &MJ022034;
+      ))
     (=ucs@unicode	. #x66AF)	; &UU+66AF;
-    (=big5		. #xE5C9)	; &UU+66AF;
+    (->subsumptive
+     ((==ucs@unicode	  . #x66AF)	; &g2-UU+66AF;
+      (->subsumptive
+       ((===ucs@unicode	    . #x66AF)	; &R-UU+66AF;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -12381,8 +13116,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@unicode	    . #x5F57)	; &g2-UU+5F57;
 	))
@@ -12423,6 +13158,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((=gt-k		  . 07007)	; &GT-K07007;
+      )
+     ((=ucs		  . #x6C3A)	; æ°º
+      ))
     (=ucs		. #x66B4)	; 暴
     (=adobe-japan1-0	. 03691)	; &I-AJ1-03691;
     (=jis-x0208		. #x4B3D)	; &I-J90-4B3D; [43-29]
@@ -13745,7 +14488,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((==daikanwa	    . 13733)	; &g2-M-13733;
+       ((==mj		    . 013152)	; &g2-MJ013152;
 	)
        ((==ucs@jis	    . #x7D72)	; &g2-AJ1-06078;
 	(==ucs@ks	    . #x7D72)	; &g2-AJ1-06078;
@@ -13763,8 +14506,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@unicode	    . #x7D72)	; &g2-UU+7D72;
 	))
@@ -14081,17 +14824,75 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=daikanwa		. 49154)	; &M-49154;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x21390)	; 𡎐
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (sound@ja/on	"setu")
+    (=mj		. 037801)	; &MJ037801;
+    (=koseki		. 159960)	; &MJ037801;
+    (=daikanwa		. 49154)	; &I-M-49154;
+    (<-formed
+     ((=ucs		  . #x66AC)	; 暬
+      (=koseki		  . 159180)	; 暬
+      ))
+    (<-formed*sources
+     koseki)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((==daikanwa	    . 48990)	; &g2-M-48990;
+	)
+       ((==mj		    . 013152)	; &g2-MJ013152;
+	))
+      (==daikanwa	  . 49154)	; &g2-M-49154;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((==daikanwa	    . 48990)	; &g2-M-48990;
+	)
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
+	))
+      (==mj		  . 037801)	; &g2-MJ037801;
+      (==koseki		  . 159960)	; &g2-MJ037801;
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x81EF)	; 臯
+      ))
     (=ucs		. #x66CD)	; 曍
+    (=cns11643-3	. #x5122)	; &I-C3-5122; [49-02]
+    (=shinjigen		.  5218)	; 曍
+    (<-vulgar
+     ((=ucs		  . #x769E)	; 皞
+      (=shinjigen	  .  5216)	; 皞
+      ))
+    (<-vulgar*sources
+     shinjigen)
     (->subsumptive
-     ((=cns11643-3	  . #x5122)	; &C3-5122; [49-02]
+     ((==ucs@cns	  . #x66CD)	; &g2-CU+66CD;
+      (==cns11643-3	  . #x5122)	; &g2-CU+66CD; [49-02]
       )
-     ((=ucs@unicode	  . #x66CD)	; &UU+66CD;
+     ((==ucs@unicode	  . #x66CD)	; &g2-UU+66CD;
+      (==ucs@JP/hanazono  . nil)
       ))
     ))
 (define-char
@@ -14109,6 +14910,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x776A)	; 睪
+      ))
     (=ucs		. #x66CE)	; 曎
     (=adobe-japan1-6	. 21726)	; &I-AJ1-21726;
     (=jis-x0212		. #x4264)	; &I-JSP-4264; [34-68]
@@ -14120,7 +14929,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==daikanwa	    . 13733)	; &g2-M-13733;
+       ((==mj		    . 013152)	; &g2-MJ013152;
 	)
        ((==ucs@jis	    . #x776A)	; &g2-JSP-4F23;
 	(==jis-x0213-2	    . #x7227)	; &g2-JSP-4F23; [82-07]
@@ -14131,8 +14940,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@jis	    . #x776A)	; &g2-JSP-4F23;
 	(==jis-x0213-2	    . #x7227)	; &g2-JSP-4F23; [82-07]
@@ -14153,8 +14962,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@unicode	    . #x776A)	; &g2-M-23466;
 	(==daikanwa	    . 23466)	; &g2-M-23466;
@@ -14656,6 +15465,23 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=gt-k		  . 09590)	; &GT-K09590;
+      )
+     ((=ucs		  . #x6C3A)	; æ°º
+      ))
+    (=ucs-itaiji-004	. #x66B4)	; &U-i004+66B4;
+    (<-wrong
+     ((=ucs		  . #x3B25)	; 㬥
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
     (=ucs		. #x3B23)	; 㬣
@@ -14697,9 +15523,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==daikanwa	    . 13733)	; &g2-M-13733;
+       ((==mj		    . 013152)	; &g2-MJ013152;
 	)
-       ((=daikanwa	    . 27325)	; &M-27325;
+       ((==daikanwa	    . 27325)	; &g2-M-27325;
 	))
       (==daikanwa	  . 14219)	; &g2-M-14219;
       )
@@ -14707,8 +15533,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((=big5-cdp	    . #x8CE2)	; &CDP-8CE2;
 	))
@@ -14966,21 +15792,50 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((=gt-k		  . 09590)	; &GT-K09590;
+      )
+     ((=ucs		  . #x7C73)	; ç±³
+      ))
     (=ucs		. #x3B25)	; 㬥
+    (=cns11643-4	. #x5B41)	; &I-C4-5B41; [59-33]
+    (=daikanwa		. 14225)	; &I-M-14225;
+    (=shinjigen		.  3382)	; 㬥
+    (=cbeta		. 07862)	; &I-CB07862;
+    (<-original
+     ((=ucs		  . #x66B4)	; 暴
+      (=jis-x0208	  . #x4B3D)	; &I-J90-4B3D; [43-29]
+      (=daikanwa	  . 14137)	; &I-M-14137;
+      (=shinjigen	  .  3381)	; 暴
+      ))
+    (<-original*sources
+     zhengzitong daikanwa shinjigen)
+    (->ancient
+     ((=ucs		  . #x232F4)	; 𣋴
+      (=daikanwa	  . 14237)	; &I-M-14237;
+      ))
+    (->ancient*sources
+     shuowen daikanwa)
+    (->vulgar
+     ((=ucs		  . #x66DD)	; 曝
+      (=daikanwa	  . 14239)	; &I-M-14239;
+      ))
+    (->vulgar*sources
+     jiyun daikanwa)
     (->subsumptive
-     ((=daikanwa	  . 14225)	; &M-14225;
-      (=shinjigen	  .  3382)	; &M-14225;
-      (<-original
-       ((=ucs		    . #x66B4)	; 暴
-	(=jis-x0208	    . #x4B3D)	; &I-J90-4B3D; [43-29]
-	(=shinjigen	    .  3381)	; 暴
-	))
-      (<-original*sources
-       shinjigen)
+     ((==daikanwa	  . 14225)	; &g2-M-14225;
+      (==shinjigen	  .  3382)	; &g2-M-14225;
       )
-     ((=ucs@unicode	  . #x3B25)	; &UU+3B25;
+     ((==ucs@unicode	  . #x3B25)	; &g2-UU+3B25;
+      (==ucs@JP/hanazono  . nil)
       )
-     ((=cns11643-4	  . #x5B41)	; &C4-5B41; [59-33]
+     ((==ucs@cns	  . #x3B25)	; &g2-CU+3B25;
+      (==cns11643-4	  . #x5B41)	; &g2-CU+3B25; [59-33]
+      )
+     ((==cbeta		  . 07862)	; &g2-CB07862;
       ))
     ))
 (define-char
@@ -15129,11 +15984,60 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x660F)	; 昏
+      )
+     ((=ucs		  . #x2B7CE)	; 𫟎
+      ))
+    (=ucs		. #x232EF)	; 𣋯
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x232EF)	; 𣋯
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=ucs		. #x232EF)	; 𣋯
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x660F)	; 昏
+      )
+     ((=ucs-var-003	  . #x2B7CE)	; &U-v003+2B7CE;
+      ))
+    (=ucs@iso		. #x232EF)	; &MJ037828;
+    (=mj		. 037828)	; &MJ037828;
     (=cns11643-7	. #x3F78)	; &I-C7-3F78; [31-88]
+    (=koseki		. 160420)	; &MJ037828;
     (=daikanwa		. 14228)	; &I-M-14228;
+    (<-same
+     ((=ucs		  . #x660F)	; 昏
+      (=daikanwa	  . 13806)	; &I-M-13806;
+      ))
+    (<-same*sources
+     zihui-bu daikanwa)
+    (->subsumptive
+     ((==mj		  . 037828)	; &g2-MJ037828;
+      (==koseki		  . 160420)	; &g2-MJ037828;
+      (==daikanwa	  . 14228)	; &g2-MJ037828;
+      (->subsumptive
+       ((===daikanwa	    . 14228)	; &R-M-14228;
+	)
+       ((===mj		    . 037828)	; &R-MJ037828;
+	))
+      )
+     ((==ucs@iso	  . #x232EF)	; &g2-IU-000232EF;
+      (==cns11643-7	  . #x3F78)	; &g2-IU-000232EF; [31-88]
+      (->subsumptive
+       ((===cns11643-7	    . #x3F78)	; &R-C7-3F78; [31-88]
+	)
+       ((===ucs@iso	    . #x232EF)	; &R-U-000232EF;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -15201,41 +16105,71 @@
     (=cns11643-5	. #x6823)	; &C5-6823; [72-03]
     ))
 (define-char
-  '((=>ucs		. #x232F3)	; 𣋳
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=daikanwa		. 14236)	; &M-14236;
-    ))
-(define-char
-  '((morohashi-daikanwa	14236 0 0)
-    (ideographic-radical . 72)	; ⽇
+  '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x9E83)	; 麃
+      ))
     (=ucs		. #x232F3)	; 𣋳
+    (=cns11643-7	. #x473D)	; &I-C7-473D; [39-29]
+    (=daikanwa		. 14236)	; &I-M-14236;
+    (<-same
+     ((=ucs		  . #x232F4)	; 𣋴
+      (=daikanwa	  . 14237)	; &I-M-14237;
+      ))
+    (<-same*sources
+     zihui daikanwa)
+    (->subsumptive
+     ((==ucs@iso	  . #x232F3)	; &g2-M-14236;
+      (==daikanwa	  . 14236)	; &g2-M-14236;
+      (->subsumptive
+       ((===daikanwa	    . 14236)	; &R-M-14236;
+	)
+       ((===ucs@iso	    . #x232F3)	; &R-U-000232F3;
+	))
+      )
+     ((==ucs@cns	  . #x232F3)	; &g2-CU+232F3;
+      (==cns11643-7	  . #x473D)	; &g2-CU+232F3; [39-29]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x232F3)	; 𣋳
-    (morohashi-daikanwa	14236 0 1)
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=cns11643-7	. #x473D)	; &C7-473D; [39-29]
-    ))
-(define-char
-  '((=>ucs		. #x232F4)	; 𣋴
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=daikanwa		. 14237)	; &M-14237;
-    ))
-(define-char
-  '((morohashi-daikanwa	14237 0 0)
-    (ideographic-radical . 72)	; ⽇
+  '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs-itaiji-001	  . #x9E83)	; &U-i001+9E83;
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs		. #x232F4)	; 𣋴
     (=cns11643-7	. #x473C)	; &I-C7-473C; [39-28]
+    (=daikanwa		. 14237)	; &I-M-14237;
+    (<-ancient
+     ((=ucs		  . #x3B25)	; 㬥
+      (=daikanwa	  . 14225)	; &I-M-14225;
+      ))
+    (<-ancient*sources
+     shuowen daikanwa)
+    (->subsumptive
+     ((==daikanwa	  . 14237)	; &g2-M-14237;
+      )
+     ((==ucs@iso	  . #x232F4)	; &g2-IU-000232F4;
+      (==cns11643-7	  . #x473C)	; &g2-IU-000232F4; [39-28]
+      (->subsumptive
+       ((===cns11643-7	    . #x473C)	; &R-C7-473C; [39-28]
+	)
+       ((===ucs@iso	    . #x232F4)	; &R-U-000232F4;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -15249,6 +16183,14 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x66B4)	; 暴
+      ))
     (=ucs		. #x66DD)	; 曝
     (=adobe-japan1-0	. 03374)	; &I-AJ1-03374;
     (=jis-x0208		. #x4778)	; &I-J90-4778; [39-88]
@@ -15260,7 +16202,16 @@
     (=gt		. 18029)	; &I-GT-18029;
     (=gt-pj-1		. #x4778)	; &I-GT-18029; [39-88]
     (=daikanwa		. 14239)	; &I-M-14239;
-    (=shinjigen@rev	.  3399)	; 曝
+    (=shinjigen		.  3399)	; 曝
+    (<-vulgar
+     ((=ucs		  . #x66B4)	; 暴
+      (=daikanwa	  . 14137)	; &I-M-14137;
+      )
+     ((=ucs		  . #x3B25)	; 㬥
+      (=daikanwa	  . 14225)	; &I-M-14225;
+      ))
+    (<-vulgar*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -15896,8 +16847,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@cns	    . #x263C1)	; &g2-M-28554;
 	(==daikanwa	    . 28554)	; &g2-M-28554;
@@ -16424,8 +17375,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x65E5)	; &g2-GT-17359;
-	(==jis-x0208	    . #x467C)	; &g2-GT-17359; [38-92]
+       ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
+	(==mj		    . 013151)	; &g2-MJ013151;
 	)
        ((==ucs@unicode	    . #x56B4)	; &g2-UU+56B4;
 	))