X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R062-Halberd.el;h=5cf2fabba4bd2c2cb1cf320a259b1009d616929d;hb=888f58dafbe58b95381887c8812f90128fb11a48;hp=f4e8de888d20457c42b027351939a451c049e617;hpb=ceb8c35658e6c01385aee112406d06028f46dc86;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 f4e8de8..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)	; 戉
@@ -1217,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
@@ -1226,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)
@@ -1715,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
@@ -1751,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;
       )
@@ -2345,6 +2447,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)	; 戧
@@ -2384,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
@@ -2664,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)	; 𢧶