From: tomo <tomo>
Date: Sat, 24 Apr 2004 14:27:37 +0000 (+0000)
Subject: (J0-3B26): Use `<-denotational' for U+6BBA; use `->subsumptive' to
X-Git-Tag: r21-4-14-chise-0_21-26-si-vulgar^2~22
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b74160a569c745ab927585735ea5da8110e35a0b;p=chise%2Fxemacs-chise.git.1

(J0-3B26): Use `<-denotational' for U+6BBA; use `->subsumptive' to
integrate B-B1FE.
(G1-4931): Separate U+6BBA; use `<-denotational' for U+6BBA; use
`=>daikanwa' instead of `morohashi-daikanwa'.
(U-0002F8F5): use `<-denotational' for U+6BBA; use `=>daikanwa'
instead of `morohashi-daikanwa'.
(U+6BBA): Define as an abstract character.
(K0-5F2F): Use `<-denotational' for U+6BBA; use `->subsumptive' to
integrate U+F970 and C1-5B44.
---

diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index 051fe1a..153b2c8 100644
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -257,59 +257,70 @@
     (=daikanwa		. 16628)	; &M-16628;
     ))
 (define-char
-  '((=>ucs		. #x6BBA)	; 殺
-    (=>ucs@cns		. #x2F8F5)	; 殺
+  '((=>ucs@cns		. #x2F8F5)	; 殺
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x5F2F)	; &M-16638;
-      (=jis-x0213-1-2000  . #x7649)	; &I-JX1-7649;
-      (=daikanwa	  . 16638)	; &I-M-16638;
+    (<-denotational
+     ((=ucs		  . #x6BBA)	; 殺
       ))
-    (<-vulgar
-     ((=daikanwa	  . 16638)	; &I-M-16638;
+    (->subsumptive
+     ((<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x5F2F)	; &M-16638;
+	(=jis-x0213-1-2000  . #x7649)	; &I-JX1-7649;
+	(=daikanwa	    . 16638)	; &I-M-16638;
+	))
+      (<-vulgar
+       ((=ks-x1001	    . #x5F2F)	; &M-16638;
+	(=jis-x0213-1-2000  . #x7649)	; &I-JX1-7649;
+	(=daikanwa	    . 16638)	; &I-M-16638;
+	))
+      (<-vulgar*sources
+       daikanwa)
+      (shinjigen-1	  . 3996)
+      (shinjigen-2	  . 3996)
+      (=jis-x0208	  . #x3B26)	; &GT-21319;
+      (=gt		  . 21319)	; &I-GT-21319;
+      (=gt-k		  . 06440)	; &I-GT-K06440;
+      (=gt-pj-1		  . #x3B26)	; &I-GT-21319;
+      (=daikanwa	  . 16629)	; &I-M-16629;
+      (=ucs@jis		  . #x6BBA)	; &GT-21319;
+      )
+     ((=big5		  . #xB1FE)	; &B-B1FE;
+      (=ucs@big5	  . #x6BBA)	; &B-B1FE;
       ))
-    (<-vulgar*sources
-     daikanwa)
-    (shinjigen-1	. 3996)
-    (shinjigen-2	. 3996)
-    (=jis-x0208		. #x3B26)	; &GT-21319;
-    (=gt		. 21319)	; &I-GT-21319;
-    (=gt-k		. 06440)	; &I-GT-K06440;
-    (=gt-pj-1		. #x3B26)	; &I-GT-21319;
-    (=daikanwa		. 16629)	; &I-M-16629;
-    (=ucs@jis		. #x6BBA)	; &GT-21319;
-    ))
-(define-char
-  '((=>ucs		. #x6BBA)	; 殺
-    (=>ucs@cns		. #x2F8F5)	; 殺
-    (morohashi-daikanwa	16629 0 0)
+    ))
+(define-char
+  '((=>ucs@cns		. #x2F8F5)	; 殺
+    (=>daikanwa		. 16629)	; &GT-21319;
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=big5		. #xB1FE)	; &B-B1FE;
-    (=ucs@big5		. #x6BBA)	; &B-B1FE;
+    (<-denotational
+     ((=ucs		  . #x6BBA)	; 殺
+      ))
+    (=gb12345		. #x4931)	; &UU+6BBA;
+    (=ucs@unicode	. #x6BBA)	; &UU+6BBA;
     ))
 (define-char
   '((=>ucs*		. #x6BBA)	; 殺
-    (=>ucs@gb		. #x6BBA)	; 殺
+    (=>ucs@gb		. #x6BBA)	; &UU+6BBA;
     (=>ucs@jis		. #x6BBA)	; &GT-21319;
-    (morohashi-daikanwa	16629 0 1)
+    (=>daikanwa		. 16629)	; &GT-21319;
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (<-denotational
+     ((=ucs		  . #x6BBA)	; 殺
+      ))
     (=ucs		. #x2F8F5)	; 殺
     (=cns11643-4	. #x2D65)	; &I-C4-2D65;
     ))
 (define-char
-  '((=>ucs@cns		. #x2F8F5)	; 殺
-    (morohashi-daikanwa	16629 0 3)
-    (ideographic-radical . 79)	; ⽎
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6BBA)	; 殺
-    (=gb12345		. #x4931)	; 殺
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
@@ -452,34 +463,28 @@
     (=cns11643-6	. #x4076)	; &C6-4076;
     ))
 (define-char
-  '((=>ucs		. #x6BBA)	; 殺
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (shinjigen-1	. 3997)
-    (=ks-x1001		. #x5F2F)	; &M-16638;
-    (=jis-x0213-1-2000	. #x7649)	; &I-JX1-7649;
-    (=daikanwa		. 16638)	; &I-M-16638;
-    (=jef-china3	. #x54ED)	; &I-JC3-54ED;
-    (=ucs@jis		. #xF970)	; &M-16638;
-    ))
-(define-char
-  '((=>ucs*		. #x6BBA)	; 殺
-    (morohashi-daikanwa	16638 0 0)
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #xF970)	; 殺
-    (=ks-x1001		. #x616D)	; &I-K0-616D;
-    ))
-(define-char
-  '((=>ucs		. #x6BBA)	; 殺
-    (morohashi-daikanwa	16638 0 1)
-    (ideographic-radical . 79)	; ⽎
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=cns11643-1	. #x5B44)	; &C1-5B44;
-    (=ucs@cns		. #x6BBA)	; &C1-5B44;
+    (<-denotational
+     ((=ucs		  . #x6BBA)	; 殺
+      ))
+    (->subsumptive
+     ((shinjigen-1	  . 3997)
+      (=ks-x1001	  . #x5F2F)	; &M-16638;
+      (=jis-x0213-1-2000  . #x7649)	; &I-JX1-7649;
+      (=daikanwa	  . 16638)	; &I-M-16638;
+      (=jef-china3	  . #x54ED)	; &I-JC3-54ED;
+      (=ucs@jis		  . #xF970)	; &M-16638;
+      (=ucs@ks		  . #x6BBA)	; &M-16638;
+      )
+     ((=>ucs*		  . #x6BBA)	; 殺
+      (=ucs		  . #xF970)	; 殺
+      (=ks-x1001	  . #x616D)	; &I-K0-616D;
+      )
+     ((=cns11643-1	  . #x5B44)	; &C1-5B44;
+      (=ucs@cns		  . #x6BBA)	; &C1-5B44;
+      ))
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎