Merge branch 'master' into single-inheritance

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index feb73c1..cc46fb1 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,12 @@
+2017-11-22  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+       * Ideograph-R034-Go.el (U+5902-itaiji-001): New character; use
+       `<-denotational@component' for A-BC-89D5.
+
+2017-11-21  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+       * Ideograph-R061-Heart.el (U-0002D72A): New character.
+
 2017-11-20  MORIOKA Tomohiko  <tomo.git@chise.org>
 
        * Ideograph-R036-Evening.el (A-compU+5915): New abstract

diff --git a/lisp/utf-2000/Ideograph-R034-Go.el b/lisp/utf-2000/Ideograph-R034-Go.el
index 841823b..f8558dc 100644 (file)
--- a/lisp/utf-2000/Ideograph-R034-Go.el
+++ b/lisp/utf-2000/Ideograph-R034-Go.el
@@ -92,6 +92,18 @@
       ))
     ))
 (define-char
+  '((<-denotational@component
+     ((=>big5-cdp        . #x89D5)     ; &A-CDP-89D5;
+      ))
+    (ideographic-radical . 34) ; ⼡
+    (ideographic-strokes . 0)
+    (total-strokes      . 3)
+    (=ucs-itaiji-001   . #x5902)       ; &U-i001+5902;
+    (<-formed@component
+     ((=ucs              . #x5902)     ; 夂
+      ))
+    ))
+(define-char
   '((ideographic-radical . 34) ; ⼡
     (ideographic-strokes . 1)
     (total-strokes      . 4)

diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el
index 410466b..9ea0f08 100644 (file)
--- a/lisp/utf-2000/Ideograph-R061-Heart.el
+++ b/lisp/utf-2000/Ideograph-R061-Heart.el
@@ -9775,6 +9775,62 @@
     ))
 (define-char
   '((ideographic-radical . 61) ; ⼼
+    (ideographic-strokes . 6)
+    (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=>ucs-itaiji-001          . #x56EA)     ; &A-U-i001+56EA;
+      )
+     ((=ucs              . #x5FC3)     ; 心
+      ))
+    (=ucs              . #x2D72A)      ; 𭜪
+    (<-unknown
+     ((=ucs              . #x60A4)     ; 悤
+      )
+     ((=ucs              . #x6031)     ; 怱
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x2D72A)    ; 𭜪
+      ))
+    (ideographic-radical . 61) ; ⼼
+    (ideographic-strokes . 6)
+    (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs-itaiji-003   . #x56EA)     ; &U-i003+56EA;
+      )
+     ((=ucs              . #x5FC3)     ; 心
+      ))
+    (=ucs@JP/hanazono  . #x2D72A)      ; &hanaJU+2D72A;
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2D72A)   ; &g2-hanaJU+2D72A;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x2D72A)    ; 𭜪
+      ))
+    (ideographic-radical . 61) ; ⼼
+    (ideographic-strokes . 6)
+    (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=gt-k             . 01840)      ; &GT-K01840;
+      )
+     ((=ucs              . #x5FC3)     ; 心
+      ))
+    (=ucs-var-001      . #x2D72A)      ; &U-v001+2D72A;
+    ))
+(define-char
+  '((ideographic-radical . 61) ; ⼼
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (=ucs              . #x393B)       ; 㤻

diff --git a/lisp/utf-2000/Ideograph-R091-Slice.el b/lisp/utf-2000/Ideograph-R091-Slice.el
index dd0c186..3be2a3f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R091-Slice.el
+++ b/lisp/utf-2000/Ideograph-R091-Slice.el
@@ -712,9 +712,9 @@
       )
      ((=ucs              . #x7247)     ; 片
       )
-     ((=>ucs@component   . #x56F1)     ; &A-compU+56F1;
-      (=ucs@big5         . #x56EA)     ; &A-compU+56F1;
-      (=>iwds-1                  .  0361)      ; &A-compU+56F1;
+     ((=>ucs@iwds-1      . #x56F1)     ; &A-IWDSU+56F1;
+      (=ucs@big5         . #x56EA)     ; &A-IWDSU+56F1;
+      (=>iwds-1                  .  0361)      ; &A-IWDSU+56F1;
       ))
     (=ucs              . #x245C4)      ; 𤗄
     ))