X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R062-Halberd.el;h=5cf2fabba4bd2c2cb1cf320a259b1009d616929d;hb=af08411166821c8a07e6779d98dbae2d46bcb68c;hp=38898198e1eff48cbb9f400cf316866772affcf1;hpb=018ea7bc4b75b1c5f9f438dbf5c4a94b4162ddc9;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index 3889819..5cf2fab 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)	; â¼½
@@ -263,7 +318,26 @@
     (=ucs		. #x2298F)	; 𢦏
     (=cns11643-4	. #x2272)	; &I-C4-2272; [02-82]
     (=jis-x0213-2	. #x2C72)	; &I-JX2-2C72; [12-82]
+    (=big5-cdp		. #x8BDF)	; &I-CDP-8BDF;
     (=daikanwa		. 11538)	; &I-M-11538;
+    (->subsumptive
+     ((==ucs@iso	  . #x2298F)	; &g2-JX2-2C72;
+      (==cns11643-4	  . #x2272)	; &g2-JX2-2C72; [02-82]
+      (==jis-x0213-2	  . #x2C72)	; &g2-JX2-2C72; [12-82]
+      (==big5-cdp	  . #x8BDF)	; &g2-JX2-2C72;
+      (==daikanwa	  . 11538)	; &g2-JX2-2C72;
+      (->subsumptive
+       ((===daikanwa	    . 11538)	; &R-M-11538;
+	)
+       ((===jis-x0213-2	    . #x2C72)	; &R-JX2-2C72; [12-82]
+	)
+       ((===cns11643-4	    . #x2272)	; &R-C4-2272; [02-82]
+	)
+       ((===ucs@iso	    . #x2298F)	; &R-U-0002298F;
+	)
+       ((===big5-cdp	    . #x8BDF)	; &R-CDP-8BDF;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -346,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)	; 戔
@@ -360,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
@@ -961,6 +1071,30 @@
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4ECE)	; 从
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=mj		. 057538)	; &MJ057538;
+    (=koseki		. 130390)	; &MJ057538;
+    (<-formed
+     ((=ucs		  . #x39B0)	; 㦰
+      ))
+    (<-formed*sources
+     koseki)
+    (->subsumptive
+     ((==mj		  . 057538)	; &g2-MJ057538;
+      (==koseki		  . 130390)	; &g2-MJ057538;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x229A6)	; 𢦦
@@ -1103,6 +1237,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
@@ -1112,13 +1264,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)
@@ -1397,6 +1569,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
@@ -1406,7 +1586,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
@@ -1419,19 +1609,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)
@@ -1500,6 +1677,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)
@@ -1565,23 +1773,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
@@ -1601,6 +1842,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;
       )
@@ -2170,6 +2422,7 @@
       ))
     (=ucs@iso		. #x229DC)	; &C4-3D41;
     (=cns11643-4	. #x3D41)	; &C4-3D41; [29-33]
+    (=big5-cdp		. #x8C56)	; &I-CDP-8C56;
     (=daikanwa		. 49122)	; &I-M-49122;
     (<-same
      ((=cns11643-2	  . #x6F60)	; &C2-6F60; [79-64]
@@ -2180,17 +2433,37 @@
     (->subsumptive
      ((==daikanwa	  . 49122)	; &g2-M-49122;
       )
-     ((==ucs@iso	  . #x229DC)	; &g2-IU-000229DC;
-      (==cns11643-4	  . #x3D41)	; &g2-IU-000229DC; [29-33]
+     ((==ucs@iso	  . #x229DC)	; &g2-CDP-8C56;
+      (==cns11643-4	  . #x3D41)	; &g2-CDP-8C56; [29-33]
+      (==big5-cdp	  . #x8C56)	; &g2-CDP-8C56;
       (->subsumptive
        ((===cns11643-4	    . #x3D41)	; &R-C4-3D41; [29-33]
 	)
        ((===ucs@iso	    . #x229DC)	; &R-U-000229DC;
+	)
+       ((===big5-cdp	    . #x8C56)	; &R-CDP-8C56;
 	))
       ))
     ))
 (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)	; 戧
@@ -2230,21 +2503,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
@@ -2510,19 +2823,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)	; 𢧶
@@ -2565,10 +2927,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)	; 戈
       ))
@@ -3106,8 +3466,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;
 	))