Merge branch 'master' into single-inheritance.

[chise/xemacs-chise.git-] / lisp / utf-2000 / Ideograph-R062-Halberd.el

diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index abaf02a..f4e8de8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R062-Halberd.el
+++ b/lisp/utf-2000/Ideograph-R062-Halberd.el
@@ -195,13 +195,13 @@
   '((ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 2)
     (total-strokes      . 6)
-    (=>ucs@component   . #x620C)       ; &IWDS1-049;
-    (=>iwds-1          .  0049)        ; &IWDS1-049;
+    (=>ucs@component   . #x620C)       ; &A-compU+620C;
+    (=>iwds-1          .  0049)        ; &A-compU+620C;
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component   . #x620C)     ; &IWDS1-049;
-      (=>iwds-1                  .  0049)      ; &IWDS1-049;
+     ((=>ucs@component   . #x620C)     ; &A-compU+620C;
+      (=>iwds-1                  .  0049)      ; &A-compU+620C;
       ))
     (ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 2)
@@ -253,8 +253,8 @@
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component   . #x620C)     ; &IWDS1-049;
-      (=>iwds-1                  .  0049)      ; &IWDS1-049;
+     ((=>ucs@component   . #x620C)     ; &A-compU+620C;
+      (=>iwds-1                  .  0049)      ; &A-compU+620C;
       ))
     (ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 2)
@@ -400,13 +400,13 @@
     ))
 (define-char
   '((ideographic-radical . 62) ; ⼽
-    (=>ucs@component   . #x39AE)       ; &IWDS1-274;
-    (=>iwds-1          .  0274)        ; &IWDS1-274;
+    (=>ucs@component   . #x39AE)       ; &A-compU+39AE;
+    (=>iwds-1          .  0274)        ; &A-compU+39AE;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component   . #x39AE)     ; &IWDS1-274;
-      (=>iwds-1                  .  0274)      ; &IWDS1-274;
+     ((=>ucs@component   . #x39AE)     ; &A-compU+39AE;
+      (=>iwds-1                  .  0274)      ; &A-compU+39AE;
       ))
     (ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 2)
@@ -450,8 +450,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component   . #x39AE)     ; &IWDS1-274;
-      (=>iwds-1                  .  0274)      ; &IWDS1-274;
+     ((=>ucs@component   . #x39AE)     ; &A-compU+39AE;
+      (=>iwds-1                  .  0274)      ; &A-compU+39AE;
       ))
     (ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 1)
@@ -1511,6 +1511,14 @@
   '((ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 7)
     (total-strokes      . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x590C)     ; 夌
+      )
+     ((=ucs              . #x6208)     ; 戈
+      ))
     (=ucs              . #x229C7)      ; 𢧇
     ))
 (define-char
@@ -1520,7 +1528,17 @@
     (ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (=daikanwa         . 11601)        ; &M-11601;
+    (=ucs@iso          . #x229C7)      ; &C5-3260;
+    (=cns11643-5       . #x3260)       ; &C5-3260; [18-64]
+    (=daikanwa         . 11601)        ; &I-M-11601;
+    (->subsumptive
+     ((==daikanwa        . 11601)      ; &g2-M-11601;
+      )
+     ((==ucs@iso         . #x229C7)    ; &g2-IU-000229C7;
+      )
+     ((==ucs@cns         . #x229C7)    ; &g2-CU+229C7;
+      (==cns11643-5      . #x3260)     ; &g2-CU+229C7; [18-64]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1533,19 +1551,6 @@
     (=gt-pj-3          . #x5A2C)       ; &GT-14620; [58-12]
     ))
 (define-char
-  '((<-denotational
-     ((=ucs              . #x229C7)    ; 𢧇
-      ))
-    (ideographic-radical . 62) ; ⼽
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (->subsumptive
-     ((=ucs@iso                  . #x229C7)    ; &U-000229C7;
-      )
-     ((=cns11643-5       . #x3260)     ; &C5-3260; [18-64]
-      ))
-    ))
-(define-char
   '((ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 7)
     (total-strokes      . 11)
@@ -1614,6 +1619,37 @@
     (=daikanwa         . 49121)        ; &I-M-49121;
     ))
 (define-char
+  '((ideographic-radical . 62) ; ⼽
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x5485)     ; 咅
+      )
+     ((=ucs              . #x6208)     ; 戈
+      ))
+    (=ucs              . #x229C2)      ; 𢧂
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x229C2)    ; 𢧂
+      ))
+    (ideographic-radical . 62) ; ⼽
+    (ideographic-strokes . 7)
+    (total-strokes      . 11)
+    (=ucs@iso          . #x229C2)      ; &CB10356;
+    (=cbeta            . 10356)        ; &CB10356;
+    (->subsumptive
+     ((==ucs@iso         . #x229C2)    ; &g2-CB10356;
+      (==cbeta           . 10356)      ; &g2-CB10356;
+      (->subsumptive
+       ((===cbeta          . 10356)    ; &R-CB10356;
+       )
+       ((===ucs@iso        . #x229C2)  ; &R-U-000229C2;
+       ))
+      ))
+    ))
+(define-char
   '((=>ucs             . #x229C8)      ; 𢧈
     (ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 8)