X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R058-Snout.el;h=c9f7958b2d70a9d5842492bab2383fc0e6974299;hb=60df0463bae1e1bbbffb8e3620848c45e2a473f0;hp=8c6d62c3ad2ca9bf45dda86901fc3480343e3f9a;hpb=769c3b07e1236f0f84fba1613a29a1665aa4131b;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R058-Snout.el b/lisp/utf-2000/Ideograph-R058-Snout.el
index 8c6d62c..c9f7958 100644
--- a/lisp/utf-2000/Ideograph-R058-Snout.el
+++ b/lisp/utf-2000/Ideograph-R058-Snout.el
@@ -2,11 +2,14 @@
 (define-char
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
-    (=>ucs@component	. #x5F51)	; &A-compU+5F51;
+    (=>iwds-1*note	"80+372+373")
+    (=>ucs@iwds-1	. #x5F51)	; &A-IWDSU+5F51;
+    (=>iwds-1		.  37280)	; &A-IWDSU+5F51;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
       ))
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
@@ -18,7 +21,7 @@
      ((=ucs		  . #x5F50)	; 彐
       ))
     (<-denotational@component
-     ((=>iwds-1		  .  0372)	; &IWDS1-372;
+     ((=>big5-cdp	  . #x8A6E)	; &IWDS1-372;
       ))
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
@@ -131,8 +134,14 @@
     (=ucs@JP/hanazono	. nil)
     (=gb2312		. #x6566)	; &G0-6566; [69-70]
     (=big5-cdp		. #x897C)	; &I-CDP-897C;
-    (=gt-k		. 00266)	; &GT-K00266;
+    (=gt-k		. 00266)	; &I-GT-K00266;
     (=gt-pj-k1		. #x3663)	; &G0-6566; [22-67]
+    (<-formed@component
+     ((=ucs		  . #x722A)	; 爪
+      ))
+    (<-formed@flipped-horizontally
+     ((=ucs		  . #x30004)	; 𰀄
+      ))
     (->subsumptive
      ((==ucs@unicode	  . #x5F50)	; &g2-UU+5F50;
       (==ucs@JP/hanazono  . nil)
@@ -146,7 +155,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
       ))
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
@@ -155,10 +165,11 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
       ))
     (<-denotational@component
-     ((=>iwds-1		  .  0372)	; &IWDS1-372;
+     ((=>big5-cdp	  . #x8A6E)	; &IWDS1-372;
       )
      ((=>ucs@component	  . #x2E95)	; &A-compU+2E95;
       (=>iwds-1		  .  0373)	; &A-compU+2E95;
@@ -174,7 +185,6 @@
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (=>ucs@iwds-1	. #x5F51)	; &AJ1-04779;
     (=ucs@unicode	. #x5F51)	; &AJ1-04779;
     (=adobe-japan1-0	. 04779)	; &AJ1-04779;
     (=jis-x0208		. #x5740)	; &I-J90-5740; [55-32]
@@ -228,7 +238,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
       ))
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
@@ -436,6 +447,41 @@
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x2008E)	; 𠂎
+      )
+     ((=ucs		  . #x5F50)	; 彐
+      ))
+    (=ucs		. #x2244F)	; 𢑏
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2244F)	; 𢑏
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=big5-cdp	  . #x8D41)	; &CDP-8D41;
+      )
+     ((=ucs@jis		  . #x5F50)	; &AJ1-14521;
+      (=adobe-japan1-4	  . 14521)	; &AJ1-14521;
+      ))
+    (=ucs@iso		. #x2244F)	; &U-0002244F;
+    (->subsumptive
+     ((==ucs@iso	  . #x2244F)	; &g2-IU-0002244F;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x22453)	; 𢑓
@@ -447,6 +493,38 @@
       ))
     ))
 (define-char
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@mj . 58)	; â¼¹
+    (ideographic-strokes@mj . 4)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x206A4)	; 𠚤
+      )
+     ((=ucs-var-002	  . #x4E11)	; &U-v002+4E11;
+      ))
+    (=ucs		. #x2CED1)	; 𬻑
+    (=mj		. 057476)	; &I-MJ057476;
+    (=koseki		. 112110)	; 𬻑
+    (<-formed
+     ((=ucs@unicode	  . #x82BB)	; &AJ1-06328;
+      (=adobe-japan1-0	  . 06328)	; &AJ1-06328;
+      ))
+    (<-formed*sources
+     koseki)
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2CED1)	; &g2-MJ057476;
+      (==mj		  . 057476)	; &g2-MJ057476;
+      (==koseki		  . 112110)	; &g2-MJ057476;
+      (->subsumptive
+       ((===mj		    . 057476)	; &R-MJ057476;
+	))
+      ))
+    ))
+(define-char
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
@@ -454,7 +532,28 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs		  . #x2FF3)	; ⿳
       )
-     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
+      )
+     ((=>big5-cdp	  . #x89A6)	; &A-CDP-89A6;
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=>ucs@cognate	. #x38C7)	; &A-cgnU+38C7;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@cognate	  . #x38C7)	; &A-cgnU+38C7;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
       )
      ((=big5-cdp	  . #x89A6)	; &CDP-89A6;
       )
@@ -487,6 +586,7 @@
     (=gt-k		. 04509)	; &I-GT-K04509;
     (=gt-pj-3		. #x4A22)	; &I-GT-12511; [42-02]
     (=daikanwa		. 09915)	; &I-M-09915;
+    (=shinjigen		.  2300)	; &GT-12511;
     (->subsumptive
      ((==big5-cdp	  . #x8950)	; &g2-CDP-8950;
       (==daikanwa	  . 09915)	; &g2-CDP-8950;
@@ -498,6 +598,7 @@
       )
      ((==ucs@cns	  . #x38C7)	; &g2-CU+38C7;
       (==cns11643-4	  . #x2642)	; &g2-CU+38C7; [06-34]
+      (==shinjigen	  .  2300)	; &g2-CU+38C7;
       )
      ((==gt		  . 12511)	; &g2-GT-12511;
       (==gt-k		  . 04509)	; &g2-GT-12511;
@@ -507,6 +608,161 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x38C7)	; 㣇
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs-itaiji-001	  . #x5F51)	; &U-i001+5F51;
+      )
+     ((=big5-cdp	  . #x89A6)	; &CDP-89A6;
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=ucs-itaiji-004	. #x38C7)	; &U-i004+38C7;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@cognate	  . #x38C7)	; &A-cgnU+38C7;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs-itaiji-001	  . #x5F51)	; &U-i001+5F51;
+      )
+     ((=ucs@iso		  . #x2008A)	; &U-0002008A;
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=ucs-itaiji-005	. #x38C7)	; &U-i005+38C7;
+    (->subsumptive
+     ((==ucs-itaiji-005	  . #x38C7)	; &g2-U-i005+38C7;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@cognate	  . #x38C7)	; &A-cgnU+38C7;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
+      )
+     ((=ucs@iso		  . #x2008A)	; &U-0002008A;
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=>ucs-itaiji-003	. #x5F56)	; &A-U-i003+5F56;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-003	  . #x5F56)	; &A-U-i003+5F56;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs@unicode	  . #x5F51)	; &AJ1-04779;
+      (=adobe-japan1-0	  . 04779)	; &AJ1-04779;
+      )
+     ((=ucs@iso		  . #x2008A)	; &U-0002008A;
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=ucs-itaiji-003	. #x5F56)	; &U-i003+5F56;
+    (->subsumptive
+     ((==ucs-itaiji-003	  . #x5F56)	; &g2-U-i003+5F56;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-003	  . #x5F56)	; &A-U-i003+5F56;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x5F50)	; 彐
+      )
+     ((name		  . "CJK RADICAL KNIFE ONE")
+      (=ucs		  . #x2E88)	; ⺈
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=>ucs-itaiji-009	. #x38C7)	; &A-U-i009+38C7;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-009	  . #x38C7)	; &A-U-i009+38C7;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs@jis		  . #x5F50)	; &AJ1-14521;
+      (=adobe-japan1-4	  . 14521)	; &AJ1-14521;
+      )
+     ((name		  . "CJK RADICAL KNIFE ONE")
+      (=ucs		  . #x2E88)	; ⺈
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=ucs-itaiji-008	. #x38C7)	; &U-i008+38C7;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-009	  . #x38C7)	; &A-U-i009+38C7;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs@unicode	  . #x5F50)	; &G0-6566;
+      (=gb2312		  . #x6566)	; &G0-6566; [69-70]
+      )
+     ((name		  . "CJK RADICAL KNIFE ONE")
+      (=ucs		  . #x2E88)	; ⺈
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=ucs-itaiji-009	. #x38C7)	; &U-i009+38C7;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-009	  . #x38C7)	; &A-U-i009+38C7;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs-itaiji-010	. #x38C7)	; &U-i010+38C7;
+    ))
+(define-char
   '((ideographic-radical . 58)	; â¼¹
     (=ucs		. #x22454)	; 𢑔
     (->subsumptive
@@ -648,14 +904,48 @@
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=adobe-japan1-4	  . 15391)	; &AJ1-15391;
+      )
+     ((=big5-cdp	  . #x89A6)	; &CDP-89A6;
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
     (=ucs		. #x2F896)	; 㣇
+    (=cns11643-6	. #x2B39)	; &I-C6-2B39; [11-25]
+    (=hanyo-denshi/ks	. 112160)	; 㣇
+    (=gt		. 12512)	; &I-GT-12512;
+    (=gt-pj-3		. #x4A26)	; &I-GT-12512; [42-06]
+    (=daikanwa		. 49088)	; &I-M-49088;
+    (<-ancient
+     ((=ucs@unicode	  . #x38C7)	; &GT-12511;
+      (=cns11643-4	  . #x2642)	; &GT-12511; [06-34]
+      (=daikanwa	  . 09915)	; &I-M-09915;
+      ))
+    (<-ancient*sources
+     daikanwa)
     (->subsumptive
-     ((=gt		  . 12512)	; &GT-12512;
-      (=gt-pj-3		  . #x4A26)	; &GT-12512; [42-06]
-      (=daikanwa	  . 49088)	; &I-M-49088;
+     ((==gt		  . 12512)	; &g2-GT-12512;
+      (==daikanwa	  . 49088)	; &g2-GT-12512;
+      (->subsumptive
+       ((===daikanwa	    . 49088)	; &R-M-49088;
+	)
+       ((===gt		    . 12512)	; &R-GT-12512;
+	))
       )
-     ((=ucs@iso		  . #x2F896)	; &C6-2B39;
-      (=cns11643-6	  . #x2B39)	; &C6-2B39; [11-25]
+     ((==hanyo-denshi/ks  . 112160)	; &g2-HD-KS-112160;
+      (=hanyo-denshi/ks/mf . #x2BD0)	; &g2-HD-KS-112160;
+      )
+     ((==ucs@iso	  . #x2F896)	; &g2-IU-0002F896;
+      (==cns11643-6	  . #x2B39)	; &g2-IU-0002F896; [11-25]
+      (->subsumptive
+       ((===cns11643-6	    . #x2B39)	; &R-C6-2B39; [11-25]
+	)
+       ((===ucs@iso	    . #x2F896)	; &R-U-0002F896;
+	))
       ))
     ))
 (define-char
@@ -753,7 +1043,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
       )
      ((=ucs		  . #x27C28)	; 𧰨
       ))
@@ -1024,6 +1315,43 @@
     (=daikanwa		. 09922)	; &I-M-09922;
     ))
 (define-char
+  '((ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
+      )
+     ((=ucs		  . #x5196)	; 冖
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
+    (=>ucs-itaiji-007	. #x675F)	; &A-U-i007+675F;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-007	  . #x675F)	; &A-U-i007+675F;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs@unicode	  . #x5F50)	; &G0-6566;
+      (=gb2312		  . #x6566)	; &G0-6566; [69-70]
+      )
+     ((=ucs		  . #x5196)	; 冖
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
+    (=ucs-itaiji-007	. #x675F)	; &U-i007+675F;
+    ))
+(define-char
   '((=>ucs		. #x22458)	; 𢑘
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 7)
@@ -1076,29 +1404,73 @@
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=ucs		. #x5F57)	; 彗
-    (=big5		. #xB16B)	; &I-B-B16B;
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x38C7)	; 㣇
+      )
+     ((=ucs		  . #x5196)	; 冖
+      ))
+    (=>ucs-itaiji-003	. #x38C7)	; &A-U-i003+38C7;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x5F57)	; 彗
+     ((=>ucs-itaiji-003	  . #x38C7)	; &A-U-i003+38C7;
       ))
     (ideographic-radical . 58)	; â¼¹
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=decomposition@cid
-     ((=ucs		  . #x5F57)	; 彗
-      )
-     ((=ucs		  . #xE0100)	; 󠄀
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs@unicode	  . #x38C7)	; &GT-12511;
+      (=cns11643-4	  . #x2642)	; &GT-12511; [06-34]
+      (=daikanwa	  . 09915)	; &I-M-09915;
+      )
+     ((=ucs		  . #x5196)	; 冖
+      ))
+    (=ucs-itaiji-003	. #x38C7)	; &U-i003+38C7;
+    (->subsumptive
+     ((==ucs-itaiji-003	  . #x38C7)	; &g2-U-i003+38C7;
       ))
-    (=decomposition@hanyo-denshi
+    ))
+(define-char
+  '((ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs-itaiji-002	  . #x4E30)	; &A-U-i002+4E30;
+      )
+     ((=ucs		  . #x5F50)	; 彐
+      ))
+    (=ucs		. #x5F57)	; 彗
+    (=big5		. #xB16B)	; &I-B-B16B;
+    ))
+(define-char
+  '((<-denotational
      ((=ucs		  . #x5F57)	; 彗
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs		  . #xE0101)	; 󠄁
+     ((=ucs-itaiji-002	  . #x4E30)	; &U-i002+4E30;
+      )
+     ((=adobe-japan1-4	  . 15391)	; &AJ1-15391;
       ))
+    (=ucs@cns		. #x5F57)	; &MJ011236;
     (=ucs@jis		. #x5F57)	; &MJ011236;
+    (=ucs@ks		. #x5F57)	; &MJ011236;
     (=mj		. 011236)	; &MJ011236;
     (=adobe-japan1-0	. 04781)	; &I-AJ1-04781;
     (=jis-x0208		. #x5742)	; &I-J90-5742; [55-34]
@@ -1111,6 +1483,50 @@
     (=gt-pj-1		. #x5742)	; &I-GT-12528; [55-34]
     (=daikanwa		. 09927)	; &I-M-09927;
     (=shinjigen		.  2303)	; &MJ011236;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5F57)	; 彗
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (=decomposition@hanyo-denshi
+       ((=ucs		    . #x5F57)	; 彗
+	)
+       ((=ucs		    . #xE0101)	; 󠄁
+	))
+      (==ucs@cns	  . #x5F57)	; &g2-MJ011236;
+      (==ucs@jis	  . #x5F57)	; &g2-MJ011236;
+      (==ucs@ks		  . #x5F57)	; &g2-MJ011236;
+      (==mj		  . 011236)	; &g2-MJ011236;
+      (==adobe-japan1-0	  . 04781)	; &g2-MJ011236;
+      (==ks-x1001	  . #x7B32)	; &g2-MJ011236; [91-18]
+      (==jis-x0208	  . #x5742)	; &g2-MJ011236; [55-34]
+      (==cns11643-1	  . #x5A31)	; &g2-MJ011236; [58-17]
+      (==jis-x0213-1	  . #x5742)	; &g2-MJ011236; [55-34]
+      (==hanyo-denshi/ja  . #x5742)	; &g2-MJ011236; [55-34]
+      (==gt		  . 12528)	; &g2-MJ011236;
+      (==gt-k		  . 07930)	; &g2-MJ011236;
+      (==daikanwa	  . 09927)	; &g2-MJ011236;
+      (==shinjigen	  .  2303)	; &g2-MJ011236;
+      (->subsumptive
+       ((===daikanwa	    . 09927)	; &R-M-09927;
+	)
+       ((===jis-x0208	    . #x5742)	; &R-J0-5742; [55-34]
+	(===jis-x0213-1	    . #x5742)	; &R-J0-5742; [55-34]
+	)
+       ((===adobe-japan1-0  . 04781)	; &R-AJ1-04781;
+	)
+       ((===mj		    . 011236)	; &R-MJ011236;
+	)
+       ((===cns11643-1	    . #x5A31)	; &R-C1-5A31; [58-17]
+	)
+       ((===gt		    . 12528)	; &R-GT-12528;
+	(===gt-k	    . 07930)	; &R-GT-12528;
+	)
+       ((===ucs@ks	    . #x5F57)	; &R-K0-7B32;
+	(===ks-x1001	    . #x7B32)	; &R-K0-7B32; [91-18]
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1119,6 +1535,15 @@
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs-itaiji-002	  . #x4E30)	; &U-i002+4E30;
+      )
+     ((=ucs@unicode	  . #x5F50)	; &G0-6566;
+      (=gb2312		  . #x6566)	; &G0-6566; [69-70]
+      ))
     (=ucs@unicode	. #x5F57)	; &HD-FT-356E;
     (=ucs@JP/hanazono	. nil)
     (=gb2312		. #x6567)	; &HD-FT-356E; [69-71]
@@ -1263,6 +1688,35 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=>big5-cdp	  . #x8A6E)	; &IWDS1-372;
+      )
+     ((=ucs		  . #x5196)	; 冖
+      )
+     ((=ucs		  . #x679C)	; 果
+      ))
+    (=>ucs@iwds-1	. #x5F59)	; &A-IWDSU+5F59;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x5F59)	; &A-IWDSU+5F59;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x5F51)	; 彑
+      )
+     ((=ucs		  . #x5196)	; 冖
+      )
+     ((=ucs		  . #x679C)	; 果
+      ))
     (=ucs		. #x5F59)	; 彙
     (=adobe-japan1-0	. 04782)	; &I-AJ1-04782;
     (=jis-x0208		. #x5743)	; &I-J90-5743; [55-35]
@@ -1275,11 +1729,94 @@
     (=gt-pj-1		. #x5743)	; &I-GT-12534; [55-35]
     (=daikanwa		. 09936)	; &I-M-09936;
     (=shinjigen		.  2305)	; 彙
+    (<-Liwen
+     ((=ucs@iso		  . #x22477)	; &MJ035744;
+      (=mj		  . 035744)	; &MJ035744;
+      ))
+    (<-Liwen*sources
+     jiyun)
+    (<-ancient
+     ((=ucs		  . #x875F)	; 蝟
+      ))
+    (->formed
+     ((=ucs		  . #x875F)	; 蝟
+      (=daikanwa	  . 33287)	; &I-M-33287;
+      )
+     ((=ucs		  . #x27CEA)	; 𧳪
+      (=daikanwa	  . 36593)	; &I-M-36593;
+      )
+     ((=ucs		  . #x732C)	; 猬
+      (=daikanwa	  . 20536)	; &I-M-20536;
+      )
+     ((=ucs@unicode	  . #x5F5A)	; &HD-IP-5F5A;
+      (=cns11643-3	  . #x4123)	; &HD-IP-5F5A; [33-03]
+      (=daikanwa	  . 09937)	; &I-M-09937;
+      )
+     ((=mj		  . 068054)	; &MJ068054;
+      ))
+    (->formed$_1*sources
+     shuowen erya-zhu erya-shu jiyun daikanwa)
+    (->formed$_2*sources
+     jiyun daikanwa)
+    (->formed$_3*sources
+     jiyun daikanwa)
+    (->formed*sources
+     jiyun daikanwa)
+    (->original
+     ((=ucs@iso		  . #x22477)	; &MJ035744;
+      (=mj		  . 035744)	; &MJ035744;
+      (=daikanwa	  . 09954)	; &I-M-09954;
+      ))
+    (->original*sources
+     jiyun kangxi daikanwa)
+    (->subsumptive
+     ((==ucs@unicode	  . #x5F59)	; &g2-AJ1-04782;
+      (==adobe-japan1-0	  . 04782)	; &g2-AJ1-04782;
+      (==ks-x1001	  . #x7D44)	; &g2-AJ1-04782; [93-36]
+      (==jis-x0208	  . #x5743)	; &g2-AJ1-04782; [55-35]
+      (==cns11643-1	  . #x6370)	; &g2-AJ1-04782; [67-80]
+      (==jis-x0213-1	  . #x5743)	; &g2-AJ1-04782; [55-35]
+      (==gb12345	  . #x783D)	; &g2-AJ1-04782; [88-29]
+      (==gt		  . 12534)	; &g2-AJ1-04782;
+      (==daikanwa	  . 09936)	; &g2-AJ1-04782;
+      (==shinjigen	  .  2305)	; &g2-AJ1-04782;
+      (->subsumptive
+       ((===daikanwa	    . 09936)	; &R-M-09936;
+	)
+       ((===jis-x0208	    . #x5743)	; &R-J0-5743; [55-35]
+	(===jis-x0213-1	    . #x5743)	; &R-J0-5743; [55-35]
+	)
+       ((===adobe-japan1-0  . 04782)	; &R-AJ1-04782;
+	)
+       ((===cns11643-1	    . #x6370)	; &R-C1-6370; [67-80]
+	)
+       ((===gt		    . 12534)	; &R-GT-12534;
+	)
+       ((===ucs@ks	    . #x5F59)	; &R-K0-7D44;
+	(===ks-x1001	    . #x7D44)	; &R-K0-7D44; [93-36]
+	)
+       ((===ucs@unicode	    . #x5F59)	; &R-UU+5F59;
+	))
+      ))
     ))
 (define-char
-  '((ideographic-radical . 58)	; â¼¹
+  '((<-denotational
+     ((=>ucs@iwds-1	  . #x5F59)	; &A-IWDSU+5F59;
+      ))
+    (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x5F50)	; 彐
+      )
+     ((=ucs		  . #x5196)	; 冖
+      )
+     ((=ucs		  . #x679C)	; 果
+      ))
+    (sound@ja/on	"Wi")
     (=ucs		. #x5F5A)	; 彚
     ))
 (define-char
@@ -1289,10 +1826,22 @@
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs@unicode	. #x5F5A)	; &C3-4123;
-    (=cns11643-3	. #x4123)	; &C3-4123; [33-03]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs@jis		  . #x5F50)	; &AJ1-14521;
+      (=adobe-japan1-4	  . 14521)	; &AJ1-14521;
+      )
+     ((=ucs		  . #x5196)	; 冖
+      )
+     ((=ucs		  . #x679C)	; 果
+      ))
+    (=ucs@unicode	. #x5F5A)	; &HD-IP-5F5A;
+    (=cns11643-3	. #x4123)	; &HD-IP-5F5A; [33-03]
+    (=hanyo-denshi/ip	. #x5F5A)	; &I-HD-IP-5F5A;
     (=daikanwa		. 09937)	; &I-M-09937;
-    (=shinjigen		.  2306)	; &C3-4123;
+    (=shinjigen		.  2306)	; &HD-IP-5F5A;
     (<-Liwen
      ((=ucs		  . #x5F59)	; 彙
       ))
@@ -1311,6 +1860,22 @@
       ))
     (<-same*sources
      zhengzitong daikanwa)
+    (->subsumptive
+     ((==ucs@unicode	  . #x5F5A)	; &g2-HD-IP-5F5A;
+      (==cns11643-3	  . #x4123)	; &g2-HD-IP-5F5A; [33-03]
+      (==hanyo-denshi/ip  . #x5F5A)	; &g2-HD-IP-5F5A;
+      (==daikanwa	  . 09937)	; &g2-HD-IP-5F5A;
+      (==shinjigen	  .  2306)	; &g2-HD-IP-5F5A;
+      (->subsumptive
+       ((===daikanwa	    . 09937)	; &R-M-09937;
+	)
+       ((===hanyo-denshi/ip . #x5F5A)	; &R-HD-IP-5F5A;
+	)
+       ((===cns11643-3	    . #x4123)	; &R-C3-4123; [33-03]
+	)
+       ((===ucs@unicode	    . #x5F5A)	; &R-UU+5F5A;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1319,7 +1884,24 @@
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=shinjigen		.  2307)	; &SJG2-2307;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=adobe-japan1-4	  . 15391)	; &AJ1-15391;
+      )
+     ((=ucs		  . #x5196)	; 冖
+      )
+     ((=ucs		  . #x679C)	; 果
+      ))
+    (=mj		. 068054)	; &MJ068054;
+    (=hanyo-denshi/ks	. 112430)	; &MJ068054;
+    (=shinjigen		.  2307)	; &MJ068054;
+    (<-formed
+     ((=ucs		  . #x5F59)	; 彙
+      ))
+    (<-formed*sources
+     koseki mj)
     (<-wrong
      ((=ucs		  . #x5F59)	; 彙
       (=jis-x0208	  . #x5743)	; &I-J90-5743; [55-35]
@@ -1327,6 +1909,41 @@
       ))
     (<-wrong*sources
      shinjigen)
+    (->subsumptive
+     ((==mj		  . 068054)	; &MJ068054;
+      (==hanyo-denshi/ks  . 112430)	; &g2-MJ068054;
+      (->subsumptive
+       ((===hanyo-denshi/ks . 112430)	; &R-HD-KS-112430;
+	(=hanyo-denshi/ks/mf . #x2BEB)	; &R-HD-KS-112430;
+	)
+       ((===mj		    . 068054)	; &MJ068054;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5F5A)	; 彚
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs@unicode	  . #x5F50)	; &G0-6566;
+      (=gb2312		  . #x6566)	; &G0-6566; [69-70]
+      )
+     ((=ucs		  . #x5196)	; 冖
+      )
+     ((=ucs		  . #x679C)	; 果
+      ))
+    (=hanyo-denshi/tk	. 01030070)	; &HD-TK-01030070;
+    (=hanyo-denshi/tk/mf-01 . #x0BBF)	; &HD-TK-01030070;
+    (->subsumptive
+     ((==hanyo-denshi/tk  . 01030070)	; &g2-HD-TK-01030070;
+      (==hanyo-denshi/tk/mf-01 . #x0BBF)	; &g2-HD-TK-01030070;
+      ))
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
@@ -1432,7 +2049,8 @@
       (=cns11643-6	  . #x246C)	; &C6-246C; [04-76]
       (=daikanwa	  . 09911)	; &I-M-09911;
       )
-     ((=ucs		  . #x4F86)	; 來
+     ((=ucs@unicode	  . #x4F86)	; &AJ1-04141;
+      (=adobe-japan1-0	  . 04141)	; &AJ1-04141;
       ))
     (=ucs@iso		. #x2246C)	; &M-09940;
     (=daikanwa		. 09940)	; &M-09940;
@@ -1499,15 +2117,114 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 09944)	; &M-09944;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>ucs@cognate	  . #x38C7)	; &A-cgnU+38C7;
+      )
+     ((=ucs		  . #x5E07)	; 帇
+      ))
+    (=>ucs@cognate	. #x22469)	; &A-cgnU+22469;
     ))
 (define-char
-  '((ideographic-radical . 58)	; â¼¹
+  '((<-denotational
+     ((=>ucs@cognate	  . #x22469)	; &A-cgnU+22469;
+      ))
+    (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x38C7)	; 㣇
+      )
+     ((=ucs		  . #x5E07)	; 帇
+      ))
+    (sound@ja/on	"i")
     (=ucs		. #x22469)	; 𢑩
-    (=cns11643-6	. #x5C5F)	; &I-C6-5C5F; [60-63]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22469)	; 𢑩
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x38C7)	; &GT-12511;
+      (=cns11643-4	  . #x2642)	; &GT-12511; [06-34]
+      (=daikanwa	  . 09915)	; &I-M-09915;
+      )
+     ((=ucs		  . #x5E07)	; 帇
+      ))
+    (=ucs@iso		. #x22469)	; &C6-5C5F;
+    (=cns11643-6	. #x5C5F)	; &C6-5C5F; [60-63]
     (=daikanwa		. 49089)	; &I-M-49089;
+    (<-original
+     ((=ucs		  . #x8084)	; 肄
+      (=daikanwa	  . 29224)	; &I-M-29224;
+      ))
+    (<-original*sources
+     daikanwa)
+    (->subsumptive
+     ((==ucs@iso	  . #x22469)	; &g2-M-49089;
+      (==cns11643-6	  . #x5C5F)	; &g2-M-49089; [60-63]
+      (==daikanwa	  . 49089)	; &g2-M-49089;
+      (->subsumptive
+       ((===daikanwa	    . 49089)	; &R-M-49089;
+	)
+       ((===ucs@iso	    . #x22469)	; &R-U-00022469;
+	)
+       ((===cns11643-6	    . #x5C5F)	; &R-C6-5C5F; [60-63]
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x22451)	; 𢑑
+      )
+     ((=ucs		  . #x98DB)	; 飛
+      ))
+    (=ucs		. #x2246E)	; 𢑮
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2246E)	; 𢑮
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@iso		  . #x22451)	; &C6-246C;
+      (=cns11643-6	  . #x246C)	; &C6-246C; [04-76]
+      (=daikanwa	  . 09911)	; &I-M-09911;
+      )
+     ((=ucs		  . #x98DB)	; 飛
+      ))
+    (=mj		. 035737)	; &MJ035737;
+    (=koseki		. 112500)	; &MJ035737;
+    (=daikanwa		. 09944)	; &I-M-09944;
+    (->subsumptive
+     ((==daikanwa	  . 09944)	; &g2-M-09944;
+      )
+     ((==koseki		  . 112500)	; &g2-KOSEKI-112500;
+      )
+     ((==mj		  . 035737)	; &g2-MJ035737;
+      ))
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
@@ -1521,49 +2238,189 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>ucs@cognate	  . #x38C7)	; &A-cgnU+38C7;
+      )
+     ((=>ucs@cognate	  . #x38C7)	; &A-cgnU+38C7;
+      ))
+    (=>ucs@cognate	. #x38C8)	; &A-cgnU+38C8;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@cognate	  . #x38C8)	; &A-cgnU+38C8;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x38C7)	; 㣇
+      )
+     ((=ucs		  . #x38C7)	; 㣇
+      ))
     (sound@ja/on	"si" "i")
     (=ucs		. #x38C8)	; 㣈
-    (=cns11643-4	. #x5031)	; &I-C4-5031; [48-17]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x38C8)	; 㣈
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x38C7)	; &GT-12511;
+      (=cns11643-4	  . #x2642)	; &GT-12511; [06-34]
+      (=daikanwa	  . 09915)	; &I-M-09915;
+      )
+     ((=ucs@unicode	  . #x38C7)	; &GT-12511;
+      (=cns11643-4	  . #x2642)	; &GT-12511; [06-34]
+      (=daikanwa	  . 09915)	; &I-M-09915;
+      ))
+    (=ucs@unicode	. #x38C8)	; &GT-12554;
+    (=cns11643-4	. #x5031)	; &GT-12554; [48-17]
     (=gt		. 12554)	; &I-GT-12554;
     (=gt-pj-3		. #x4A40)	; &I-GT-12554; [42-32]
     (=daikanwa		. 09946)	; &I-M-09946;
-    (=hanziku-3		. #xC1EC)	; &I-HZK03-C1EC;
     (<-construed@chu
      ((=ucs		  . #x8086)	; 肆
       ))
-    (->ancient@jiyun
+    (->ancient
      ((=ucs		  . #x20B7E)	; ð ­¾
       (=daikanwa	  . 03209)	; &I-M-03209;
-      ))
-    (->ancient@jiyun*sources
-     jiyun daikanwa)
-    (->ancient@kangxi
+      )
      ((=ucs		  . #x20B87)	; 𠮇
       (=daikanwa	  . 03216)	; &I-M-03216;
       ))
-    (->ancient@kangxi*sources
+    (->ancient$_1*sources
+     jiyun daikanwa)
+    (->ancient$_2*sources
      kangxi daikanwa)
+    (->ancient*sources
+     daikanwa)
     (->subsumptive
      ((==daikanwa	  . 09946)	; &g2-M-09946;
       )
-     ((==ucs@cns	  . #x38C8)	; &g2-CU+38C8;
-      (==cns11643-4	  . #x5031)	; &g2-CU+38C8; [48-17]
+     ((=hanziku-3	  . #xC1EC)	; &HZK03-C1EC;
       )
      ((==gt		  . 12554)	; &g2-GT-12554;
       )
+     ((==ucs@cns	  . #x38C8)	; &g2-CU+38C8;
+      (==cns11643-4	  . #x5031)	; &g2-CU+38C8; [48-17]
+      )
      ((==ucs@unicode	  . #x38C8)	; &g2-UU+38C8;
+      (==ucs@JP/hanazono  . nil)
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@cognate	  . #x38C8)	; &A-cgnU+38C8;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>ucs-itaiji-003	  . #x5F56)	; &A-U-i003+5F56;
+      )
+     ((=>ucs-itaiji-003	  . #x5F56)	; &A-U-i003+5F56;
+      ))
+    (=>ucs-itaiji-001	. #x38C8)	; &A-U-i001+38C8;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-001	  . #x38C8)	; &A-U-i001+38C8;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs-itaiji-003	  . #x5F56)	; &U-i003+5F56;
+      )
+     ((=ucs-itaiji-003	  . #x5F56)	; &U-i003+5F56;
+      ))
+    (=ucs-itaiji-001	. #x38C8)	; &U-i001+38C8;
+    (->subsumptive
+     ((==ucs-itaiji-001	  . #x38C8)	; &g2-U-i001+38C8;
       ))
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x5F50)	; 彐
+      )
+     ((=gt-k		  . 05805)	; &GT-K05805;
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
     (=ucs		. #x2246F)	; 𢑯
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2246F)	; 𢑯
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs@unicode	  . #x5F50)	; &G0-6566;
+      (=gb2312		  . #x6566)	; &G0-6566; [69-70]
+      )
+     ((=gt-k		  . 05805)	; &GT-K05805;
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
+    (=ucs@iso		. #x2246F)	; &C7-2D61;
+    (=cns11643-7	. #x2D61)	; &C7-2D61; [13-65]
+    (=daikanwa		. 09947)	; &I-M-09947;
+    (<-same
+     ((=ucs		  . #x875F)	; 蝟
+      (=jis-x0208	  . #x6976)	; &I-J90-6976; [73-86]
+      (=daikanwa	  . 33287)	; &I-M-33287;
+      (=shinjigen@1ed	  .  7215)	; 蝟
+      (=shinjigen@rev	  .  7216)	; 蝟
+      )
+     ((=ucs		  . #x5F59)	; 彙
+      (=jis-x0208	  . #x5743)	; &I-J90-5743; [55-35]
+      (=daikanwa	  . 09936)	; &I-M-09936;
+      (=shinjigen	  .  2305)	; 彙
+      ))
+    (<-same$_1*sources
+     zihui-bu daikanwa)
+    (<-same*sources
+     daikanwa shinjigen)
     (->subsumptive
-     ((=ucs@iso		  . #x2246F)	; &M-09947;
-      (=daikanwa	  . 09947)	; &M-09947;
+     ((==ucs@iso	  . #x2246F)	; &g2-M-09947;
+      (==daikanwa	  . 09947)	; &g2-M-09947;
+      (->subsumptive
+       ((===daikanwa	    . 09947)	; &R-M-09947;
+	)
+       ((===ucs@iso	    . #x2246F)	; &R-U-0002246F;
+	))
       )
-     ((=cns11643-7	  . #x2D61)	; &C7-2D61; [13-65]
+     ((==ucs@cns	  . #x2246F)	; &g2-CU+2246F;
+      (==cns11643-7	  . #x2D61)	; &g2-CU+2246F; [13-65]
       ))
     ))
 (define-char
@@ -1869,9 +2726,61 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=>ucs-itaiji-003	  . #x38C7)	; &A-U-i003+38C7;
+      )
+     ((=gt-k		  . 05805)	; &GT-K05805;
+      ))
+    (sound@ja/on	"Wi")
     (=ucs		. #x22477)	; 𢑷
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22477)	; 𢑷
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs-itaiji-003	  . #x38C7)	; &U-i003+38C7;
+      )
+     ((=gt-k		  . 05805)	; &GT-K05805;
+      ))
+    (=ucs@iso		. #x22477)	; &MJ035744;
+    (=mj		. 035744)	; &MJ035744;
     (=cns11643-7	. #x4672)	; &I-C7-4672; [38-82]
+    (=koseki		. 112640)	; &MJ035744;
     (=daikanwa		. 09954)	; &I-M-09954;
+    (<-original
+     ((=ucs		  . #x5F59)	; 彙
+      ))
+    (<-same
+     ((=ucs		  . #x5F59)	; 彙
+      (=daikanwa	  . 09936)	; &I-M-09936;
+      ))
+    (<-same*sources
+     zihui daikanwa)
+    (->subsumptive
+     ((==ucs@iso	  . #x22477)	; &g2-M-09954;
+      (==cns11643-7	  . #x4672)	; &g2-M-09954; [38-82]
+      (==daikanwa	  . 09954)	; &g2-M-09954;
+      (->subsumptive
+       ((===daikanwa	    . 09954)	; &R-M-09954;
+	)
+       ((===cns11643-7	    . #x4672)	; &R-C7-4672; [38-82]
+	)
+       ((===ucs@iso	    . #x22477)	; &R-U-00022477;
+	))
+      )
+     ((==mj		  . 035744)	; &g2-MJ035744;
+      (==koseki		  . 112640)	; &g2-MJ035744;
+      ))
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
@@ -1897,6 +2806,35 @@
     (=daikanwa		. 09956)	; &I-M-09956;
     ))
 (define-char
+  '((ideographic-radical@ucs . 58)	; â¼¹
+    (ideographic-radical@daikanwa . 50)	; â¼±
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs-itaiji-002	  . #x38C7)	; &U-i002+38C7;
+      )
+     ((=gt-k		  . 05805)	; &GT-K05805;
+      ))
+    (=ucs		. #x2247A)	; 𢑺
+    (=gt		. 11513)	; &I-GT-11513;
+    (=gt-pj-11		. #x4757)	; &I-GT-11513; [39-55]
+    (=daikanwa/ho	.  0163)	; 𢑺
+    (->subsumptive
+     ((==gt		  . 11513)	; &g2-GT-11513;
+      (==daikanwa/ho	  .  0163)	; &g2-GT-11513;
+      (->subsumptive
+       ((===daikanwa/ho	    .  0163)	; &R-M-H0163;
+	)
+       ((===gt		    . 11513)	; &R-GT-11513;
+	))
+      )
+     ((==ucs@iso	  . #x2247A)	; &g2-IU-0002247A;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
@@ -2020,24 +2958,61 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x2247F)	; 𢑿
-    (ideographic-radical . 58)	; â¼¹
-    (ideographic-strokes . 23)
-    (total-strokes	 . 26)
-    (=daikanwa		. 09961)	; &M-09961;
-    ))
-(define-char
-  '((morohashi-daikanwa	9961 0 0)
-    (ideographic-radical . 58)	; â¼¹
+  '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 23)
     (total-strokes	 . 26)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=>ucs-itaiji-007	  . #x675F)	; &A-U-i007+675F;
+      )
+     ((=>ucs-itaiji-003	  . #x24566)	; &A-U-i003+24566;
+      ))
+    (sound@ja/on	"nAu")
     (=ucs		. #x2247F)	; 𢑿
     ))
 (define-char
-  '((=>ucs		. #x2247F)	; 𢑿
-    (morohashi-daikanwa	9961 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2247F)	; 𢑿
+      ))
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 23)
     (total-strokes	 . 26)
-    (=cns11643-7	. #x6237)	; &C7-6237; [66-23]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs-itaiji-007	  . #x675F)	; &U-i007+675F;
+      )
+     ((=ucs-itaiji-003	  . #x24566)	; &U-i003+24566;
+      ))
+    (=ucs@iso		. #x2247F)	; &MJ035748;
+    (=mj		. 035748)	; &MJ035748;
+    (=cns11643-7	. #x6237)	; &I-C7-6237; [66-23]
+    (=koseki		. 112700)	; &MJ035748;
+    (=daikanwa		. 09961)	; &I-M-09961;
+    (<-ancient
+     ((=ucs@unicode	  . #x56CA)	; &AJ1-07770;
+      (=adobe-japan1-0	  . 07770)	; &AJ1-07770;
+      (=daikanwa	  . 04633)	; &I-M-04633;
+      ))
+    (<-ancient*sources
+     zihui-bu daikanwa)
+    (<-formed
+     ((=ucs@unicode	  . #x56CA)	; &AJ1-07770;
+      (=adobe-japan1-0	  . 07770)	; &AJ1-07770;
+      ))
+    (<-formed$_1*sources
+     koseki mj)
+    (<-formed*sources
+     koseki mj)
+    (->subsumptive
+     ((==daikanwa	  . 09961)	; &g2-M-09961;
+      )
+     ((==ucs@cns	  . #x2247F)	; &g2-CU+2247F;
+      (==cns11643-7	  . #x6237)	; &g2-CU+2247F; [66-23]
+      )
+     ((==ucs@iso	  . #x2247F)	; &g2-IU-0002247F;
+      ))
     ))