X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R079-Weapon.el;h=83faf3202f5481573de9d0134f11bad0f99c7d34;hb=faa3ae41ffc9e271f7a1d18bc91cb98cf796587d;hp=d8a54bde83090216b33f2b6d8fe882a416190d42;hpb=6f72514790815f3e12062619e67cab49d7412878;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index d8a54bd..83faf32 100644
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -364,6 +364,7 @@
 (define-char
   '((ideographic-radical . 79)	; ⽎
     (=ucs		. #x23A98)	; 𣪘
+    (=>jis-x0213-2	. #x6E23)	; 𣪘 [78-03]
     ))
 (define-char
   '((<-denotational
@@ -455,7 +456,16 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6BB7)	; æ®·
-    (=adobe-japan1-0	. 05365)	; &I-AJ1-05365;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6BB7)	; æ®·
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x6BB7)	; &AJ1-05365;
+    (=adobe-japan1-0	. 05365)	; &AJ1-05365;
     (=jis-x0208		. #x5D56)	; &I-J90-5D56; [61-54]
     (=gb2312		. #x5273)	; &I-G0-5273; [50-83]
     (=ks-x1001		. #x6B5C)	; &I-K0-6B5C; [75-60]
@@ -466,7 +476,7 @@
     (=gt-k		. 06606)	; &I-GT-K06606;
     (=gt-pj-1		. #x5D56)	; &I-GT-21313; [61-54]
     (=daikanwa		. 16627)	; &I-M-16627;
-    (=shinjigen		.  3995)	; æ®·
+    (=shinjigen		.  3995)	; &AJ1-05365;
     (->subsumptive
      ((==ucs@jis	  . #x6BB7)	; &g2-AJ1-05365;
       (==ucs@ks		  . #x6BB7)	; &g2-AJ1-05365;
@@ -505,6 +515,15 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x6BB7)	; æ®·
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (===hng-kar		. 10070)	; &HNG018-10070;
+    ))
+(define-char
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
@@ -589,6 +608,8 @@
      ((==ucs@unicode	  . #x6BBA)	; &g2-UU+6BBA;
       (==ucs@JP/hanazono  . nil)
       (==gb12345	  . #x4931)	; &g2-UU+6BBA; [41-17]
+      )
+     ((===hng-kar	  . 10100)	; &HNG018-10100;
       ))
     ))
 (define-char
@@ -597,15 +618,15 @@
       (=+>ucs@cns	  . #x2F8F5)	; &o-J0-3B26;
       (=+>jis-x0208	  . #x3B26)	; &o-J0-3B26; [27-06]
       ))
+    (=>ucs*		. #x6BBA)	; 殺
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs@cns		. #x2F8F5)	; &C4-2D65;
-    (=cns11643-4	. #x2D65)	; &C4-2D65; [13-69]
+    (=ucs		. #x2F8F5)	; 殺
+    (=cns11643-4	. #x2D65)	; &I-C4-2D65; [13-69]
     (->subsumptive
-     ((=>ucs*		  . #x6BBA)	; 殺
-      (=ucs		  . #x2F8F5)	; 殺
-      (==cns11643-4	  . #x2D65)	; 殺 [13-69]
+     ((==ucs@iso	  . #x2F8F5)	; &g2-IU-0002F8F5;
+      (==cns11643-4	  . #x2D65)	; &g2-IU-0002F8F5; [13-69]
       (->subsumptive
        ((===cns11643-4	    . #x2D65)	; &R-C4-2D65; [13-69]
 	)
@@ -702,12 +723,40 @@
      ((=ucs		  . #x6BB3)	; 殳
       ))
     (=ucs		. #x6BB8)	; 殸
-    (=jis-x0212		. #x4630)	; &I-JSP-4630; [38-16]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6BB8)	; 殸
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x58F0)	; &AJ1-02656;
+      (=adobe-japan1-0	  . 02656)	; &AJ1-02656;
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
+    (=ucs@unicode	. #x6BB8)	; &JSP-4630;
+    (=jis-x0212		. #x4630)	; &JSP-4630; [38-16]
     (=cns11643-4	. #x324E)	; &I-C4-324E; [18-46]
     (=big5-cdp		. #x8BE0)	; &I-CDP-8BE0;
     (=daikanwa		. 16633)	; &I-M-16633;
     (->subsumptive
-     ((==ucs@jis	  . #x6BB8)	; &g2-JSP-4630;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((==ucs@unicode	    . #x58F0)	; &g2-AJ1-02656;
+	(==adobe-japan1-0   . 02656)	; &g2-AJ1-02656;
+	)
+       ((==ucs@jis	    . #x6BB3)	; &g2-MJ014908;
+	(==mj		    . 014908)	; &g2-MJ014908;
+	))
+      (==ucs@jis	  . #x6BB8)	; &g2-JSP-4630;
       (==jis-x0212	  . #x4630)	; &g2-JSP-4630; [38-16]
       (==big5-cdp	  . #x8BE0)	; &g2-JSP-4630;
       (==daikanwa	  . 16633)	; &g2-JSP-4630;
@@ -719,7 +768,16 @@
        ((===big5-cdp	    . #x8BE0)	; &R-CDP-8BE0;
 	))
       )
-     ((==ucs@unicode	  . #x6BB8)	; &g2-UU+6BB8;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((==ucs@unicode	    . #x58F0)	; &g2-AJ1-02656;
+	(==adobe-japan1-0   . 02656)	; &g2-AJ1-02656;
+	)
+       ((==ucs@unicode	    . #x6BB3)	; &g2-UU+6BB3;
+	))
+      (==ucs@unicode	  . #x6BB8)	; &g2-UU+6BB8;
       (==ucs@JP/hanazono  . nil)
       (==cns11643-4	  . #x324E)	; &g2-UU+6BB8; [18-46]
       (->subsumptive
@@ -730,6 +788,24 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x6BB8)	; 殸
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs-var-001	  . #x58F0)	; &U-v001+58F0;
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
+      ))
+    (=ucs-var-001	. #x6BB8)	; &U-v001+6BB8;
+    ))
+(define-char
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
@@ -977,69 +1053,31 @@
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x6BBB)	; æ®»
-    (=adobe-japan1-0	. 01450)	; &I-AJ1-01450;
-    (=jis-x0208		. #x334C)	; &I-J90-334C; [19-44]
-    (=cns11643-3	. #x3665)	; &I-C3-3665; [22-69]
-    (=jis-x0213-1	. #x334C)	; &I-JX1-334C; [19-44]
-    (=gb12345		. #x3F47)	; æ®» [31-39]
-    (=gt		. 21325)	; &I-GT-21325;
-    (=gt-k		. 07726)	; &I-GT-K07726;
-    (=gt-pj-1		. #x334C)	; &I-GT-21325; [19-44]
-    (=shinjigen		.  3999)	; æ®»
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6BBC)	; 殼
-      (=jis-x0208	  . #x5D57)	; &I-J90-5D57; [61-55]
-      ))
+    (=ucs		. #x23A95)	; 𣪕
     (->subsumptive
-     ((==jis-x0208@1978	  . #x334C)	; &g2-GT-21325; [19-44]
-      (==jis-x0208@1983	  . #x334C)	; &g2-GT-21325; [19-44]
-      (==gt		  . 21325)	; &g2-GT-21325;
-      (==gt-k		  . 07726)	; &g2-GT-21325;
-      (==shinjigen	  .  3999)	; &g2-GT-21325;
-      (->subsumptive
-       ((===jis-x0208@1978  . #x334C)	; &R-J83-334C; [19-44]
-	(===jis-x0208@1983  . #x334C)	; &R-J83-334C; [19-44]
-	)
-       ((===gt		    . 21325)	; &R-GT-21325;
-	(===gt-k	    . 07726)	; &R-GT-21325;
-	))
-      )
-     ((==ucs@unicode	  . #x6BBB)	; &g2-UU+6BBB;
-      (==ucs@JP/hanazono  . nil)
-      (==cns11643-3	  . #x3665)	; &g2-UU+6BBB; [22-69]
-      (==gb12345	  . #x3F47)	; &g2-UU+6BBB; [31-39]
-      (->subsumptive
-       ((===cns11643-3	    . #x3665)	; &R-C3-3665; [22-69]
-	)
-       ((===ucs@unicode	    . #x6BBB)	; &R-UU+6BBB;
-	))
+     ((=jef-china3	  . #x93C8)	; &JC3-93C8;
       )
-     ((==ucs@jis/1990	  . #x6BBB)	; &g2-AJ1-01450;
-      (==ucs@jis/2000	  . #x6BBB)	; &g2-AJ1-01450;
-      (==ucs@jis/2004	  . #x6BBB)	; &g2-AJ1-01450;
-      (==adobe-japan1-0	  . 01450)	; &g2-AJ1-01450;
-      (==jis-x0208@1990	  . #x334C)	; &g2-AJ1-01450; [19-44]
-      (==jis-x0213-1	  . #x334C)	; &g2-AJ1-01450; [19-44]
-      (->subsumptive
-       ((===jis-x0208@1990  . #x334C)	; &R-J90-334C; [19-44]
-	(===jis-x0213-1	    . #x334C)	; &R-J90-334C; [19-44]
-	)
-       ((===adobe-japan1-0  . 01450)	; &R-AJ1-01450;
-	))
+     ((=ucs@iso		  . #x23A95)	; &C6-407B;
+      (=cns11643-6	  . #x407B)	; &C6-407B; [32-91]
       ))
     ))
 (define-char
-  '((ideographic-radical . 79)	; ⽎
+  '((<-denotational
+     ((=>ucs@iso	  . #x23A98)	; &A-GT-21338;
+      ))
+    (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x23A95)	; 𣪕
-    (->subsumptive
-     ((=jef-china3	  . #x93C8)	; &JC3-93C8;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@iso		  . #x23A95)	; &C6-407B;
-      (=cns11643-6	  . #x407B)	; &C6-407B; [32-91]
+     ((=gt-k		  . 02802)	; &GT-K02802;
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
       ))
+    (=ucs-var-001	. #x23A98)	; &U-v001+23A98;
     ))
 (define-char
   '((<-denotational
@@ -1048,6 +1086,35 @@
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x7680)	; 皀
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
+      ))
+    (=>ucs@iso		. #x23A98)	; &A-GT-21338;
+    (=>gt		. 21338)	; &A-GT-21338;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iso	  . #x23A98)	; &A-GT-21338;
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x7680)	; &AJ1-05786;
+      (=adobe-japan1-0	  . 05786)	; &AJ1-05786;
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
+      ))
     (=ucs@iso		. #x23A98)	; &AJ1-17897;
     (=adobe-japan1-5	. 17897)	; &AJ1-17897;
     (=jis-x0213-2	. #x6E23)	; &I-JX2-6E23; [78-03]
@@ -1071,6 +1138,11 @@
 	))
       )
      ((==ucs@iso	  . #x23A98)	; &g2-IU-00023A98;
+      (->subsumptive
+       ((===ucs@iso	    . #x23A98)	; &R-U-00023A98;
+	)
+       ((=hanziku-6	    . #xBCA3)	; &HZK06-BCA3;
+	))
       ))
     ))
 (define-char
@@ -1170,6 +1242,13 @@
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
+    (==>ucs@bucs	. #x6BBC)	; &BUCS+6BBC;
+    ))
+(define-char
+  '((<-denotational
+     ((==>ucs@bucs	  . #x6BBC)	; &BUCS+6BBC;
+      ))
+    (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x6BBC)	; 殼
@@ -1218,6 +1297,65 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((==>ucs@bucs	  . #x6BBC)	; &BUCS+6BBC;
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs		. #x6BBB)	; æ®»
+    (=adobe-japan1-0	. 01450)	; &I-AJ1-01450;
+    (=jis-x0208		. #x334C)	; &I-J90-334C; [19-44]
+    (=cns11643-3	. #x3665)	; &I-C3-3665; [22-69]
+    (=jis-x0213-1	. #x334C)	; &I-JX1-334C; [19-44]
+    (=gb12345		. #x3F47)	; æ®» [31-39]
+    (=gt		. 21325)	; &I-GT-21325;
+    (=gt-k		. 07726)	; &I-GT-K07726;
+    (=gt-pj-1		. #x334C)	; &I-GT-21325; [19-44]
+    (=shinjigen		.  3999)	; æ®»
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6BBC)	; 殼
+      (=jis-x0208	  . #x5D57)	; &I-J90-5D57; [61-55]
+      ))
+    (->subsumptive
+     ((==jis-x0208@1978	  . #x334C)	; &g2-GT-21325; [19-44]
+      (==jis-x0208@1983	  . #x334C)	; &g2-GT-21325; [19-44]
+      (==gt		  . 21325)	; &g2-GT-21325;
+      (==gt-k		  . 07726)	; &g2-GT-21325;
+      (==shinjigen	  .  3999)	; &g2-GT-21325;
+      (->subsumptive
+       ((===jis-x0208@1978  . #x334C)	; &R-J83-334C; [19-44]
+	(===jis-x0208@1983  . #x334C)	; &R-J83-334C; [19-44]
+	)
+       ((===gt		    . 21325)	; &R-GT-21325;
+	(===gt-k	    . 07726)	; &R-GT-21325;
+	))
+      )
+     ((==ucs@unicode	  . #x6BBB)	; &g2-UU+6BBB;
+      (==ucs@JP/hanazono  . nil)
+      (==cns11643-3	  . #x3665)	; &g2-UU+6BBB; [22-69]
+      (==gb12345	  . #x3F47)	; &g2-UU+6BBB; [31-39]
+      (->subsumptive
+       ((===cns11643-3	    . #x3665)	; &R-C3-3665; [22-69]
+	)
+       ((===ucs@unicode	    . #x6BBB)	; &R-UU+6BBB;
+	))
+      )
+     ((==ucs@jis/1990	  . #x6BBB)	; &g2-AJ1-01450;
+      (==ucs@jis/2000	  . #x6BBB)	; &g2-AJ1-01450;
+      (==ucs@jis/2004	  . #x6BBB)	; &g2-AJ1-01450;
+      (==adobe-japan1-0	  . 01450)	; &g2-AJ1-01450;
+      (==jis-x0208@1990	  . #x334C)	; &g2-AJ1-01450; [19-44]
+      (==jis-x0213-1	  . #x334C)	; &g2-AJ1-01450; [19-44]
+      (->subsumptive
+       ((===jis-x0208@1990  . #x334C)	; &R-J90-334C; [19-44]
+	(===jis-x0213-1	    . #x334C)	; &R-J90-334C; [19-44]
+	)
+       ((===adobe-japan1-0  . 01450)	; &R-AJ1-01450;
+	))
+      ))
+    ))
+(define-char
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
@@ -1326,11 +1464,7 @@
     (<-formed*sources
      koseki)
     (<-formed@misc
-     ((=ucs@jis		  . #x78EC)	; &GT-31221;
-      (=jis-x0208	  . #x627E)	; &GT-31221; [66-94]
-      (=ks-x1001	  . #x4C64)	; &I-K0-4C64; [44-68]
-      (=jis-x0213-1	  . #x627E)	; &I-JX1-627E; [66-94]
-      (=daikanwa	  . 24454)	; &I-M-24454;
+     ((=ucs		  . #x78EC)	; 磬
       ))
     (<-formed@misc*sources
      mj)
@@ -1478,6 +1612,8 @@
 	)
        ((===ucs@unicode	    . #x6BBF)	; &R-UU+6BBF;
 	))
+      )
+     ((===hng-kar	  . 02040)	; &HNG018-02040;
       ))
     ))
 (define-char
@@ -1617,6 +1753,8 @@
 	)
        ((===ucs@unicode	    . #x6BC0)	; &R-UU+6BC0;
 	))
+      )
+     ((===hng-kar	  . 10080)	; &HNG018-10080;
       ))
     ))
 (define-char
@@ -2162,6 +2300,8 @@
 	)
        ((===ucs@unicode	    . #x6BC5)	; &R-UU+6BC5;
 	))
+      )
+     ((===hng-kar	  . 10090)	; &HNG018-10090;
       ))
     ))
 (define-char