X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R062-Halberd.el;h=9ed29a2ea99cb19d46ab726dc5cac8ca56cffdec;hp=c432903d93bbd9dbd02dfbd2b9aff52de936a82b;hb=414b512c0774e67ba8e160b605447d862d3be166;hpb=63bf223c406d7171fa8c2acb047f66927aad2403

diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index c432903..9ed29a2 100644
--- a/lisp/utf-2000/Ideograph-R062-Halberd.el
+++ b/lisp/utf-2000/Ideograph-R062-Halberd.el
@@ -79,6 +79,26 @@
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 0)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x83D0)	; 菐
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=ucs		. #x2BF06)	; 𫼆
+    (=ruimoku-v6	. #xE151)	; &I-RUI6-E151;
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2BF06)	; &g2-hanaJU+2BF06;
+      )
+     ((==ruimoku-v6	  . #xE151)	; &g2-RUI6-E151;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
     (=ucs		. #x6209)	; 戉
@@ -140,7 +160,7 @@
     (=gt-k		. 01000)	; &I-GT-K01000;
     (=gt-pj-1		. #x4A6A)	; &I-GT-14548; [42-74]
     (=daikanwa		. 11532)	; &I-M-11532;
-    (=shinjigen@rev	.  2757)	; 戊
+    (=shinjigen		.  2757)	; 戊
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -169,19 +189,6 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
-    (=ucs		. #x620B)	; 戋
-    (=gb2312		. #x6A27)	; &I-G0-6A27; [74-07]
-    (=big5-cdp		. #x89DC)	; &I-CDP-89DC;
-    (<-simplified@CN
-     ((=ucs@unicode	  . #x6214)	; &AJ1-04934;
-      (=adobe-japan1-0	  . 04934)	; &AJ1-04934;
-      (=gb12345		  . #x6A27)	; &AJ1-04934; [74-07]
-      ))
-    ))
-(define-char
-  '((ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 1)
-    (total-strokes	 . 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
       (=ucs		  . #x2FF6)	; ⿶
@@ -208,6 +215,28 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (=>ucs@component	. #x620C)	; &A-compU+620C;
+    (=>iwds-1		.  0049)	; &A-compU+620C;
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>ucs@component	  . #x620C)	; &A-compU+620C;
+      (=>iwds-1		  .  0049)	; &A-compU+620C;
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 2)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x620A)	; 戊
+      )
+     ((=ucs		  . #x4E00)	; 一
+      ))
+    (sound@ja/on/conventional "zyutu")
+    (sound@ja/on/go	"syuti")
+    (sound@ja/on/kan	"syutu")
     (=ucs		. #x620C)	; 戌
     (=adobe-japan1-0	. 04933)	; &I-AJ1-04933;
     (=jis-x0208		. #x587C)	; &I-J90-587C; [56-92]
@@ -220,7 +249,19 @@
     (=gt-k		. 01723)	; &I-GT-K01723;
     (=gt-pj-1		. #x587C)	; &I-GT-14555; [56-92]
     (=daikanwa		. 11535)	; &I-M-11535;
-    (=shinjigen@rev	.  2761)	; 戌
+    (=shinjigen		.  2761)	; 戌
+    (->mistakable
+     ((=ucs		  . #x620A)	; 戊
+      (=daikanwa	  . 11532)	; &I-M-11532;
+      )
+     ((=ucs		  . #x6209)	; 戉
+      (=daikanwa	  . 11531)	; &I-M-11531;
+      )
+     ((=ucs		  . #x620D)	; 戍
+      (=daikanwa	  . 11537)	; &I-M-11537;
+      ))
+    (->mistakable*sources
+     zihui-biansi-4char daikanwa)
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -231,9 +272,23 @@
     (=daikanwa		. 11536)	; &I-M-11536;
     ))
 (define-char
-  '((ideographic-radical . 62)	; â¼½
+  '((<-denotational@component
+     ((=>ucs@component	  . #x620C)	; &A-compU+620C;
+      (=>iwds-1		  .  0049)	; &A-compU+620C;
+      ))
+    (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x620A)	; 戊
+      )
+     ((=ucs		  . #x4E36)	; 丶
+      ))
+    (sound@ja/on	"syu")
+    (sound@ja/on/conventional "zyu")
     (=ucs		. #x620D)	; 戍
     (=adobe-japan1-0	. 04932)	; &I-AJ1-04932;
     (=jis-x0208		. #x587B)	; &I-J90-587B; [56-91]
@@ -246,7 +301,7 @@
     (=gt-k		. 01722)	; &I-GT-K01722;
     (=gt-pj-1		. #x587B)	; &I-GT-14553; [56-91]
     (=daikanwa		. 11537)	; &I-M-11537;
-    (=shinjigen@rev	.  2758)	; 戍
+    (=shinjigen		.  2758)	; 戍
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -365,8 +420,18 @@
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
+    (=>ucs@component	. #x39AE)	; &A-compU+39AE;
+    (=>iwds-1		.  0274)	; &A-compU+39AE;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@component	  . #x39AE)	; &A-compU+39AE;
+      (=>iwds-1		  .  0274)	; &A-compU+39AE;
+      ))
+    (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (sound@ja/on	"seN")
     (=ucs		. #x39AE)	; 㦮
     (<-simplified@component
      ((=ucs		  . #x6214)	; 戔
@@ -379,25 +444,51 @@
 	))
       (<-simplified*sources
        daikanwa)
+      (->subsumptive
+       ((==daikanwa	    . 11542)	; &g2-M-11542;
+	))
       )
-     ((=cns11643-3	  . #x236A)	; &C3-236A; [03-74]
-      )
-     ((=ucs@unicode	  . #x39AE)	; &UU+39AE;
-      )
-     ((=big5-cdp	  . #x89DD)	; &CDP-89DD;
+     ((=ucs@unicode	  . #x39AE)	; &C3-236A;
+      (=cns11643-3	  . #x236A)	; &C3-236A; [03-74]
+      (=big5-cdp	  . #x89DD)	; &I-CDP-89DD;
+      (->subsumptive
+       ((==ucs@cns	    . #x39AE)	; &g2-CU+39AE;
+	(==cns11643-3	    . #x236A)	; &g2-CU+39AE; [03-74]
+	)
+       ((==ucs@unicode	    . #x39AE)	; &g2-UU+39AE;
+	)
+       ((==big5-cdp	    . #x89DD)	; &g2-CDP-89DD;
+	)
+       ((=gt-k		    . 02180)	; &GT-K02180;
+	(=gt-pj-k1	    . #x3564)	; &GT-K02180; [21-68]
+	(<-identical@component/connect-left
+	 ((=ucs@unicode	      . #x39AE)	; &C3-236A;
+	  (=cns11643-3	      . #x236A)	; &C3-236A; [03-74]
+	  ))
+	))
       ))
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x39AE)	; 㦮
+     ((=>ucs@component	  . #x39AE)	; &A-compU+39AE;
+      (=>iwds-1		  .  0274)	; &A-compU+39AE;
       ))
     (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 2)
-    (total-strokes	 . 6)
-    (=gt-k		. 02180)	; &GT-K02180;
-    (=gt-pj-k1		. #x3564)	; &GT-K02180; [21-68]
-    (<-identical@component/connect-left
-     ((=ucs		  . #x39AE)	; 㦮
+    (ideographic-strokes . 1)
+    (total-strokes	 . 5)
+    (=ucs		. #x620B)	; 戋
+    (=gb2312		. #x6A27)	; &I-G0-6A27; [74-07]
+    (=big5-cdp		. #x89DC)	; &I-CDP-89DC;
+    (<-simplified@CN
+     ((=ucs@unicode	  . #x6214)	; &AJ1-04934;
+      (=adobe-japan1-0	  . 04934)	; &AJ1-04934;
+      (=gb12345		  . #x6A27)	; &AJ1-04934; [74-07]
+      ))
+    (->subsumptive
+     ((==ucs@unicode	  . #x620B)	; &g2-UU+620B;
+      (==gb2312		  . #x6A27)	; &g2-UU+620B; [74-07]
+      )
+     ((==big5-cdp	  . #x89DC)	; &g2-CDP-89DC;
       ))
     ))
 (define-char
@@ -867,18 +958,80 @@
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 4)
-    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>ucs@iwds-1	  . #x723F)	; &A-IWDSU+723F;
+      (=>iwds-1		  .  0363)	; &A-IWDSU+723F;
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
     (=ucs		. #x6215)	; 戕
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6215)	; 戕
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x723F)	; 爿
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=ucs@unicode	. #x6215)	; &JX2-2C73;
+    (=gb2312		. #x635E)	; &JX2-2C73; [67-62]
+    (=jis-x0212		. #x3F29)	; &I-JSP-3F29; [31-09]
+    (=cns11643-1	. #x4D51)	; &I-C1-4D51; [45-49]
+    (=jis-x0213-2	. #x2C73)	; &I-JX2-2C73; [12-83]
     (=big5		. #xA9CF)	; &I-B-A9CF;
-    (->subsumptive
-     ((=ucs@unicode	  . #x6215)	; &JX2-2C73;
-      (=gb2312		  . #x635E)	; &JX2-2C73; [67-62]
-      (=jis-x0212	  . #x3F29)	; &I-JSP-3F29; [31-09]
-      (=jis-x0213-2	  . #x2C73)	; &I-JX2-2C73; [12-83]
-      (=daikanwa	  . 11562)	; &I-M-11562;
-      (=jef-china3	  . #x4EF3)	; &I-JC3-4EF3;
+    (=daikanwa		. 11562)	; &I-M-11562;
+    (=jef-china3	. #x4EF3)	; &I-JC3-4EF3;
+    (->subsumptive
+     ((==ucs@unicode	  . #x6215)	; &g2-JSP-3F29;
+      (==gb2312		  . #x635E)	; &g2-JSP-3F29; [67-62]
+      (==jis-x0212	  . #x3F29)	; &g2-JSP-3F29; [31-09]
+      (==jis-x0213-2	  . #x2C73)	; &g2-JSP-3F29; [12-83]
+      (==daikanwa	  . 11562)	; &g2-JSP-3F29;
+      (==jef-china3	  . #x4EF3)	; &g2-JSP-3F29;
+      (->subsumptive
+       ((===daikanwa	    . 11562)	; &R-M-11562;
+	)
+       ((===jis-x0212	    . #x3F29)	; &R-JX2-2C73; [31-09]
+	(===jis-x0213-2	    . #x2C73)	; &R-JX2-2C73; [12-83]
+	)
+       ((===jef-china3	    . #x4EF3)	; &R-JC3-4EF3;
+	)
+       ((===ucs@unicode	    . #x6215)	; &R-UU+6215;
+	))
       )
-     ((=cns11643-1	  . #x4D51)	; &C1-4D51; [45-49]
+     ((==ucs@cns	  . #x6215)	; &g2-CU+6215;
+      (==cns11643-1	  . #x4D51)	; &g2-CU+6215; [45-49]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6215)	; 戕
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4E2C)	; 丬
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=big5-cdp		. #x8879)	; &CDP-8879;
+    (->subsumptive
+     ((==big5-cdp	  . #x8879)	; &g2-CDP-8879;
       ))
     ))
 (define-char
@@ -1146,6 +1299,24 @@
       )
      ((=ucs		  . #x51AC)	; 冬
       ))
+    (=>ruimoku-v6	. #xE005)	; &A-RUI6-E005;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ruimoku-v6	  . #xE005)	; &A-RUI6-E005;
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x6208)	; 戈
+      )
+     ((=ucs@unicode	  . #x51AC)	; &MJ007359;
+      (=mj		  . 007359)	; &MJ007359;
+      ))
     (sources		ruimoku=A016481-00008)
     (=ruimoku-v6	. #xE005)	; &RUI6-E005;
     (->subsumptive
@@ -1155,13 +1326,33 @@
 	)
        ((==daikanwa	    . 11530)	; &g2-GT-14544;
 	)
-       ((=ucs@unicode	    . #x51AC)	; &MJ007359;
-	(=mj		    . 007359)	; &MJ007359;
+       ((==ucs@unicode	    . #x51AC)	; &g2-MJ007359;
+	(==mj		    . 007359)	; &g2-MJ007359;
 	))
       (==ruimoku-v6	  . #xE005)	; &g2-RUI6-E005;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=>ruimoku-v6	  . #xE005)	; &A-RUI6-E005;
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x6208)	; 戈
+      )
+     ((=ucs		  . #x2F81A)	; 冬
+      ))
+    (=ruimoku-v6	. #xE165)	; &RUI6-E165;
+    (->subsumptive
+     ((==ruimoku-v6	  . #xE165)	; &g2-RUI6-E165;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
@@ -1440,6 +1631,14 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x590C)	; 夌
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
     (=ucs		. #x229C7)	; 𢧇
     ))
 (define-char
@@ -1449,7 +1648,17 @@
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 11601)	; &M-11601;
+    (=ucs@iso		. #x229C7)	; &C5-3260;
+    (=cns11643-5	. #x3260)	; &C5-3260; [18-64]
+    (=daikanwa		. 11601)	; &I-M-11601;
+    (->subsumptive
+     ((==daikanwa	  . 11601)	; &g2-M-11601;
+      )
+     ((==ucs@iso	  . #x229C7)	; &g2-IU-000229C7;
+      )
+     ((==ucs@cns	  . #x229C7)	; &g2-CU+229C7;
+      (==cns11643-5	  . #x3260)	; &g2-CU+229C7; [18-64]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1462,19 +1671,6 @@
     (=gt-pj-3		. #x5A2C)	; &GT-14620; [58-12]
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x229C7)	; 𢧇
-      ))
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (->subsumptive
-     ((=ucs@iso		  . #x229C7)	; &U-000229C7;
-      )
-     ((=cns11643-5	  . #x3260)	; &C5-3260; [18-64]
-      ))
-    ))
-(define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
@@ -1543,6 +1739,37 @@
     (=daikanwa		. 49121)	; &I-M-49121;
     ))
 (define-char
+  '((ideographic-radical . 62)	; â¼½
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5485)	; 咅
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=ucs		. #x229C2)	; 𢧂
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x229C2)	; 𢧂
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs@iso		. #x229C2)	; &CB10356;
+    (=cbeta		. 10356)	; &CB10356;
+    (->subsumptive
+     ((==ucs@iso	  . #x229C2)	; &g2-CB10356;
+      (==cbeta		  . 10356)	; &g2-CB10356;
+      (->subsumptive
+       ((===cbeta	    . 10356)	; &R-CB10356;
+	)
+       ((===ucs@iso	    . #x229C2)	; &R-U-000229C2;
+	))
+      ))
+    ))
+(define-char
   '((=>ucs		. #x229C8)	; 𢧈
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 8)
@@ -1608,23 +1835,56 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x2099D)	; 𠦝
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
     (=ucs		. #x621F)	; 戟
+    (=adobe-japan1-0	. 01847)	; &I-AJ1-01847;
+    (=jis-x0208		. #x3761)	; &I-J90-3761; [23-65]
+    (=gb2312		. #x6A2A)	; &I-G0-6A2A; [74-10]
+    (=ks-x1001		. #x503D)	; &I-K0-503D; [48-29]
+    (=cns11643-1	. #x5F3C)	; &I-C1-5F3C; [63-28]
+    (=jis-x0213-1	. #x3761)	; &I-JX1-3761; [23-65]
     (=big5		. #xB475)	; &I-B-B475;
-    (->subsumptive
-     ((=daikanwa	  . 11606)	; &M-11606;
-      )
-     ((=ucs@unicode	  . #x621F)	; &AJ1-01847;
-      (=adobe-japan1-0	  . 01847)	; &AJ1-01847;
-      (=jis-x0208	  . #x3761)	; &I-J90-3761; [23-65]
-      (=gb2312		  . #x6A2A)	; &I-G0-6A2A; [74-10]
-      (=ks-x1001	  . #x503D)	; &I-K0-503D; [48-29]
-      (=jis-x0213-1	  . #x3761)	; &I-JX1-3761; [23-65]
-      (=gt		  . 14632)	; &I-GT-14632;
-      (=gt-k		  . 09044)	; &I-GT-K09044;
-      (=gt-pj-1		  . #x3761)	; &I-GT-14632; [23-65]
-      (=shinjigen	  .  2773)	; &AJ1-01847;
+    (=gt		. 14632)	; &I-GT-14632;
+    (=gt-k		. 09044)	; &I-GT-K09044;
+    (=gt-pj-1		. #x3761)	; &I-GT-14632; [23-65]
+    (=daikanwa		. 11606)	; &I-M-11606;
+    (=shinjigen		.  2773)	; 戟
+    (->subsumptive
+     ((==daikanwa	  . 11606)	; &g2-M-11606;
+      )
+     ((==ucs@unicode	  . #x621F)	; &g2-AJ1-01847;
+      (==adobe-japan1-0	  . 01847)	; &g2-AJ1-01847;
+      (==gb2312		  . #x6A2A)	; &g2-AJ1-01847; [74-10]
+      (==ks-x1001	  . #x503D)	; &g2-AJ1-01847; [48-29]
+      (==jis-x0208	  . #x3761)	; &g2-AJ1-01847; [23-65]
+      (==jis-x0213-1	  . #x3761)	; &g2-AJ1-01847; [23-65]
+      (==gt		  . 14632)	; &g2-AJ1-01847;
+      (==gt-k		  . 09044)	; &g2-AJ1-01847;
+      (==shinjigen	  .  2773)	; &g2-AJ1-01847;
+      (->subsumptive
+       ((===jis-x0208	    . #x3761)	; &R-J0-3761; [23-65]
+	(===jis-x0213-1	    . #x3761)	; &R-J0-3761; [23-65]
+	)
+       ((===adobe-japan1-0  . 01847)	; &R-AJ1-01847;
+	)
+       ((===gt		    . 14632)	; &R-GT-14632;
+	(===gt-k	    . 09044)	; &R-GT-14632;
+	)
+       ((===ucs@ks	    . #x621F)	; &R-K0-503D;
+	(===ks-x1001	    . #x503D)	; &R-K0-503D; [48-29]
+	)
+       ((===ucs@unicode	    . #x621F)	; &R-UU+621F;
+	))
       )
-     ((=cns11643-1	  . #x5F3C)	; &C1-5F3C; [63-28]
+     ((==ucs@cns	  . #x621F)	; &g2-CU+621F;
+      (==cns11643-1	  . #x5F3C)	; &g2-CU+621F; [63-28]
       ))
     ))
 (define-char
@@ -1644,6 +1904,17 @@
     (=cns11643-3	. #x3B65)	; &I-C3-3B65; [27-69]
     (=daikanwa/+p	. 11606)	; 㦸
     (=cbeta		. 02455)	; &I-CB02455;
+    (<-same
+     ((=ucs		  . #x621F)	; 戟
+      ))
+    (<-same*sources
+     pianhai)
+    (<-vulgar
+     ((=ucs		  . #x621F)	; 戟
+      (=daikanwa	  . 11606)	; &I-M-11606;
+      ))
+    (<-vulgar*sources
+     pianhai daikanwa)
     (->subsumptive
      ((==daikanwa/+p	  . 11606)	; &g2-M-p11606;
       )
@@ -1908,6 +2179,7 @@
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
+    (sound@ja/on	"sIHu")
     (=ucs		. #x6222)	; 戢
     ))
 (define-char
@@ -1917,23 +2189,77 @@
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=>>ucs@jis		. #x6222)	; &G-AJ1-16871;
-    (=>>ucs@cns		. #x6222)	; &G-AJ1-16871;
-    (=>>adobe-japan1-5	. 16871)	; &G-AJ1-16871;
-    (=>>jis-x0213-1	. #x7462)	; &G-AJ1-16871; [84-66]
-    (=big5		. #xB761)	; &G-AJ1-16871;
-    (=>>daikanwa	. 11617)	; &G-AJ1-16871;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x54A0)	; 咠
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=ucs@cns		. #x6222)	; &AJ1-16871;
+    (=ucs@jis		. #x6222)	; &AJ1-16871;
+    (=adobe-japan1-5	. 16871)	; &AJ1-16871;
+    (=jis-x0212		. #x3F2C)	; &I-JSP-3F2C; [31-12]
+    (=cns11643-1	. #x6429)	; &I-C1-6429; [68-09]
+    (=jis-x0213-1	. #x7462)	; &I-JX1-7462; [84-66]
+    (=big5		. #xB761)	; &I-B-B761;
+    (=daikanwa		. 11617)	; &I-M-11617;
+    (=jef-china3	. #x4EF5)	; &I-JC3-4EF5;
+    (<-interchangeable
+     ((=ucs		  . #x209AB)	; 𠦫
+      (=daikanwa	  . 02759)	; &I-M-02759;
+      )
+     ((=ucs@cns		  . #x6FC8)	; &AJ1-17995;
+      (=ucs@jis		  . #x6FC8)	; &AJ1-17995;
+      (=adobe-japan1-5	  . 17995)	; &AJ1-17995;
+      (=daikanwa	  . 18450)	; &I-M-18450;
+      )
+     ((=ucs		  . #x96C6)	; 集
+      (=daikanwa	  . 41974)	; &I-M-41974;
+      )
+     ((=ucs@unicode	  . #x63D2)	; &AJ1-05006;
+      (=adobe-japan1-0	  . 05006)	; &AJ1-05006;
+      (=daikanwa	  . 12346)	; &I-M-12346;
+      )
+     ((=ucs		  . #x8F2F)	; 輯
+      (=daikanwa	  . 38420)	; &I-M-38420;
+      ))
+    (<-interchangeable$_1*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable$_2*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable$_3*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable$_4*note "M-12119 seems a typo of M-12346.")
+    (<-interchangeable$_4*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable$_5*sources
+     daikanwa)
+    (<-interchangeable*sources
+     daikanwa)
     (->subsumptive
-     ((=daikanwa	  . 11617)	; &M-11617;
-      (=jef-china3	  . #x4EF5)	; &I-JC3-4EF5;
+     ((==daikanwa	  . 11617)	; &g2-M-11617;
+      (==jef-china3	  . #x4EF5)	; &g2-M-11617;
+      (->subsumptive
+       ((===daikanwa	    . 11617)	; &R-M-11617;
+	)
+       ((===jef-china3	    . #x4EF5)	; &R-JC3-4EF5;
+	))
       )
-     ((=ucs@jis		  . #x6222)	; &AJ1-16871;
-      (=adobe-japan1-5	  . 16871)	; &AJ1-16871;
-      (=jis-x0212	  . #x3F2C)	; &I-JSP-3F2C; [31-12]
-      (=jis-x0213-1	  . #x7462)	; &I-JX1-7462; [84-66]
+     ((==ucs@jis	  . #x6222)	; &g2-AJ1-16871;
+      (==adobe-japan1-5	  . 16871)	; &g2-AJ1-16871;
+      (==jis-x0212	  . #x3F2C)	; &g2-AJ1-16871; [31-12]
+      (==jis-x0213-1	  . #x7462)	; &g2-AJ1-16871; [84-66]
+      (->subsumptive
+       ((===jis-x0212	    . #x3F2C)	; &R-JX1-7462; [31-12]
+	(===jis-x0213-1	    . #x7462)	; &R-JX1-7462; [84-66]
+	)
+       ((===adobe-japan1-5  . 16871)	; &R-AJ1-16871;
+	))
       )
-     ((=ucs@cns		  . #x6222)	; &C1-6429;
-      (=cns11643-1	  . #x6429)	; &C1-6429; [68-09]
+     ((==ucs@cns	  . #x6222)	; &g2-CU+6222;
+      (==cns11643-1	  . #x6429)	; &g2-CU+6222; [68-09]
       ))
     ))
 (define-char
@@ -1946,6 +2272,11 @@
     (=ucs@unicode	. #x6222)	; &G0-6A2B;
     (=ucs@JP/hanazono	. nil)
     (=gb2312		. #x6A2B)	; &G0-6A2B; [74-11]
+    (->subsumptive
+     ((==ucs@unicode	  . #x6222)	; &g2-UU+6222;
+      (==ucs@JP/hanazono  . nil)
+      (==gb2312		  . #x6A2B)	; &g2-UU+6222; [74-11]
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -2238,6 +2569,23 @@
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs-itaiji-001	  . #x2564A)	; &U-i001+2564A;
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=ucs		. #x2D7F7)	; 𭟷
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2D7F7)	; &g2-hanaJU+2D7F7;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x6227)	; 戧
@@ -2277,21 +2625,61 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x501D)	; 倝
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
     (=ucs		. #x229E2)	; 𢧢
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x229E2)	; 𢧢
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (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		  . #x6208)	; 戈
+      ))
+    (=ucs@iso		. #x229E2)	; &C6-5D29;
+    (=cns11643-6	. #x5D29)	; &C6-5D29; [61-09]
+    (=daikanwa		. 11633)	; &I-M-11633;
+    (=shinjigen		.  2774)	; &C6-5D29;
+    (<-original
+     ((=ucs		  . #x621F)	; 戟
+      (=jis-x0208	  . #x3761)	; &I-J90-3761; [23-65]
+      (=shinjigen	  .  2773)	; 戟
+      ))
+    (<-original*sources
+     shinjigen)
+    (<-same
+     ((=ucs		  . #x621F)	; 戟
+      (=daikanwa	  . 11606)	; &I-M-11606;
+      ))
+    (<-same*sources
+     zihui daikanwa)
     (->subsumptive
-     ((=ucs@iso		  . #x229E2)	; &M-11633;
-      (=daikanwa	  . 11633)	; &M-11633;
-      (=shinjigen	  .  2774)	; &M-11633;
-      (<-original
-       ((=ucs@unicode	    . #x621F)	; &AJ1-01847;
-	(=adobe-japan1-0    . 01847)	; &AJ1-01847;
-	(=jis-x0208	    . #x3761)	; &I-J90-3761; [23-65]
-	(=shinjigen	    .  2773)	; &AJ1-01847;
+     ((==ucs@iso	  . #x229E2)	; &g2-M-11633;
+      (==daikanwa	  . 11633)	; &g2-M-11633;
+      (==shinjigen	  .  2774)	; &g2-M-11633;
+      (->subsumptive
+       ((===daikanwa	    . 11633)	; &R-M-11633;
+	)
+       ((===ucs@iso	    . #x229E2)	; &R-U-000229E2;
 	))
-      (<-original*sources
-       shinjigen)
       )
-     ((=cns11643-6	  . #x5D29)	; &C6-5D29; [61-09]
+     ((==ucs@cns	  . #x229E2)	; &g2-CU+229E2;
+      (==cns11643-6	  . #x5D29)	; &g2-CU+229E2; [61-09]
       ))
     ))
 (define-char
@@ -2557,19 +2945,68 @@
     (=daikanwa		. 11652)	; &I-M-11652;
     ))
 (define-char
-  '((=>ucs		. #x229F5)	; 𢧵
+  '((ideographic-radical . 62)	; â¼½
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x96C0)	; 雀
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (sound@ja/on	"setu")
+    (=ucs		. #x229F5)	; 𢧵
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x229F5)	; 𢧵
+      ))
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 11653)	; &M-11653;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x96C0)	; &AJ1-02627;
+      (=adobe-japan1-0	  . 02627)	; &AJ1-02627;
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=ucs@iso		. #x229F5)	; &C4-4974;
+    (=cns11643-4	. #x4974)	; &C4-4974; [41-84]
+    (=daikanwa		. 11653)	; &I-M-11653;
+    (<-original
+     ((=ucs		  . #x622A)	; 截
+      (=daikanwa	  . 11639)	; &I-M-11639;
+      ))
+    (<-original*sources
+     zhengzitong daikanwa)
+    (->subsumptive
+     ((==daikanwa	  . 11653)	; &g2-M-11653;
+      )
+     ((==ucs@iso	  . #x229F5)	; &g2-IU-000229F5;
+      )
+     ((==ucs@cns	  . #x229F5)	; &g2-CU+229F5;
+      (==cns11643-4	  . #x4974)	; &g2-CU+229F5; [41-84]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	11653 0 1)
+  '((<-denotational
+     ((=ucs		  . #x229F5)	; 𢧵
+      ))
     (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x229F5)	; 𢧵
-    (=cns11643-4	. #x4974)	; &I-C4-4974; [41-84]
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs-var-001	  . #x96C0)	; &U-v001+96C0;
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=ucs-var-002	. #x229F5)	; &U-v002+229F5;
     ))
 (define-char
   '((=>ucs		. #x229F6)	; 𢧶
@@ -2612,10 +3049,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@jis		  . #x7FCF)	; &JX2-747B;
-      (=jis-x0212	  . #x553A)	; &JX2-747B; [53-26]
-      (=jis-x0213-2	  . #x747B)	; &I-JX2-747B; [84-91]
-      (=daikanwa	  . 28665)	; &I-M-28665;
+     ((=ucs@jis		  . #x7FCF)	; &AJ1-18400;
+      (=adobe-japan1-5	  . 18400)	; &AJ1-18400;
       )
      ((=ucs		  . #x6208)	; 戈
       ))
@@ -3153,8 +3588,7 @@
 	)
        ((=ucs		    . #x268FB)	; 𦣻
 	)
-       ((name* . "ideographic component person as left roof")
-	(=gt-k		    . 00058)	; &GT-K00058;
+       ((=gt-k		    . 00058)	; &GT-K00058;
 	)
        ((=gt-k		    . 00439)	; &GT-K00439;
 	))