X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R072-Sun.el;h=c8e651c7a781a7be2a44a06e47d308f0c4146970;hb=e58139d8c233ae7735f0d396305db04c882e17c5;hp=af48fcd761a8ca4b7805615a0f2155f95f1b1ae4;hpb=3192ec713c69ba8dcc1aa1b09d9ce4c4620253bf;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index af48fcd..c8e651c 100644
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -3,13 +3,13 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (=>ucs@component	. #x65E5)	; &IWDS1-118;
-    (=>iwds-1		.  0118)	; &IWDS1-118;
+    (=>ucs@component	. #x65E5)	; &A-compU+65E5;
+    (=>iwds-1		.  0118)	; &A-compU+65E5;
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component	  . #x65E5)	; &IWDS1-118;
-      (=>iwds-1		  .  0118)	; &IWDS1-118;
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 0)
@@ -51,14 +51,14 @@
 	  ))
 	))
       )
-     ((=>>ucs@unicode	  . #x65E5)	; &G-AJ1-03284;
-      (=>>mj		  . 013151)	; &G-AJ1-03284;
-      (=>>adobe-japan1-0  . 03284)	; &G-AJ1-03284;
-      (=>>jis-x0208	  . #x467C)	; &G-AJ1-03284; [38-92]
-      (=>>cns11643-1	  . #x454A)	; &G-AJ1-03284; [37-42]
-      (=>>jis-x0213-1	  . #x467C)	; &G-AJ1-03284; [38-92]
-      (=>>gt		  . 17359)	; &G-AJ1-03284;
-      (=>>gt-k		  . 00473)	; &G-AJ1-03284;
+     ((=>>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
        ((==ucs@unicode	    . #x65E5)	; &g2-MJ013151;
 	(==mj		    . 013151)	; &g2-MJ013151;
@@ -101,8 +101,25 @@
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component	  . #x4E14)	; &IWDS1-114;
-      (=>iwds-1		  .  0114)	; &IWDS1-114;
+     ((=>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)
@@ -232,28 +249,27 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((name*		  . "ideographic component person for top")
-      (=ucs		  . #x20089)	; 𠂉
+     ((=>ucs@component	  . #x20089)	; &A-compU+20089;
       )
      ((=ucs		  . #x65E5)	; 日
       ))
-    (=mj		. 057648)	; &MJ057648;
-    (=koseki		. 154550)	; &MJ057648;
-    (<-formed
-     ((=ucs		  . #x65E8)	; 旨
-      ))
-    (->subsumptive
-     ((==mj		  . 057648)	; &g2-MJ057648;
-      (==koseki		  . 154550)	; &g2-MJ057648;
-      ))
+    (=>ucs@cognate	. #x23140)	; &A-cgnU+23140;
     ))
 (define-char
   '((<-denotational
-     ((==>ucs@bucs	  . #x65E8)	; &BUCS+65E8;
+     ((=>ucs@cognate	  . #x23140)	; &A-cgnU+23140;
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4EA0)	; 亠
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs		. #x23140)	; 𣅀
     ))
 (define-char
@@ -267,7 +283,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs		  . #x4EA0)	; 亠
+     ((=+>ucs@unicode	  . #x4EA0)	; &o-J0-5035;
+      (=+>jis-x0208	  . #x5035)	; &o-J0-5035; [48-21]
       )
      ((=ucs		  . #x65E5)	; 日
       ))
@@ -277,6 +294,12 @@
     (=gt-k		. 02303)	; &I-GT-K02303;
     (=gt-pj-3		. #x6E37)	; &I-GT-17371; [78-23]
     (=daikanwa		. 13739)	; &I-M-13739;
+    (<-same
+     ((=ucs		  . #x65E8)	; 旨
+      (=daikanwa	  . 13738)	; &I-M-13738;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
     (->subsumptive
      ((==ucs@iso	  . #x23140)	; &g2-GT-17371;
       (==cns11643-6	  . #x247A)	; &g2-GT-17371; [04-90]
@@ -296,6 +319,34 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=>ucs@cognate	  . #x23140)	; &A-cgnU+23140;
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 2)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((name*		  . "ideographic component person for top")
+      (=ucs		  . #x20089)	; 𠂉
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (=ucs		. #x2D94D)	; 𭥍
+    (=mj		. 057648)	; &I-MJ057648;
+    (=koseki		. 154550)	; 𭥍
+    (<-formed
+     ((=ucs		  . #x65E8)	; 旨
+      ))
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2D94D)	; &g2-MJ057648;
+      (==mj		  . 057648)	; &g2-MJ057648;
+      (==koseki		  . 154550)	; &g2-MJ057648;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
@@ -305,8 +356,8 @@
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component	  . #x7680)	; &IWDS1-355;
-      (=>iwds-1		  .  0355)	; &IWDS1-355;
+     ((=>ucs@component	  . #x7680)	; &A-compU+7680;
+      (=>iwds-1		  .  0355)	; &A-compU+7680;
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 2)
@@ -1128,6 +1179,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@iwds-1	  . #x4E8F)	; &A-IWDSU+4E8F;
+      (=>iwds-1		  .  0093)	; &A-IWDSU+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
@@ -1142,11 +1246,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)	; 臽
       ))
@@ -1163,8 +1267,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")
@@ -1178,8 +1282,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;
 	))
       ))
     ))
@@ -1697,13 +1801,66 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x5928)	; 夨
+      ))
     (=ucs		. #x23173)	; 𣅳
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23173)	; 𣅳
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=big5-cdp	  . #x8CD5)	; &CDP-8CD5;
+      ))
+    (=ucs@iso		. #x23173)	; &C6-2B72;
+    (=cns11643-6	. #x2B72)	; &C6-2B72; [11-82]
+    (=daikanwa		. 13787)	; &I-M-13787;
     (->subsumptive
-     ((=ucs@iso		  . #x23173)	; &M-13787;
-      (=daikanwa	  . 13787)	; &M-13787;
+     ((==ucs@iso	  . #x23173)	; &g2-M-13787;
+      (==daikanwa	  . 13787)	; &g2-M-13787;
+      (->subsumptive
+       ((===daikanwa	    . 13787)	; &R-M-13787;
+	)
+       ((===ucs@iso	    . #x23173)	; &R-U-00023173;
+	)
+       ((=hanziku-4	    . #xDE56)	; &HZK04-DE56;
+	))
+      )
+     ((==ucs@cns	  . #x23173)	; &g2-CU+23173;
+      (==cns11643-6	  . #x2B72)	; &g2-CU+23173; [11-82]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23173)	; 𣅳
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
       )
-     ((=cns11643-6	  . #x2B72)	; &C6-2B72; [11-82]
+     ((=ucs@unicode	  . #x5928)	; &AJ1-21376;
+      (=adobe-japan1-6	  . 21376)	; &AJ1-21376;
       ))
+    (=hanziku-4		. #xDC6F)	; &HZK04-DC6F;
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -2030,7 +2187,7 @@
       )
      ((=ucs		  . #x65E5)	; 日
       )
-     ((=>daikanwa	  . 11696)	; &A-M-11696;
+     ((=>iwds-1		  .  0007)	; &IWDS1-007;
       ))
     (=ucs		. #x6608)	; 昈
     (=big5		. #xCCC8)	; &I-B-CCC8;
@@ -2254,6 +2411,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
@@ -2263,11 +2429,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
@@ -2277,10 +2461,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)	; ⽇
@@ -2704,12 +2899,69 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 72)	; ⽇
+  '((ideographic-radical@r072 . 72)	; ⽇
+    (ideographic-radical@r073 . 73)	; ⽈
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x52FF)	; 勿
+      )
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      ))
+    (=>ucs@iwds-1	. #x66F6)	; &A-IWDSU+66F6;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x66F6)	; &A-IWDSU+66F6;
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x52FF)	; 勿
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (sound@ja/on	"kotu")
     (=ucs		. #x3ADA)	; 㫚
     (=cns11643-4	. #x2663)	; &I-C4-2663; [06-67]
     (=daikanwa		. 13813)	; &I-M-13813;
+    (<-formed
+     ((=ucs		  . #x6612)	; 昒
+      ))
+    (<-formed*sources
+     zhengzitong)
+    (<-interchangeable
+     ((=ucs		  . #x7B0F)	; 笏
+      ))
+    (<-same
+     ((=ucs		  . #x6612)	; 昒
+      (=daikanwa	  . 13812)	; &I-M-13812;
+      ))
+    (<-same*sources
+     zhengzitong daikanwa)
+    (->mistakable
+     ((=ucs		  . #x66F6)	; 曶
+      (=daikanwa	  . 14287)	; &I-M-14287;
+      ))
+    (->mistakable*sources
+     kangxi-biansi-2char daikanwa)
+    (->subsumptive
+     ((==daikanwa	  . 13813)	; &g2-M-13813;
+      )
+     ((==ucs@unicode	  . #x3ADA)	; &g2-UU+3ADA;
+      (==cns11643-4	  . #x2663)	; &g2-UU+3ADA; [06-67]
+      (->subsumptive
+       ((===cns11643-4	    . #x2663)	; &R-C4-2663; [06-67]
+	)
+       ((===ucs@unicode	    . #x3ADA)	; &R-UU+3ADA;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -2874,6 +3126,26 @@
     (=ucs-var-001	. #x6614)	; &U-v001+6614;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x6614)	; 昔
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((name		  . "CJK RADICAL GRASS TWO")
+      (=ucs		  . #x2EBF)	; ⺿
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (=ucs-var-003	. #x6614)	; &U-v003+6614;
+    ))
+(define-char
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
@@ -3011,6 +3283,60 @@
     (=>jis-x0213-1	. #x4B41)	; 冒 [43-33]
     ))
 (define-char
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (sound@ja/on	"si")
+    (=ucs		. #x2D94E)	; 𭥎
+    (=mj		. 057649)	; &I-MJ057649;
+    (=koseki		. 154560)	; 𭥎
+    (<-formed
+     ((=ucs		  . #x65E8)	; 旨
+      ))
+    (<-formed*sources
+     koseki)
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2D94E)	; &g2-MJ057649;
+      (==mj		  . 057649)	; &g2-MJ057649;
+      (==koseki		  . 154560)	; &g2-MJ057649;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs-itaiji-001	  . #x516B)	; &U-i001+516B;
+      )
+     ((=ucs		  . #x2D94E)	; 𭥎
+      ))
+    (sound@ja/on	"iN")
+    (=ucs		. #x2D95F)	; 𭥟
+    (=mj		. 057652)	; &I-MJ057652;
+    (=koseki		. 155490)	; 𭥟
+    (<-formed
+     ((=ucs		  . #x80E4)	; 胤
+      ))
+    (<-formed*sources
+     koseki)
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2D95F)	; &g2-MJ057652;
+      (==mj		  . 057652)	; &g2-MJ057652;
+      (==koseki		  . 155490)	; &g2-MJ057652;
+      ))
+    ))
+(define-char
   '((<-denotational
      ((=ucs		  . #x5192)	; 冒
       ))
@@ -3809,10 +4135,27 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x215D7)	; 𡗗
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs		. #x6625)	; 春
     (=big5		. #xAC4B)	; &I-B-AC4B;
     (->subsumptive
-     ((=ucs@jis		  . #x6625)	; &AJ1-02399;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs@iso	    . #x215D7)	; &AJ1-17472;
+	(=adobe-japan1-5    . 17472)	; &AJ1-17472;
+	)
+       ((=ucs		    . #x65E5)	; 日
+	))
+      (=ucs@jis		  . #x6625)	; &AJ1-02399;
       (=adobe-japan1-0	  . 02399)	; &AJ1-02399;
       (=jis-x0208	  . #x3D55)	; &I-J90-3D55; [29-53]
       (=ks-x1001	  . #x7570)	; &I-K0-7570; [85-80]
@@ -3854,7 +4197,15 @@
 	  ))
 	))
       )
-     ((=ucs@unicode	  . #x6625)	; &C1-514E;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8BE9)	; &CDP-8BE9;
+	)
+       ((=ucs		    . #x65E5)	; 日
+	))
+      (=ucs@unicode	  . #x6625)	; &C1-514E;
       (=ucs@JP/hanazono	  . nil)
       (=gb2312		  . #x343A)	; &C1-514E; [20-26]
       (=cns11643-1	  . #x514E)	; &I-C1-514E; [49-46]
@@ -4269,6 +4620,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
@@ -4278,10 +4637,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
@@ -4291,7 +4663,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)	; ⽇
@@ -4630,8 +5015,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component	  . #x6637)	; &IWDS1-320;
-      (=>iwds-1		  .  0320)	; &IWDS1-320;
+     ((=>ucs@iwds-1	  . #x6637)	; &A-IWDSU+6637;
+      (=>iwds-1		  .  0320)	; &A-IWDSU+6637;
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
@@ -4984,6 +5369,56 @@
     (=ucs		. #x2B783)	; 𫞃
     ))
 (define-char
+  '((<-denotational
+     ((=>ucs@cognate	  . #x66F7)	; &A-cgnU+66F7;
+      ))
+    (ideographic-radical@ucs . 72)	; ⽇
+    (ideographic-radical@koseki . 73)	; ⽈
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      )
+     ((=ucs		  . #x208CF)	; 𠣏
+      ))
+    (=ucs		. #x2D96D)	; ð­¥­
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2D96D)	; ð­¥­
+      ))
+    (ideographic-radical@ucs . 72)	; ⽇
+    (ideographic-radical@koseki . 73)	; ⽈
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      )
+     ((=ucs@iso		  . #x208CF)	; &M-02509;
+      (=daikanwa	  . 02509)	; &M-02509;
+      ))
+    (=ucs@JP/hanazono	. #x2D96D)	; &MJ057661;
+    (=mj		. 057661)	; &MJ057661;
+    (=koseki		. 156260)	; &MJ057661;
+    (<-formed
+     ((=ucs@unicode	  . #x66F7)	; &MJ013488;
+      (=mj		  . 013488)	; &MJ013488;
+      ))
+    (<-formed*sources
+     koseki)
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2D96D)	; &g2-MJ057661;
+      (==mj		  . 057661)	; &g2-MJ057661;
+      (==koseki		  . 156260)	; &g2-MJ057661;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
@@ -5341,13 +5776,13 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=>ucs@component	. #x6649)	; &IWDS1-388;
-    (=>iwds-1		.  0388)	; &IWDS1-388;
+    (=>ucs@component	. #x6649)	; &A-compU+6649;
+    (=>iwds-1		.  0388)	; &A-compU+6649;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component	  . #x6649)	; &IWDS1-388;
-      (=>iwds-1		  .  0388)	; &IWDS1-388;
+     ((=>ucs@component	  . #x6649)	; &A-compU+6649;
+      (=>iwds-1		  .  0388)	; &A-compU+6649;
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 6)
@@ -5425,8 +5860,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component	  . #x6649)	; &IWDS1-388;
-      (=>iwds-1		  .  0388)	; &IWDS1-388;
+     ((=>ucs@component	  . #x6649)	; &A-compU+6649;
+      (=>iwds-1		  .  0388)	; &A-compU+6649;
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 6)
@@ -6064,6 +6499,43 @@
     (=ucs-itaiji-001	. #x2C037)	; &U-i001+2C037;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x2D96D)	; ð­¥­
+      ))
+    (ideographic-radical@ucs . 72)	; ⽇
+    (ideographic-radical@koseki . 73)	; ⽈
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      )
+     ((=ucs@cns		  . #x208CF)	; &C5-2235;
+      (=cns11643-5	  . #x2235)	; &C5-2235; [02-21]
+      ))
+    (=ucs-var-001	. #x2D96D)	; &U-v001+2D96D;
+    ))
+(define-char
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x620C)	; 戌
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (=ruimoku-v6	. #xE082)	; &RUI6-E082;
+    (->subsumptive
+     ((==ruimoku-v6	  . #xE082)	; &g2-RUI6-E082;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
@@ -6310,27 +6782,19 @@
       )
      ((=ucs		  . #x514D)	; 免
       ))
+    (=>ucs@iwds-1	. #x665A)	; &J97-4855;
     (=ucs@big5		. #x665A)	; &J97-4855;
     (=>jis-x0208@1997	. #x4855)	; &J97-4855; [40-53]
     (=big5		. #xB1DF)	; &J97-4855;
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x665A)	; &J97-4855;
+     ((=>ucs@iwds-1	  . #x665A)	; &J97-4855;
       (=>jis-x0208@1997	  . #x4855)	; &J97-4855; [40-53]
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x665A)	; 晚
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x665A)	; 晚
-      ))
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -6340,8 +6804,8 @@
      ((=ucs@unicode	  . #x514D)	; &MJ007229;
       (=mj		  . 007229)	; &MJ007229;
       ))
-    (=ucs@unicode	. #x665A)	; &AJ1-13377;
-    (=adobe-japan1-4	. 13377)	; &AJ1-13377;
+    (=ucs		. #x665A)	; 晚
+    (=adobe-japan1-4	. 13377)	; &I-AJ1-13377;
     (=gb2312		. #x4D6D)	; &I-G0-4D6D; [45-77]
     (=cns11643-1	. #x5B25)	; &I-C1-5B25; [59-05]
     (=jis-x0213-1	. #x753C)	; &I-JX1-753C; [85-28]
@@ -6379,7 +6843,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x665A)	; 晚
+     ((=>ucs@iwds-1	  . #x665A)	; &J97-4855;
+      (=>jis-x0208@1997	  . #x4855)	; &J97-4855; [40-53]
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
@@ -6406,6 +6871,14 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (=ucs		  . #x2FFA)	; ⿺
+      )
+     ((=ucs		  . #x514D)	; 免
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs		. #x231B6)	; 𣆶
     ))
 (define-char
@@ -6415,12 +6888,20 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (=ucs		  . #x2FFA)	; ⿺
+      )
+     ((=ucs@unicode	  . #x514D)	; &MJ007229;
+      (=mj		  . 007229)	; &MJ007229;
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs@iso		. #x231B6)	; &C4-323D;
     (=cns11643-4	. #x323D)	; &C4-323D; [18-29]
     (=daikanwa		. 13941)	; &I-M-13941;
     (<-same
-     ((=ucs@unicode	  . #x665A)	; &AJ1-13377;
-      (=adobe-japan1-4	  . 13377)	; &AJ1-13377;
+     ((=ucs		  . #x665A)	; 晚
       (=daikanwa	  . 13940)	; &I-M-13940;
       ))
     (<-same*sources
@@ -6445,6 +6926,15 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (=ucs		  . #x2FFA)	; ⿺
+      )
+     ((=ucs@jis		  . #x514D)	; &MJ007230;
+      (=mj		  . 007230)	; &MJ007230;
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs@jis		. #x231B6)	; &AJ1-17744;
     (=adobe-japan1-5	. 17744)	; &AJ1-17744;
     (=jis-x0213-2	. #x2E24)	; &I-JX2-2E24; [14-04]
@@ -6879,6 +7369,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
@@ -6888,7 +7386,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
@@ -6897,10 +7408,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
@@ -7247,6 +7770,14 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=>ucs@cognate	  . #x8FB0)	; &A-cgnU+8FB0;
+      ))
     (=ucs		. #x6668)	; 晨
     ))
 (define-char
@@ -7330,7 +7861,7 @@
       )
      ((=ucs		  . #x65E5)	; 日
       )
-     ((=mj		  . 058835)	; &MJ058835;
+     ((=ucs		  . #x2E77E)	; 𮝾
       ))
     (===hng-kar		. 01730)	; &HNG018-01730;
     ))
@@ -7494,6 +8025,38 @@
     (=cns11643-5	. #x3274)	; &I-C5-3274; [18-84]
     ))
 (define-char
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=>gt-k		  . 03433)	; &A-GT-K03433;
+      ))
+    (=ucs		. #x2AC1E)	; 𪰞
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2AC1E)	; 𪰞
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=gt-k		  . 03433)	; &GT-K03433;
+      ))
+    (=ucs@JP/hanazono	. #x2AC1E)	; &hanaJU+2AC1E;
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2AC1E)	; &g2-hanaJU+2AC1E;
+      ))
+    ))
+(define-char
   '((<-denotational
      ((=ucs		  . #x2C037)	; 𬀷
       ))
@@ -7769,6 +8332,26 @@
     (=gt-pj-1		. #x4961)	; &I-GT-17722; [41-65]
     (=daikanwa		. 13982)	; &I-M-13982;
     (=shinjigen		.  3357)	; &AJ1-03539;
+    (<-Liwen
+     ((=ucs@unicode	  . #x669C)	; &AJ1-21720;
+      (=adobe-japan1-6	  . 21720)	; &AJ1-21720;
+      ))
+    (<-Liwen*sources
+     shuowen-tongxun-dingsheng)
+    (<-interchangeable
+     ((=ucs@unicode	  . #x6EA5)	; &MJ015697;
+      (=mj		  . 015697)	; &MJ015697;
+      (=daikanwa	  . 17957)	; &I-M-17957;
+      ))
+    (<-interchangeable*sources
+     shuowen-zhu daikanwa)
+    (<-same
+     ((=ucs@unicode	  . #x669C)	; &AJ1-21720;
+      (=adobe-japan1-6	  . 21720)	; &AJ1-21720;
+      (=daikanwa	  . 14082)	; &I-M-14082;
+      ))
+    (<-same*sources
+     shuowen-tongxun-dingsheng daikanwa)
     (->subsumptive
      ((==daikanwa	  . 13982)	; &g2-M-13982;
       )
@@ -8048,11 +8631,48 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x758C)	; 疌
+      ))
+    (sound@ja/on	"sEHu")
+    (=ucs		. #x3AF8)	; 㫸
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3AF8)	; 㫸
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x3AF8)	; 㫸
-    (=cns11643-3	. #x3B7B)	; &I-C3-3B7B; [27-91]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x758C)	; &AJ1-18136;
+      (=adobe-japan1-5	  . 18136)	; &AJ1-18136;
+      ))
+    (=ucs@unicode	. #x3AF8)	; &C3-3B7B;
+    (=cns11643-3	. #x3B7B)	; &C3-3B7B; [27-91]
     (=daikanwa		. 13993)	; &I-M-13993;
+    (->subsumptive
+     ((==ucs@unicode	  . #x3AF8)	; &g2-M-13993;
+      (==cns11643-3	  . #x3B7B)	; &g2-M-13993; [27-91]
+      (==daikanwa	  . 13993)	; &g2-M-13993;
+      (->subsumptive
+       ((===daikanwa	    . 13993)	; &R-M-13993;
+	)
+       ((===cns11643-3	    . #x3B7B)	; &R-C3-3B7B; [27-91]
+	)
+       ((===ucs@unicode	    . #x3AF8)	; &R-UU+3AF8;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -8204,7 +8824,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=big5-cdp	  . #x8CB6)	; &CDP-8CB6;
+     ((=big5-cdp	  . #x8CB6)	; &GT-16595;
       (=daikanwa	  . 13145)	; &I-M-13145;
       )
      ((=ucs		  . #x65E5)	; 日
@@ -8910,32 +9530,78 @@
      ((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)	; ⽇
-    (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)	; ⽇
+  '((<-denotational
+     ((=ucs		  . #x23205)	; 𣈅
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x231F2)	; 𣇲
-    (=cns11643-5	. #x392B)	; &I-C5-392B; [25-11]
-    (=daikanwa		. 14022)	; &I-M-14022;
-    ))
-(define-char
-  '((ideographic-radical . 72)	; ⽇
+    (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)	; ⽇
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs		. #x231F2)	; 𣇲
+    (=cns11643-5	. #x392B)	; &I-C5-392B; [25-11]
+    (=daikanwa		. 14022)	; &I-M-14022;
+    ))
+(define-char
+  '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=daikanwa		. 14023)	; &M-14023;
@@ -9005,7 +9671,31 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=daikanwa		. 14029)	; &M-14029;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x2628B)	; 𦊋
+      ))
+    (sound@ja/on	"Wi")
+    (=ucs		. #x2320E)	; 𣈎
+    (=mj		. 037733)	; &I-MJ037733;
+    (=koseki		. 157890)	; 𣈎
+    (=daikanwa		. 14029)	; &I-M-14029;
+    (->subsumptive
+     ((==daikanwa	  . 14029)	; &g2-M-14029;
+      )
+     ((==ucs@iso	  . #x2320E)	; &g2-MJ037733;
+      (==mj		  . 037733)	; &g2-MJ037733;
+      (==koseki		  . 157890)	; &g2-MJ037733;
+      (->subsumptive
+       ((===mj		    . 037733)	; &R-MJ037733;
+	)
+       ((===ucs@iso	    . #x2320E)	; &R-U-0002320E;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -9016,26 +9706,10 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x665A)	; &J97-4855;
+     ((=>ucs@iwds-1	  . #x665A)	; &J97-4855;
       (=>jis-x0208@1997	  . #x4855)	; &J97-4855; [40-53]
       ))
     (ideographic-radical . 72)	; ⽇
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x65E5)	; 日
-      )
-     ((=ucs@jis		  . #x514D)	; &MJ007230;
-      (=mj		  . 007230)	; &MJ007230;
-      ))
-    (=ucs		. #x6669)	; 晩
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x6669)	; 晩
-      ))
-    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (ideographic-structure
@@ -9047,18 +9721,17 @@
      ((=ucs@jis		  . #x514D)	; &MJ007230;
       (=mj		  . 007230)	; &MJ007230;
       ))
-    (=ucs@unicode	. #x6669)	; &AJ1-03433;
-    (=adobe-japan1-0	. 03433)	; &AJ1-03433;
+    (=ucs		. #x6669)	; 晩
+    (=adobe-japan1-0	. 03433)	; &I-AJ1-03433;
     (=jis-x0208		. #x4855)	; &I-J90-4855; [40-53]
     (=ks-x1001		. #x5839)	; &I-K0-5839; [56-25]
     (=cns11643-3	. #x3C26)	; &I-C3-3C26; [28-06]
     (=jis-x0213-1	. #x4855)	; &I-JX1-4855; [40-53]
     (=gt		. 17718)	; &I-GT-17718;
     (=gt-pj-1		. #x4855)	; &I-GT-17718; [40-53]
-    (=daikanwa/+p	. 14030)	; &AJ1-03433;
+    (=daikanwa/+p	. 14030)	; 晩
     (<-simplified@JP/Jouyou
-     ((=ucs@unicode	  . #x665A)	; &AJ1-13377;
-      (=adobe-japan1-4	  . 13377)	; &AJ1-13377;
+     ((=ucs		  . #x665A)	; 晚
       ))
     (->subsumptive
      ((==ucs@unicode	  . #x6669)	; &g2-AJ1-03433;
@@ -9344,6 +10017,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)	; 㬁
@@ -9443,13 +10140,13 @@
       )
      ((=ucs		  . #x65E5)	; 日
       )
-     ((=ucs		  . #x53DA)	; 叚
+     ((=>ucs@cognate	  . #x53DA)	; &A-cgnU+53DA;
       ))
-    (=ucs		. #x6687)	; 暇
+    (=>ucs@cognate	. #x6687)	; &A-cgnU+6687;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6687)	; 暇
+     ((=>ucs@cognate	  . #x6687)	; &A-cgnU+6687;
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 9)
@@ -9460,11 +10157,10 @@
       )
      ((=ucs		  . #x65E5)	; 日
       )
-     ((=ucs@unicode	  . #x53DA)	; &AJ1-14372;
-      (=adobe-japan1-4	  . 14372)	; &AJ1-14372;
+     ((=ucs		  . #x53DA)	; 叚
       ))
-    (=ucs@unicode	. #x6687)	; &AJ1-01355;
-    (=adobe-japan1-0	. 01355)	; &AJ1-01355;
+    (=ucs		. #x6687)	; 暇
+    (=adobe-japan1-0	. 01355)	; &I-AJ1-01355;
     (=jis-x0208		. #x324B)	; &I-J90-324B; [18-43]
     (=gb2312		. #x4F3E)	; &I-G0-4F3E; [47-30]
     (=ks-x1001		. #x4A2C)	; &I-K0-4A2C; [42-12]
@@ -9474,7 +10170,7 @@
     (=gt		. 17751)	; &I-GT-17751;
     (=gt-pj-1		. #x324B)	; &I-GT-17751; [18-43]
     (=daikanwa		. 14036)	; &I-M-14036;
-    (=shinjigen		.  3363)	; &AJ1-01355;
+    (=shinjigen		.  3363)	; 暇
     (->subsumptive
      ((=decomposition@cid
        ((=ucs		    . #x6687)	; 暇
@@ -9512,7 +10208,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6687)	; 暇
+     ((=>ucs@cognate	  . #x6687)	; &A-cgnU+6687;
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 9)
@@ -9630,6 +10326,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
@@ -9639,7 +10344,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
@@ -9648,10 +10392,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
@@ -10928,6 +11702,15 @@
     (ideographic-radical@ucs/compat . 73)	; ⽈
     (ideographic-strokes@ucs/compat . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x7ADD)	; 竝
+      )
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      ))
     (=ucs		. #x669C)	; 暜
     ))
 (define-char
@@ -10937,21 +11720,32 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=+>ucs@unicode	. #x669C)	; &o-UU+669C;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x7ADD)	; 竝
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (=ucs@unicode	. #x669C)	; &AJ1-21720;
+    (=adobe-japan1-6	. 21720)	; &AJ1-21720;
+    (=jis-x0212		. #x4255)	; &I-JSP-4255; [34-53]
+    (=cns11643-3	. #x4735)	; &I-C3-4735; [39-21]
+    (=daikanwa		. 14082)	; &I-M-14082;
+    (=shinjigen		.  3358)	; &AJ1-21720;
+    (<-original
+     ((=ucs@unicode	  . #x666E)	; &AJ1-03539;
+      (=adobe-japan1-0	  . 03539)	; &AJ1-03539;
+      (=jis-x0208	  . #x4961)	; &I-J90-4961; [41-65]
+      (=shinjigen	  .  3357)	; &AJ1-03539;
+      ))
+    (<-original*sources
+     shinjigen)
     (->subsumptive
-     ((=ucs@unicode	  . #x669C)	; &AJ1-21720;
-      (=adobe-japan1-6	  . 21720)	; &AJ1-21720;
-      (=jis-x0212	  . #x4255)	; &I-JSP-4255; [34-53]
-      (=daikanwa	  . 14082)	; &I-M-14082;
-      (=shinjigen	  .  3358)	; &AJ1-21720;
-      (<-original
-       ((=ucs@unicode	    . #x666E)	; &AJ1-03539;
-	(=adobe-japan1-0    . 03539)	; &AJ1-03539;
-	(=jis-x0208	    . #x4961)	; &I-J90-4961; [41-65]
-	(=shinjigen	    .  3357)	; &AJ1-03539;
-	))
-      (<-original*sources
-       shinjigen)
+     ((=>>ucs@unicode	  . #x669C)	; &G-AJ1-21720;
+      (=>>adobe-japan1-6  . 21720)	; &G-AJ1-21720;
+      (=>>daikanwa	  . 14082)	; &G-AJ1-21720;
       (->subsumptive
        ((==daikanwa	    . 14082)	; &g2-M-14082;
 	)
@@ -10968,8 +11762,11 @@
 	  ))
 	))
       )
-     ((=ucs@cns		  . #x669C)	; &C3-4735;
-      (=cns11643-3	  . #x4735)	; &C3-4735; [39-21]
+     ((=>>ucs@cns	  . #x669C)	; &G-CU+669C;
+      (->subsumptive
+       ((==ucs@cns	    . #x669C)	; &g2-CU+669C;
+	(==cns11643-3	    . #x4735)	; &g2-CU+669C; [39-21]
+	))
       ))
     ))
 (define-char
@@ -11124,7 +11921,8 @@
       )
      ((=ucs		  . #x65E5)	; 日
       )
-     ((=>jis-x0208	  . #x3962)	; &J97-3962; [25-66]
+     ((=>ucs@iwds-1	  . #x9AD8)	; &J97-3962;
+      (=>jis-x0208	  . #x3962)	; &J97-3962; [25-66]
       ))
     (=ucs		. #x66A0)	; 暠
     ))
@@ -11287,6 +12085,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;
     ))
@@ -11297,7 +12103,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
@@ -11306,10 +12125,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
@@ -11415,9 +12248,47 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x501D)	; 倝
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
     (=ucs		. #x23259)	; 𣉙
-    (=cns11643-5	. #x4644)	; &I-C5-4644; [38-36]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23259)	; 𣉙
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs@unicode	  . #x501D)	; &AJ1-21127;
+      (=adobe-japan1-6	  . 21127)	; &AJ1-21127;
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (=ucs@iso		. #x23259)	; &C5-4644;
+    (=cns11643-5	. #x4644)	; &C5-4644; [38-36]
     (=daikanwa		. 14097)	; &I-M-14097;
+    (->subsumptive
+     ((==ucs@iso	  . #x23259)	; &g2-M-14097;
+      (==cns11643-5	  . #x4644)	; &g2-M-14097; [38-36]
+      (==daikanwa	  . 14097)	; &g2-M-14097;
+      (->subsumptive
+       ((===daikanwa	    . 14097)	; &R-M-14097;
+	)
+       ((===cns11643-5	    . #x4644)	; &R-C5-4644; [38-36]
+	)
+       ((===ucs@iso	    . #x23259)	; &R-U-00023259;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -11859,15 +12730,6 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x66A8)	; 暨
-    (=gb2312		. #x745F)	; &I-G0-745F; [84-63]
-    (=cns11643-1	. #x6924)	; &I-C1-6924; [73-04]
-    (=big5		. #xBA5B)	; &I-B-BA5B;
-    ))
-(define-char
-  '((ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
     (=ucs		. #x2326A)	; 𣉪
     (=cns11643-5	. #x463C)	; &I-C5-463C; [38-28]
     ))
@@ -11950,6 +12812,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
@@ -11959,10 +12829,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
@@ -11972,7 +12856,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)	; ⽇
@@ -11990,6 +12888,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
@@ -11999,7 +12905,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
@@ -12008,10 +12926,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
@@ -12182,6 +13114,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
@@ -12191,10 +13131,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
@@ -12204,7 +13157,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)	; ⽇
@@ -12324,7 +13291,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
@@ -12333,11 +13309,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
@@ -12347,8 +13336,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)	; ⽇
@@ -13420,7 +14423,23 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 72)	; ⽇
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@iwds-1	  . #x65E3)	; &A-IWDSU+65E3;
+      )
+     ((=>ucs@component	  . #x4E14)	; &A-compU+4E14;
+      (=>iwds-1		  .  0114)	; &A-compU+4E14;
+      ))
+    (=>ucs@iwds-1	. #x66C1)	; &A-IWDSU+66C1;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x66C1)	; &A-IWDSU+66C1;
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (ideographic-structure
@@ -13429,7 +14448,8 @@
       )
      ((=ucs		  . #x65E3)	; 旣
       )
-     ((=ucs		  . #x65E6)	; 旦
+     ((=>ucs@component	  . #x4E14)	; &A-compU+4E14;
+      (=>iwds-1		  .  0114)	; &A-compU+4E14;
       ))
     (=ucs		. #x66C1)	; 曁
     ))
@@ -13548,6 +14568,53 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x66C1)	; &A-IWDSU+66C1;
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x65E2)	; 既
+      )
+     ((=>ucs@component	  . #x4E14)	; &A-compU+4E14;
+      (=>iwds-1		  .  0114)	; &A-compU+4E14;
+      ))
+    (=ucs		. #x66A8)	; 暨
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x66A8)	; 暨
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs@unicode	  . #x65E2)	; &AJ1-01591;
+      (=adobe-japan1-0	  . 01591)	; &AJ1-01591;
+      )
+     ((=ucs		  . #x65E6)	; 旦
+      ))
+    (=ucs@unicode	. #x66A8)	; &C1-6924;
+    (=gb2312		. #x745F)	; &C1-6924; [84-63]
+    (=cns11643-1	. #x6924)	; &I-C1-6924; [73-04]
+    (=big5		. #xBA5B)	; &I-B-BA5B;
+    (->subsumptive
+     ((==ucs@unicode	  . #x66A8)	; &g2-UU+66A8;
+      (==gb2312		  . #x745F)	; &g2-UU+66A8; [84-63]
+      (==cns11643-1	  . #x6924)	; &g2-UU+66A8; [73-04]
+      (->subsumptive
+       ((===cns11643-1	    . #x6924)	; &R-C1-6924; [73-04]
+	)
+       ((===ucs@unicode	    . #x66A8)	; &R-UU+66A8;
+	))
+      ))
+    ))
+(define-char
   '((=>ucs		. #x3B1D)	; 㬝
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 12)
@@ -14966,6 +16033,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)	; 㬣
@@ -15276,21 +16360,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)	; &g2-UU+3B25;
+      (==ucs@JP/hanazono  . nil)
       )
-     ((=ucs@unicode	  . #x3B25)	; &UU+3B25;
+     ((==ucs@cns	  . #x3B25)	; &g2-CU+3B25;
+      (==cns11643-4	  . #x5B41)	; &g2-CU+3B25; [59-33]
       )
-     ((=cns11643-4	  . #x5B41)	; &C4-5B41; [59-33]
+     ((==cbeta		  . 07862)	; &g2-CB07862;
       ))
     ))
 (define-char
@@ -15439,11 +16552,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)	; ⽇
@@ -15511,41 +16673,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)	; ⽇
@@ -15559,6 +16751,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]
@@ -15570,7 +16770,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)	; ⽇
@@ -15894,14 +17103,56 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x6B4E)	; 歎
+      ))
+    (=ucs		. #x232F8)	; 𣋸
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x232F8)	; 𣋸
+      ))
+    (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x232F8)	; 𣋸
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs@unicode	  . #x6B4E)	; &HD-FT-3D30;
+      (=ks-x1001	  . #x7727)	; &HD-FT-3D30; [87-07]
+      (=cns11643-1	  . #x6D45)	; &I-C1-6D45; [77-37]
+      (=jis-x0213-1@2004  . #x4337)	; &I-JX3-4337; [35-23]
+      (=daikanwa	  . 16182)	; &I-M-16182;
+      ))
+    (=ucs@iso		. #x232F8)	; &C7-473E;
+    (=cns11643-7	. #x473E)	; &C7-473E; [39-30]
+    (=daikanwa		. 14247)	; &I-M-14247;
+    (<-same
+     ((=ucs@unicode	  . #x3B2E)	; &C5-756E;
+      (=cns11643-5	  . #x756E)	; &C5-756E; [85-78]
+      (=daikanwa	  . 14267)	; &I-M-14267;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
     (->subsumptive
-     ((=cns11643-7	  . #x473E)	; &C7-473E; [39-30]
-      (=daikanwa	  . 14247)	; &I-M-14247;
+     ((==ucs@cns	  . #x232F8)	; &g2-M-14247;
+      (==cns11643-7	  . #x473E)	; &g2-M-14247; [39-30]
+      (==daikanwa	  . 14247)	; &g2-M-14247;
+      (->subsumptive
+       ((===daikanwa	    . 14247)	; &R-M-14247;
+	)
+       ((===cns11643-7	    . #x473E)	; &R-C7-473E; [39-30]
+	))
       )
-     ((=ucs@iso		  . #x232F8)	; &U-000232F8;
+     ((==ucs@iso	  . #x232F8)	; &g2-IU-000232F8;
       ))
     ))
 (define-char
@@ -16590,34 +17841,112 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x3B2E)	; 㬮
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 19)
-    (total-strokes	 . 23)
-    (=daikanwa		. 14267)	; &M-14267;
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      )
+     ((=ucs		  . #x96E3)	; 難
+      ))
+    (=ucs		. #x3B2E)	; 㬮
     ))
 (define-char
-  '((morohashi-daikanwa	14267 0 1)
+  '((<-denotational
+     ((=ucs		  . #x3B2E)	; 㬮
+      ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 19)
     (total-strokes	 . 23)
-    (=ucs		. #x3B2E)	; 㬮
-    (=cns11643-5	. #x756E)	; &I-C5-756E; [85-78]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x65E5)	; &A-compU+65E5;
+      (=>iwds-1		  .  0118)	; &A-compU+65E5;
+      )
+     ((=ucs		  . #xFA68)	; 難
+      ))
+    (=ucs@unicode	. #x3B2E)	; &C5-756E;
+    (=cns11643-5	. #x756E)	; &C5-756E; [85-78]
+    (=daikanwa		. 14267)	; &I-M-14267;
+    (->formed
+     ((=ucs@iso		  . #x23316)	; &C7-5B5C;
+      (=cns11643-7	  . #x5B5C)	; &C7-5B5C; [59-60]
+      (=daikanwa	  . 14268)	; &I-M-14268;
+      ))
+    (->formed*sources
+     jiyun daikanwa)
+    (->subsumptive
+     ((==daikanwa	  . 14267)	; &g2-M-14267;
+      )
+     ((==ucs@unicode	  . #x3B2E)	; &g2-UU+3B2E;
+      (==cns11643-5	  . #x756E)	; &g2-UU+3B2E; [85-78]
+      (->subsumptive
+       ((===cns11643-5	    . #x756E)	; &R-C5-756E; [85-78]
+	)
+       ((===ucs@unicode	    . #x3B2E)	; &R-UU+3B2E;
+	))
+      ))
     ))
 (define-char
-  '((=>ucs		. #x23316)	; 𣌖
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 19)
-    (total-strokes	 . 23)
-    (=daikanwa		. 14268)	; &M-14268;
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #x96E3)	; 難
+      ))
+    (sound@ja/on	"daN")
+    (=ucs		. #x23316)	; 𣌖
     ))
 (define-char
-  '((morohashi-daikanwa	14268 0 1)
+  '((<-denotational
+     ((=ucs		  . #x23316)	; 𣌖
+      ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 19)
     (total-strokes	 . 23)
-    (=ucs		. #x23316)	; 𣌖
-    (=cns11643-7	. #x5B5C)	; &I-C7-5B5C; [59-60]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((=ucs		  . #xFA68)	; 難
+      ))
+    (=ucs@iso		. #x23316)	; &C7-5B5C;
+    (=cns11643-7	. #x5B5C)	; &C7-5B5C; [59-60]
+    (=daikanwa		. 14268)	; &I-M-14268;
+    (<-formed
+     ((=ucs@unicode	  . #x3B2E)	; &C5-756E;
+      (=cns11643-5	  . #x756E)	; &C5-756E; [85-78]
+      (=daikanwa	  . 14267)	; &I-M-14267;
+      ))
+    (<-formed*sources
+     jiyun)
+    (<-same
+     ((=ucs@unicode	  . #x3B2E)	; &C5-756E;
+      (=cns11643-5	  . #x756E)	; &C5-756E; [85-78]
+      (=daikanwa	  . 14267)	; &I-M-14267;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
+    (->subsumptive
+     ((==daikanwa	  . 14268)	; &g2-M-14268;
+      )
+     ((==ucs@iso	  . #x23316)	; &g2-IU-00023316;
+      (==cns11643-7	  . #x5B5C)	; &g2-IU-00023316; [59-60]
+      (->subsumptive
+       ((===cns11643-7	    . #x5B5C)	; &R-C7-5B5C; [59-60]
+	)
+       ((===ucs@iso	    . #x23316)	; &R-U-00023316;
+	))
+      ))
     ))
 (define-char
   '((=>ucs		. #x3B2F)	; 㬯