Sync up with r21-4-14-chise-0_21-28-fix2.

[chise/xemacs-chise.git] / lisp / utf-2000 / Ideograph-R079-Weapon.el

diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index e480004..4e93c6c 100644 (file)
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -254,137 +254,148 @@
     (mojikyo           . 016624)       ; &MCS-600040F0;
     ))
 (define-char
-  '((=>ucs             . #x3C7E)       ; 㱾
-    (ideographic-radical . 79) ; ⽎
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=daikanwa         . 16625)        ; &M-16625;
-    ))
-(define-char
-  '((morohashi-daikanwa        16625 0 0)
-    (ideographic-radical . 79) ; ⽎
+  '((ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 6)
     (total-strokes      . 10)
     (=ucs              . #x3C7E)       ; 㱾
-    (=cns11643-4       . #x2D64)       ; &I-C4-2D64;
-    ))
-(define-char
-  '((=>ucs             . #x3C7F)       ; 㱿
-    (ideographic-radical . 79) ; ⽎
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=daikanwa         . 16626)        ; &M-16626;
+    (->subsumptive
+     ((=daikanwa         . 16625)      ; &M-16625;
+      )
+     ((=cns11643-4       . #x2D64)     ; &C4-2D64;
+      (=ucs@unicode      . #x3C7E)     ; &C4-2D64;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        16626 0 0)
-    (ideographic-radical . 79) ; ⽎
+  '((ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 6)
     (total-strokes      . 10)
     (=ucs              . #x3C7F)       ; 㱿
-    (=cns11643-3       . #x316B)       ; &I-C3-316B;
+    (->subsumptive
+     ((=daikanwa         . 16626)      ; &M-16626;
+      )
+     ((=cns11643-3       . #x316B)     ; &C3-316B;
+      (=ucs@unicode      . #x3C7F)     ; &C3-316B;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x6BB7)       ; 殷
-    (ideographic-radical . 79) ; ⽎
+  '((ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (shinjigen-2       . 3995)
-    (=jis-x0208                . #x5D56)       ; &GT-21313;
-    (=ks-x1001         . #x6B5C)       ; &I-K0-6B5C;
+    (=ucs              . #x6BB7)       ; 殷
     (=big5             . #xAEEF)       ; &I-B-AEEF;
-    (=gt               . 21313)        ; &I-GT-21313;
-    (=gt-k             . 06606)        ; &I-GT-K06606;
-    (=gt-pj-1          . #x5D56)       ; &I-GT-21313;
-    (=daikanwa         . 16627)        ; &I-M-16627;
-    (=ucs@jis          . #x6BB7)       ; &GT-21313;
+    (->subsumptive
+     ((shinjigen-2       . 3995)
+      (=jis-x0208        . #x5D56)     ; &GT-21313;
+      (=ks-x1001         . #x6B5C)     ; &I-K0-6B5C;
+      (=gt               . 21313)      ; &I-GT-21313;
+      (=gt-k             . 06606)      ; &I-GT-K06606;
+      (=gt-pj-1                  . #x5D56)     ; &I-GT-21313;
+      (=daikanwa         . 16627)      ; &I-M-16627;
+      (=ucs@jis                  . #x6BB7)     ; &GT-21313;
+      )
+     ((=gb2312           . #x5273)     ; &C1-5633;
+      (=cns11643-1       . #x5633)     ; &I-C1-5633;
+      (=ucs@unicode      . #x6BB7)     ; &C1-5633;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        16627 0 0)
-    (ideographic-radical . 79) ; ⽎
+  '((ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (=ucs              . #x6BB7)       ; 殷
-    (=gb2312           . #x5273)       ; &I-G0-5273;
-    (=cns11643-1       . #x5633)       ; &I-C1-5633;
+    (=ucs              . #x23A89)      ; 𣪉
+    (->subsumptive
+     ((=daikanwa         . 16628)      ; &M-16628;
+      )
+     ((=ucs@iso                  . #x23A89)    ; &UU+23A89;
+      ))
     ))
 (define-char
   '((ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (=daikanwa         . 16628)        ; &M-16628;
+    (=ucs              . #x6BBA)       ; 殺
     ))
 (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-ideograph
-     ((=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-ideograph*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)       ; 殺
-    (morohashi-daikanwa        16629 0 1)
+  '((=>daikanwa                . 16629)        ; &GT-21319;
     (ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 6)
     (total-strokes      . 10)
+    (<-denotational
+     ((=ucs              . #x6BBA)     ; 殺
+      ))
     (mojikyo           . 016629)       ; &MCS-600040F5;
     ))
 (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             . #x6BBA)       ; 殺
-    (morohashi-daikanwa        16629 0 2)
+  '((=>daikanwa                . 16629)        ; &GT-21319;
     (ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 6)
     (total-strokes      . 10)
+    (<-denotational
+     ((=ucs              . #x2F8F5)    ; 殺
+      ))
     (mojikyo           . 073347)       ; &MCS-60011E83;
     ))
 (define-char
-  '((=>ucs@cns         . #x2F8F5)      ; 殺
-    (morohashi-daikanwa        16629 0 3)
-    (ideographic-radical . 79) ; ⽎
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=ucs              . #x6BBA)       ; 殺
-    (=gb12345          . #x4931)       ; 殺
-    ))
-(define-char
   '((ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 7)
     (total-strokes      . 11)
@@ -539,23 +550,21 @@
     (mojikyo           . 016635)       ; &MCS-600040FB;
     ))
 (define-char
-  '((=>ucs             . #x23A8E)      ; 𣪎
-    (ideographic-radical . 79) ; ⽎
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (<-wrong-ideograph
-     (:char    ((=daikanwa          . 04033)   ; &I-M-04033;
-                )
-      :sources (morohashi-daikanwa)))
-    (=daikanwa         . 16636)        ; &M-16636;
-    ))
-(define-char
-  '((morohashi-daikanwa        16636 0 0)
-    (ideographic-radical . 79) ; ⽎
+  '((ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (=ucs              . #x23A8E)      ; 𣪎
-    (=cns11643-6       . #x4079)       ; &I-C6-4079;
+    (->subsumptive
+     ((<-wrong
+       ((=daikanwa         . 04033)    ; &I-M-04033;
+       ))
+      (<-wrong*sources
+       daikanwa)
+      (=daikanwa         . 16636)      ; &M-16636;
+      )
+     ((=cns11643-6       . #x4079)     ; &C6-4079;
+      (=ucs@iso                  . #x23A8E)    ; &C6-4079;
+      ))
     ))
 (define-char
   '((=>ucs             . #x23A8E)      ; 𣪎
@@ -581,34 +590,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) ; ⽎