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=7f6235ae17ad89d61bf099f141619d4c21f5d238;hb=414b512c0774e67ba8e160b605447d862d3be166;hpb=1a1fc9b9d2a0c07725a088d7cc1f5bb11117dfa7

diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index 7f6235a..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)	; 戉
@@ -938,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;
+	))
+      )
+     ((==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)	; 丬
       )
-     ((=cns11643-1	  . #x4D51)	; &C1-4D51; [45-49]
+     ((=ucs		  . #x6208)	; 戈
+      ))
+    (=big5-cdp		. #x8879)	; &CDP-8879;
+    (->subsumptive
+     ((==big5-cdp	  . #x8879)	; &g2-CDP-8879;
       ))
     ))
 (define-char
@@ -1217,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
@@ -1226,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)
@@ -2059,6 +2179,7 @@
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
+    (sound@ja/on	"sIHu")
     (=ucs		. #x6222)	; 戢
     ))
 (define-char
@@ -2068,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
@@ -2097,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)	; â¼½
@@ -2389,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)	; 戧