Merge branch 'master' into single-inheritance.

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 7edd2b8..0191f63 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-20  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+       * Ideograph-R072-Sun.el (U-00023158): New character.
+       (U+23158-var-001): New character; use `<-denotational' for
+       U-00023158.
+
 2017-05-18  MORIOKA Tomohiko  <tomo.git@chise.org>
 
        * Ideograph-R008-Lid.el (U+4EA7): Use BC-8BAE instead of "⿱亠丷"

diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el
index 0a39895..35739dc 100644 (file)
--- a/lisp/utf-2000/Ideograph-R046-Mountain.el
+++ b/lisp/utf-2000/Ideograph-R046-Mountain.el
@@ -1,8 +1,8 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((<-denotational@component
-     ((=>ucs@component   . #x5C6E)     ; &IWDS1-096;
-      (=>iwds-1                  .  0096)      ; &IWDS1-096;
+     ((=>ucs@component   . #x5C6E)     ; &A-compU+5C6E;
+      (=>iwds-1                  .  0096)      ; &A-compU+5C6E;
       ))
     (ideographic-radical . 46) ; ⼭
     (ideographic-strokes . 0)

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index deceeae..08e4881 100644 (file)
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -3,13 +3,13 @@
   '((ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 0)
     (total-strokes      . 4)
-    (=>ucs@component   . #x65E5)       ; &IWDS1-118;
-    (=>iwds-1          .  0118)        ; &IWDS1-118;
+    (=>ucs@component   . #x65E5)       ; &A-compU+65E5;
+    (=>iwds-1          .  0118)        ; &A-compU+65E5;
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component   . #x65E5)     ; &IWDS1-118;
-      (=>iwds-1                  .  0118)      ; &IWDS1-118;
+     ((=>ucs@component   . #x65E5)     ; &A-compU+65E5;
+      (=>iwds-1                  .  0118)      ; &A-compU+65E5;
       ))
     (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 0)
@@ -101,8 +101,8 @@
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component   . #x4E14)     ; &IWDS1-114;
-      (=>iwds-1                  .  0114)      ; &IWDS1-114;
+     ((=>ucs@component   . #x4E14)     ; &A-compU+4E14;
+      (=>iwds-1                  .  0114)      ; &A-compU+4E14;
       ))
     (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 1)
@@ -305,8 +305,8 @@
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component   . #x7680)     ; &IWDS1-355;
-      (=>iwds-1                  .  0355)      ; &IWDS1-355;
+     ((=>ucs@component   . #x7680)     ; &A-compU+7680;
+      (=>iwds-1                  .  0355)      ; &A-compU+7680;
       ))
     (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 2)
@@ -1128,6 +1128,59 @@
   '((ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 3)
     (total-strokes      . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=>ucs@component   . #x65E5)     ; &A-compU+65E5;
+      (=>iwds-1                  .  0118)      ; &A-compU+65E5;
+      )
+     ((=>ucs@component   . #x4E8F)     ; &A-compU+4E8F;
+      (=>iwds-1                  .  0093)      ; &A-compU+4E8F;
+      ))
+    (=ucs              . #x23158)      ; 𣅘
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x23158)    ; 𣅘
+      ))
+    (ideographic-radical . 72) ; ⽇
+    (ideographic-strokes . 3)
+    (total-strokes      . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs              . #x65E5)     ; 日
+      )
+     ((=ucs              . #x4E90)     ; 亐
+      ))
+    (=ucs-var-001      . #x23158)      ; &U-v001+23158;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x23158)    ; 𣅘
+      ))
+    (ideographic-radical . 72) ; ⽇
+    (ideographic-strokes . 3)
+    (total-strokes      . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs              . #x65E5)     ; 日
+      )
+     ((=ucs              . #x4E8F)     ; 亏
+      ))
+    (=ucs@iso          . #x23158)      ; &U-00023158;
+    (->subsumptive
+     ((==ucs@iso         . #x23158)    ; &g2-IU-00023158;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 72) ; ⽇
+    (ideographic-strokes . 3)
+    (total-strokes      . 7)
     (=>ucs-itaiji-002  . #x81FD)       ; &A-U-i002+81FD;
     ))
 (define-char
@@ -2258,8 +2311,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((=>ucs@component   . #x5929)     ; &IWDS1-008;
-      (=>iwds-1                  .  0008)      ; &IWDS1-008;
+     ((=>ucs@component   . #x5929)     ; &A-compU+5929;
+      (=>iwds-1                  .  0008)      ; &A-compU+5929;
       )
      ((=ucs              . #x65E5)     ; 日
       ))
@@ -4702,8 +4755,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component   . #x6637)     ; &IWDS1-320;
-      (=>iwds-1                  .  0320)      ; &IWDS1-320;
+     ((=>ucs@component   . #x6637)     ; &A-compU+6637;
+      (=>iwds-1                  .  0320)      ; &A-compU+6637;
       ))
     (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 5)
@@ -5413,13 +5466,13 @@
   '((ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (=>ucs@component   . #x6649)       ; &IWDS1-388;
-    (=>iwds-1          .  0388)        ; &IWDS1-388;
+    (=>ucs@component   . #x6649)       ; &A-compU+6649;
+    (=>iwds-1          .  0388)        ; &A-compU+6649;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component   . #x6649)     ; &IWDS1-388;
-      (=>iwds-1                  .  0388)      ; &IWDS1-388;
+     ((=>ucs@component   . #x6649)     ; &A-compU+6649;
+      (=>iwds-1                  .  0388)      ; &A-compU+6649;
       ))
     (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 6)
@@ -5497,8 +5550,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@component   . #x6649)     ; &IWDS1-388;
-      (=>iwds-1                  .  0388)      ; &IWDS1-388;
+     ((=>ucs@component   . #x6649)     ; &A-compU+6649;
+      (=>iwds-1                  .  0388)      ; &A-compU+6649;
       ))
     (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 6)

diff --git a/lisp/utf-2000/Ideograph-R073-Say.el b/lisp/utf-2000/Ideograph-R073-Say.el
index b095488..054d4fa 100644 (file)
--- a/lisp/utf-2000/Ideograph-R073-Say.el
+++ b/lisp/utf-2000/Ideograph-R073-Say.el
@@ -1,8 +1,8 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((<-denotational@component
-     ((=>ucs@component   . #x65E5)     ; &IWDS1-118;
-      (=>iwds-1                  .  0118)      ; &IWDS1-118;
+     ((=>ucs@component   . #x65E5)     ; &A-compU+65E5;
+      (=>iwds-1                  .  0118)      ; &A-compU+65E5;
       ))
     (ideographic-radical . 73) ; ⽈
     (ideographic-strokes . 0)

diff --git a/lisp/utf-2000/Ideograph-R074-Moon.el b/lisp/utf-2000/Ideograph-R074-Moon.el
index d780501..0b03299 100644 (file)
--- a/lisp/utf-2000/Ideograph-R074-Moon.el
+++ b/lisp/utf-2000/Ideograph-R074-Moon.el
@@ -6,13 +6,13 @@
     (ideographic-radical . 74) ; ⽉
     (ideographic-strokes . 0)
     (total-strokes      . 4)
-    (=>ucs@component   . #x6708)       ; &IWDS1-053;
-    (=>iwds-1          .  0053)        ; &IWDS1-053;
+    (=>ucs@component   . #x6708)       ; &A-compU+6708;
+    (=>iwds-1          .  0053)        ; &A-compU+6708;
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component   . #x6708)     ; &IWDS1-053;
-      (=>iwds-1                  .  0053)      ; &IWDS1-053;
+     ((=>ucs@component   . #x6708)     ; &A-compU+6708;
+      (=>iwds-1                  .  0053)      ; &A-compU+6708;
       ))
     (ideographic-radical . 74) ; ⽉
     (ideographic-strokes . 0)