(M-16629): Use `<-vulgar-ideograph' instead of `vulgar-ideograph-of'.

Merge GB 12345 code points.

diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index 821955c..95f1278 100644 (file)
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -250,21 +250,21 @@
     (ideograph-daikanwa . 16628)       ; �����
     ))
 (define-char
-  '((ideographic-radical . 79) ; ⽎
+  '((=>ucs             . #x6BBA)       ; 殺
+    (ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 6)
     (total-strokes      . 10)
+    (<-vulgar-ideograph
+     (:sources (morohashi-daikanwa)
+      :char    ((ideograph-daikanwa . 16638)   ; �����
+                )
+      ))
     (shinjigen-1       . 3996)
     (shinjigen-2       . 3996)
-    (vulgar-ideograph-of
-     ((sources           morohashi-daikanwa)
-      (char . ((ideograph-daikanwa . 16638)    ; �����
-              ))
-      ))
     (japanese-jisx0208-1978    . #x3B26)       ; �����
     (japanese-jisx0208         . #x3B26)       ; �����
     (japanese-jisx0208-1990    . #x3B26)       ; �����
     (ideograph-daikanwa                . 16629)        ; �����
-    (ucs                       . #x6BBA)       ; 殺
     ))
 (define-char
   '((->ucs             . #x6BBA)       ; 殺
@@ -285,13 +285,21 @@
     ))
 (define-char
   '((->ucs             . #x6BBA)       ; 殺
-    (morohashi-daikanwa        16629 0 1 0)
+    (morohashi-daikanwa        16629 0 2)
     (ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 6)
     (total-strokes      . 10)
     (mojikyo           . 073347)       ; ������
     ))
 (define-char
+  '((morohashi-daikanwa        16629 0 3)
+    (ideographic-radical . 79) ; ⽎
+    (ideographic-strokes . 6)
+    (total-strokes      . 10)
+    (chinese-gb12345   . #x4931)       ; 殺
+    (ucs               . #x6BBA)       ; 殺
+    ))
+(define-char
   '((ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 7)
     (total-strokes      . 11)
@@ -559,6 +567,7 @@
     (japanese-jisx0208-1978    . #x334C)       ; �����
     (japanese-jisx0208         . #x334C)       ; �����
     (chinese-cns11643-3                . #x3665)       ; �����
+    (chinese-gb12345           . #x3F47)       ; 殻
     (ucs                       . #x6BBB)       ; 殻
     ))
 (define-char
@@ -967,7 +976,8 @@
     (ucs                       . #x6BC5)       ; 毅
     ))
 (define-char
-  '((ideographic-radical . 79) ; ⽎
+  '((=>ucs             . #x6BC6)       ; 毆
+    (ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 11)
     (total-strokes      . 15)
     (shinjigen-2       . 3993)
@@ -975,11 +985,18 @@
     (japanese-jisx0208         . #x5D58)       ; �����
     (japanese-jisx0208-1990    . #x5D58)       ; �����
     (ideograph-daikanwa                . 16674)        ; �����
-    (ucs                       . #x6BC6)       ; 毆
+    ))
+(define-char
+  '((morohashi-daikanwa        16674 0 1)
+    (ideographic-radical . 79) ; ⽎
+    (ideographic-strokes . 11)
+    (total-strokes      . 15)
+    (chinese-gb12345   . #x4539)       ; 毆
+    (ucs               . #x6BC6)       ; 毆
     ))
 (define-char
   '((->ucs             . #x6BC6)       ; 毆
-    (morohashi-daikanwa        16674 0 1)
+    (morohashi-daikanwa        16674 0 2)
     (ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 11)
     (total-strokes      . 15)