X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R058-Snout.el;h=d0190d631bcf691384873de82fbe734cc6141957;hb=5d15412b04f2d3ac3efbf8a5c74a5edb9590e33b;hp=46adb35680e4b6e0e86da8073805533f70dec94b;hpb=ee54b28c1b7c6239615ca7be0a9664921347717c;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R058-Snout.el b/lisp/utf-2000/Ideograph-R058-Snout.el
index 46adb35..d0190d6 100644
--- a/lisp/utf-2000/Ideograph-R058-Snout.el
+++ b/lisp/utf-2000/Ideograph-R058-Snout.el
@@ -2,13 +2,24 @@
 (define-char
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
-    (total-strokes	 . 3)
-    (=ucs		. #x5F50)	; 彐
+    (=>ucs@component	. #x5F51)	; &A-compU+5F51;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 0)
+    (=>big5-cdp		. #x8A6E)	; &IWDS1-372;
+    (=>iwds-1		.  0372)	; &IWDS1-372;
     ))
 (define-char
   '((<-denotational
      ((=ucs		  . #x5F50)	; 彐
       ))
+    (<-denotational@component
+     ((=>iwds-1		  .  0372)	; &IWDS1-372;
+      ))
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
@@ -59,6 +70,10 @@
   '((<-denotational
      ((=ucs		  . #x5F50)	; 彐
       ))
+    (<-denotational@component
+     ((=>ucs@component	  . #x2E95)	; &A-compU+2E95;
+      (=>iwds-1		  .  0373)	; &A-compU+2E95;
+      ))
     (name		. "CJK RADICAL SNOUT TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
@@ -116,19 +131,39 @@
     (=ucs@JP/hanazono	. nil)
     (=gb2312		. #x6566)	; &G0-6566; [69-70]
     (=big5-cdp		. #x897C)	; &I-CDP-897C;
+    (=gt-k		. 00266)	; &GT-K00266;
+    (=gt-pj-k1		. #x3663)	; &G0-6566; [22-67]
     (->subsumptive
      ((==ucs@unicode	  . #x5F50)	; &g2-UU+5F50;
       (==ucs@JP/hanazono  . nil)
       (==gb2312		  . #x6566)	; &g2-UU+5F50; [69-70]
       )
-     ((=gt-k		  . 00266)	; &GT-K00266;
-      (=gt-pj-k1	  . #x3663)	; &GT-K00266; [22-67]
+     ((==gt-k		  . 00266)	; &g2-GT-K00266;
+      (==gt-pj-k1	  . #x3663)	; &g2-GT-K00266; [22-67]
       )
      ((==big5-cdp	  . #x897C)	; &g2-CDP-897C;
       ))
     ))
 (define-char
-  '((ideographic-radical . 58)	; â¼¹
+  '((<-denotational
+     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 0)
+    (=>ucs@component	. #x2E95)	; &A-compU+2E95;
+    (=>iwds-1		.  0373)	; &A-compU+2E95;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+      ))
+    (<-denotational@component
+     ((=>iwds-1		  .  0372)	; &IWDS1-372;
+      )
+     ((=>ucs@component	  . #x2E95)	; &A-compU+2E95;
+      (=>iwds-1		  .  0373)	; &A-compU+2E95;
+      ))
+    (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
     (=ucs		. #x5F51)	; 彑
     ))
@@ -192,6 +227,16 @@
     (=ucs-itaiji-001	. #x5F51)	; &U-i001+5F51;
     ))
 (define-char
+  '((<-denotational
+     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 0)
+    (total-strokes	 . 3)
+    (=ucs		. #x5F50)	; 彐
+    (=>iwds-1		.  0080)	; 彐
+    ))
+(define-char
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
@@ -405,6 +450,16 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+      )
+     ((=big5-cdp	  . #x89A6)	; &CDP-89A6;
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
     (=ucs		. #x38C7)	; 㣇
     ))
 (define-char
@@ -414,21 +469,43 @@
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=>>ucs@unicode	. #x38C7)	; &G-GT-12511;
-    (=>>big5-cdp	. #x8950)	; &G-GT-12511;
-    (=>>gt		. 12511)	; &G-GT-12511;
-    (->subsumptive
-     ((=daikanwa	  . 09915)	; &M-09915;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
       )
-     ((=cns11643-4	  . #x2642)	; &C4-2642; [06-34]
+     ((=ucs@unicode	  . #x5F51)	; &AJ1-04779;
+      (=adobe-japan1-0	  . 04779)	; &AJ1-04779;
       )
-     ((=gt		  . 12511)	; &GT-12511;
-      (=gt-k		  . 04509)	; &I-GT-K04509;
-      (=gt-pj-3		  . #x4A22)	; &GT-12511; [42-02]
+     ((=big5-cdp	  . #x89A6)	; &CDP-89A6;
       )
-     ((=big5-cdp	  . #x8950)	; &CDP-8950;
+     ((=ucs		  . #x5DFE)	; å·¾
+      ))
+    (=ucs@unicode	. #x38C7)	; &GT-12511;
+    (=cns11643-4	. #x2642)	; &GT-12511; [06-34]
+    (=big5-cdp		. #x8950)	; &I-CDP-8950;
+    (=gt		. 12511)	; &I-GT-12511;
+    (=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;
+      (->subsumptive
+       ((===daikanwa	    . 09915)	; &R-M-09915;
+	)
+       ((===big5-cdp	    . #x8950)	; &R-CDP-8950;
+	))
+      )
+     ((==ucs@cns	  . #x38C7)	; &g2-CU+38C7;
+      (==cns11643-4	  . #x2642)	; &g2-CU+38C7; [06-34]
+      (==shinjigen	  .  2300)	; &g2-CU+38C7;
       )
-     ((=ucs@unicode	  . #x38C7)	; &UU+38C7;
+     ((==gt		  . 12511)	; &g2-GT-12511;
+      (==gt-k		  . 04509)	; &g2-GT-12511;
+      )
+     ((==ucs@unicode	  . #x38C7)	; &g2-UU+38C7;
+      (==ucs@JP/hanazono  . nil)
       ))
     ))
 (define-char
@@ -457,15 +534,25 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=>daikanwa		. 09918)	; &A-M-09918;
+    (=>ucs@iwds-1	. #x5F54)	; &A-IWDSU+5F54;
+    (=>daikanwa		. 09918)	; &A-IWDSU+5F54;
     ))
 (define-char
   '((<-denotational
-     ((=>daikanwa	  . 09918)	; &A-M-09918;
+     ((=>ucs@iwds-1	  . #x5F54)	; &A-IWDSU+5F54;
+      (=>daikanwa	  . 09918)	; &A-IWDSU+5F54;
       ))
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5F51)	; 彑
+      )
+     ((=ucs		  . #x6C3A)	; æ°º
+      ))
     (=ucs		. #x5F54)	; 彔
     (=adobe-japan1-5	. 16858)	; &I-AJ1-16858;
     (=jis-x0212		. #x3C78)	; &I-JSP-3C78; [28-88]
@@ -505,13 +592,40 @@
     ))
 (define-char
   '((<-denotational
-     ((=>daikanwa	  . 09918)	; &A-M-09918;
+     ((=>ucs@iwds-1	  . #x5F54)	; &A-IWDSU+5F54;
+      (=>daikanwa	  . 09918)	; &A-IWDSU+5F54;
       ))
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5F50)	; 彐
+      )
+     ((=ucs		  . #x6C3A)	; æ°º
+      ))
     (=ucs		. #x5F55)	; 录
-    (=gb2312		. #x423C)	; &I-G0-423C; [34-28]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5F55)	; 录
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs@jis		  . #x5F50)	; &AJ1-14521;
+      (=adobe-japan1-4	  . 14521)	; &AJ1-14521;
+      )
+     ((=ucs		  . #x6C3A)	; æ°º
+      ))
+    (=ucs@unicode	. #x5F55)	; &C3-2871;
+    (=gb2312		. #x423C)	; &C3-2871; [34-28]
     (=cns11643-3	. #x2871)	; &I-C3-2871; [08-81]
     (=jef-china3	. #x82B3)	; &I-JC3-82B3;
     (->subsumptive
@@ -566,6 +680,44 @@
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5F50)	; 彐
+      )
+     ((=ucs		  . #x72AE)	; 犮
+      ))
+    (=>gt-k		. 04940)	; &A-GT-K04940;
+    ))
+(define-char
+  '((<-denotational
+     ((=>gt-k		  . 04940)	; &A-GT-K04940;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=adobe-japan1-4	  . 15391)	; &AJ1-15391;
+      )
+     ((=ucs@cns		  . #x72AE)	; &AJ1-18056;
+      (=ucs@jis		  . #x72AE)	; &AJ1-18056;
+      (=adobe-japan1-5	  . 18056)	; &AJ1-18056;
+      ))
+    (=gt-k		. 04940)	; &GT-K04940;
+    (=gt-pj-k1		. #x626D)	; &GT-K04940; [66-77]
+    (->subsumptive
+     ((==gt-k		  . 04940)	; &g2-GT-K04940;
+      (==gt-pj-k1	  . #x626D)	; &g2-GT-K04940; [66-77]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (sound@ja/on	"siN")
@@ -599,6 +751,14 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x5F51)	; &A-compU+5F51;
+      )
+     ((=ucs		  . #x27C28)	; 𧰨
+      ))
     (=ucs		. #x5F56)	; 彖
     ))
 (define-char
@@ -918,6 +1078,42 @@
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
+    (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-itaiji-003	  . #x38C7)	; &A-U-i003+38C7;
+      ))
+    (ideographic-radical . 58)	; â¼¹
+    (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;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5F57)	; 彗
@@ -1004,6 +1200,14 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5F51)	; 彑
+      )
+     ((=gt-k		  . 05697)	; &U-i003+20917;
+      ))
     (=ucs		. #x5F58)	; 彘
     (=adobe-japan1-4	. 14522)	; &I-AJ1-14522;
     (=gb2312		. #x6569)	; &I-G0-6569; [69-73]
@@ -1097,6 +1301,35 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=>iwds-1		  .  0372)	; &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]
@@ -1109,11 +1342,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;
+      )
+     ((=hanyo-denshi/ks	  . 112430)	; &HD-KS-112430;
+      ))
+    (->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
@@ -1123,10 +1439,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)	; 彙
       ))
@@ -1145,6 +1473,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
@@ -1153,7 +1497,23 @@
     (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)	; 果
+      ))
+    (=hanyo-denshi/ks	. 112430)	; &HD-KS-112430;
+    (=shinjigen		.  2307)	; &HD-KS-112430;
+    (<-formed
+     ((=ucs		  . #x5F59)	; 彙
+      ))
+    (<-formed*sources
+     koseki)
     (<-wrong
      ((=ucs		  . #x5F59)	; 彙
       (=jis-x0208	  . #x5743)	; &I-J90-5743; [55-35]
@@ -1161,6 +1521,35 @@
       ))
     (<-wrong*sources
      shinjigen)
+    (->subsumptive
+     ((==hanyo-denshi/ks  . 112430)	; &g2-HD-KS-112430;
+      (=hanyo-denshi/ks/mf . #x2BEB)	; &g2-HD-KS-112430;
+      ))
+    ))
+(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)	; â¼¹
@@ -1392,12 +1781,66 @@
   '((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
@@ -1703,9 +2146,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)	; â¼¹
@@ -1731,6 +2226,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)