X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R062-Halberd.el;h=03540718e675a7a1ae07a0711c93b6cbfa6cc3e7;hb=cc2ab627ec446e4b9f8d1e0d3b7649ac257fbfb3;hp=598e076c018d69279b599e4d764e8f423f751766;hpb=46d6ba43bc995b393d819eec13ecf9564877d5c4;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index 598e076..0354071 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)	; 戉
@@ -230,6 +250,14 @@
     (=gt-pj-1		. #x587C)	; &I-GT-14555; [56-92]
     (=daikanwa		. 11535)	; &I-M-11535;
     (=shinjigen		.  2761)	; 戌
+    (<-interchangeable
+     ((=ucs		  . #x460F)	; 䘏
+      (=daikanwa	  . 33968)	; &I-M-33968;
+      ))
+    (<-interchangeable$_1*sources
+     daikanwa)
+    (<-interchangeable*sources
+     daikanwa)
     (->mistakable
      ((=ucs		  . #x620A)	; 戊
       (=daikanwa	  . 11532)	; &I-M-11532;
@@ -237,11 +265,43 @@
      ((=ucs		  . #x6209)	; 戉
       (=daikanwa	  . 11531)	; &I-M-11531;
       )
-     ((=ucs		  . #x620D)	; 戍
+     ((=ucs@unicode	  . #x620D)	; &AJ1-04932;
+      (=adobe-japan1-0	  . 04932)	; &AJ1-04932;
       (=daikanwa	  . 11537)	; &I-M-11537;
       ))
     (->mistakable*sources
      zihui-biansi-4char daikanwa)
+    (->subsumptive
+     ((==ucs@unicode	  . #x620C)	; &g2-AJ1-04933;
+      (==adobe-japan1-0	  . 04933)	; &g2-AJ1-04933;
+      (==gb2312		  . #x5067)	; &g2-AJ1-04933; [48-71]
+      (==ks-x1001	  . #x6279)	; &g2-AJ1-04933; [66-89]
+      (==jis-x0208	  . #x587C)	; &g2-AJ1-04933; [56-92]
+      (==cns11643-1	  . #x4827)	; &g2-AJ1-04933; [40-07]
+      (==jis-x0213-1	  . #x587C)	; &g2-AJ1-04933; [56-92]
+      (==gt		  . 14555)	; &g2-AJ1-04933;
+      (==gt-k		  . 01723)	; &g2-AJ1-04933;
+      (==daikanwa	  . 11535)	; &g2-AJ1-04933;
+      (==shinjigen	  .  2761)	; &g2-AJ1-04933;
+      (->subsumptive
+       ((===daikanwa	    . 11535)	; &R-M-11535;
+	)
+       ((===jis-x0208	    . #x587C)	; &R-J0-587C; [56-92]
+	(===jis-x0213-1	    . #x587C)	; &R-J0-587C; [56-92]
+	)
+       ((===adobe-japan1-0  . 04933)	; &R-AJ1-04933;
+	)
+       ((===cns11643-1	    . #x4827)	; &R-C1-4827; [40-07]
+	)
+       ((===gt		    . 14555)	; &R-GT-14555;
+	(===gt-k	    . 01723)	; &R-GT-14555;
+	)
+       ((===ucs@ks	    . #x620C)	; &R-K0-6279;
+	(===ks-x1001	    . #x6279)	; &R-K0-6279; [66-89]
+	)
+       ((===ucs@unicode	    . #x620C)	; &R-UU+620C;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -260,6 +320,25 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
     (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x6208)	; 戈
+      )
+     ((=ucs		  . #x4EBA)	; 人
+      ))
+    (sound@ja/on	"syu")
+    (sound@ja/on/conventional "zyu")
+    (=ucs		. #x620D)	; 戍
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x620D)	; 戍
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 2)
+    (total-strokes	 . 6)
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
       )
@@ -267,10 +346,8 @@
       )
      ((=ucs		  . #x4E36)	; 丶
       ))
-    (sound@ja/on	"syu")
-    (sound@ja/on/conventional "zyu")
-    (=ucs		. #x620D)	; 戍
-    (=adobe-japan1-0	. 04932)	; &I-AJ1-04932;
+    (=ucs@unicode	. #x620D)	; &AJ1-04932;
+    (=adobe-japan1-0	. 04932)	; &AJ1-04932;
     (=jis-x0208		. #x587B)	; &I-J90-587B; [56-91]
     (=gb2312		. #x4A79)	; &I-G0-4A79; [42-89]
     (=ks-x1001		. #x6221)	; &I-K0-6221; [66-01]
@@ -281,7 +358,50 @@
     (=gt-k		. 01722)	; &I-GT-K01722;
     (=gt-pj-1		. #x587B)	; &I-GT-14553; [56-91]
     (=daikanwa		. 11537)	; &I-M-11537;
-    (=shinjigen		.  2758)	; 戍
+    (=shinjigen		.  2758)	; &AJ1-04932;
+    (->mistakable
+     ((=ucs		  . #x620A)	; 戊
+      (=daikanwa	  . 11532)	; &I-M-11532;
+      )
+     ((=ucs		  . #x6209)	; 戉
+      (=daikanwa	  . 11531)	; &I-M-11531;
+      )
+     ((=ucs		  . #x620C)	; 戌
+      (=daikanwa	  . 11535)	; &I-M-11535;
+      ))
+    (->mistakable*sources
+     daikanwa)
+    (->subsumptive
+     ((==ucs@unicode	  . #x620D)	; &g2-AJ1-04932;
+      (==adobe-japan1-0	  . 04932)	; &g2-AJ1-04932;
+      (==gb2312		  . #x4A79)	; &g2-AJ1-04932; [42-89]
+      (==ks-x1001	  . #x6221)	; &g2-AJ1-04932; [66-01]
+      (==jis-x0208	  . #x587B)	; &g2-AJ1-04932; [56-91]
+      (==cns11643-1	  . #x4828)	; &g2-AJ1-04932; [40-08]
+      (==jis-x0213-1	  . #x587B)	; &g2-AJ1-04932; [56-91]
+      (==gt		  . 14553)	; &g2-AJ1-04932;
+      (==gt-k		  . 01722)	; &g2-AJ1-04932;
+      (==daikanwa	  . 11537)	; &g2-AJ1-04932;
+      (==shinjigen	  .  2758)	; &g2-AJ1-04932;
+      (->subsumptive
+       ((===daikanwa	    . 11537)	; &R-M-11537;
+	)
+       ((===jis-x0208	    . #x587B)	; &R-J0-587B; [56-91]
+	(===jis-x0213-1	    . #x587B)	; &R-J0-587B; [56-91]
+	)
+       ((===adobe-japan1-0  . 04932)	; &R-AJ1-04932;
+	)
+       ((===cns11643-1	    . #x4828)	; &R-C1-4828; [40-08]
+	)
+       ((===gt		    . 14553)	; &R-GT-14553;
+	(===gt-k	    . 01722)	; &R-GT-14553;
+	)
+       ((===ucs@ks	    . #x620D)	; &R-K0-6221;
+	(===ks-x1001	    . #x6221)	; &R-K0-6221; [66-01]
+	)
+       ((===ucs@unicode	    . #x620D)	; &R-UU+620D;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -612,18 +732,17 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (=ucs		. #x6211)	; 我
+    (=>ucs@cognate	. #x6211)	; &A-cgnU+6211;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6211)	; 我
+     ((=>ucs@cognate	  . #x6211)	; &A-cgnU+6211;
       ))
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (=>ucs@iwds-1	. #x6211)	; &AJ1-01382;
-    (=ucs@unicode	. #x6211)	; &AJ1-01382;
-    (=adobe-japan1-0	. 01382)	; &AJ1-01382;
+    (=ucs		. #x6211)	; 我
+    (=adobe-japan1-0	. 01382)	; &I-AJ1-01382;
     (=jis-x0208		. #x3266)	; &I-J90-3266; [18-70]
     (=gb2312		. #x4E52)	; &I-G0-4E52; [46-50]
     (=ks-x1001		. #x6432)	; &I-K0-6432; [68-18]
@@ -634,7 +753,7 @@
     (=gt-k		. 02507)	; &I-GT-K02507;
     (=gt-pj-1		. #x3266)	; &I-GT-14561; [18-70]
     (=daikanwa		. 11545)	; &I-M-11545;
-    (=shinjigen		.  2764)	; &AJ1-01382;
+    (=shinjigen		.  2764)	; 我
     (->subsumptive
      ((==ucs@unicode	  . #x6211)	; &g2-AJ1-01382;
       (==adobe-japan1-0	  . 01382)	; &g2-AJ1-01382;
@@ -675,7 +794,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6211)	; 我
+     ((=>ucs@cognate	  . #x6211)	; &A-cgnU+6211;
       ))
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 3)
@@ -683,6 +802,29 @@
     (=ucs-itaiji-002	. #x6211)	; &U-i002+6211;
     ))
 (define-char
+  '((<-denotational
+     ((=>ucs@cognate	  . #x6211)	; &A-cgnU+6211;
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (=>ucs-itaiji-001	. #x6211)	; &A-U-i001+6211;
+    (=>ucs-itaiji-003	. #x6211)	; &A-U-i001+6211;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-001	  . #x6211)	; &A-U-i001+6211;
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=ucs-itaiji-001	. #x6211)	; &U-i001+6211;
+    (=ucs-itaiji-003	. #x6211)	; &U-i001+6211;
+    (->subsumptive
+     ((==ucs-itaiji-003	  . #x6211)	; &g2-U-i003+6211;
+      )
+     ((==ucs-itaiji-001	  . #x6211)	; &g2-U-i001+6211;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
@@ -938,18 +1080,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;
+    (=daikanwa		. 11562)	; &I-M-11562;
+    (=jef-china3	. #x4EF3)	; &I-JC3-4EF3;
     (->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;
+     ((==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;
+	))
+      )
+     ((==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)	; â¿°
       )
-     ((=cns11643-1	  . #x4D51)	; &C1-4D51; [45-49]
+     ((=ucs		  . #x4E2C)	; 丬
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=big5-cdp		. #x8879)	; &CDP-8879;
+    (->subsumptive
+     ((==big5-cdp	  . #x8879)	; &g2-CDP-8879;
       ))
     ))
 (define-char
@@ -1217,6 +1421,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
@@ -1226,13 +1448,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)
@@ -1351,19 +1593,34 @@
     (=gb2312		. #x5458)	; &I-G0-5458; [52-56]
     ))
 (define-char
+  '((<-denotational
+     ((=>big5-cdp@cognate . #x8DBA)	; &A-cgnCDP-8DBA;
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=>ucs-itaiji-001	  . #x6211)	; &A-U-i001+6211;
+      )
+     ((=ucs		  . #x4E43)	; 乃
+      ))
+    (=>big5-cdp		. #x86F7)	; &A-CDP-86F7;
+    ))
+(define-char
   '((ideographic-radical . 62)	; â¼½
+    (=>big5-cdp@cognate . #x8DBA)	; &A-cgnCDP-8DBA;
+    ))
+(define-char
+  '((<-denotational
+     ((=>big5-cdp@cognate . #x8DBA)	; &A-cgnCDP-8DBA;
+      ))
+    (ideographic-radical . 62)	; â¼½
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
       (=ucs		  . #x2FF8)	; ⿸
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x79BE)	; 禾
-	)
-       ((=ucs		    . #x6208)	; 戈
-	))
+     ((=>ucs-itaiji-001	  . #x6211)	; &A-U-i001+6211;
       )
      ((=ucs		  . #x4E02)	; 丂
       ))
@@ -1371,12 +1628,43 @@
     ))
 (define-char
   '((<-denotational
+     ((=>big5-cdp	  . #x86F7)	; &A-CDP-86F7;
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs-itaiji-001	  . #x6211)	; &U-i001+6211;
+      )
+     ((=ucs		  . #x4E43)	; 乃
+      ))
+    (=big5-cdp		. #x86F7)	; &CDP-86F7;
+    (->subsumptive
+     ((==big5-cdp	  . #x86F7)	; &g2-CDP-86F7;
+      ))
+    ))
+(define-char
+  '((<-denotational
      ((=>big5-cdp	  . #x8DBA)	; &A-CDP-8DBA;
       ))
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs-itaiji-001	  . #x6211)	; &U-i001+6211;
+      )
+     ((=ucs		  . #x4E02)	; 丂
+      ))
     (=big5-cdp		. #x8DBA)	; &CDP-8DBA;
+    (->subsumptive
+     ((==big5-cdp	  . #x8DBA)	; &g2-CDP-8DBA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -1650,6 +1938,23 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=>big5-cdp	  . #x86F7)	; &A-CDP-86F7;
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x79C0)	; 秀
+      )
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=big5-cdp-var-001	. #x86F7)	; &CDP-v001-86F7;
+    ))
+(define-char
   '((=>ucs		. #x229C8)	; 𢧈
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 8)
@@ -2059,6 +2364,7 @@
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
+    (sound@ja/on	"sIHu")
     (=ucs		. #x6222)	; 戢
     ))
 (define-char
@@ -2068,23 +2374,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
@@ -2097,6 +2457,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)	; â¼½
@@ -2389,6 +2754,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)	; 戧
@@ -2748,19 +3130,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)	; 𢧶