Merge branch 'master' into single-inheritance

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 8b3bc37..a27c438 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,5 +1,12 @@
 2017-11-27  MORIOKA Tomohiko  <tomo.git@chise.org>
 
+       * Ideograph-R008-Lid.el (G-BC-8BAA): New glyph node to subsume
+       g2-BC-8BAA and GT-K01444; use `<-subsumptive' for BC-8BAA.
+
+       * Ideograph-R001-One.el (IWDS1-0150): Add
+       `<-denotational@component' for A-compU+20087.
+       (U-0002B743): Add `<-denotational' for A-cgnU+723E.
+
        * Ideograph-R089-Double-X.el (A-cgnU+723E): New abstract node.
        (U+723E): Add `<-denotational' for A-cgnU+723E.
 

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index 646e355..9d5481a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -554,7 +554,10 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 1)  ; ⼀
+  '((<-denotational@component
+     ((=>ucs@component   . #x20087)    ; &A-compU+20087;
+      ))
+    (ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 1)
     (total-strokes      . 2)
     (=>ucs@component   . #x4E06)       ; &A-compU+4E06;
@@ -5670,7 +5673,10 @@
     (=hanziku-1                . #xA9A3)       ; &I-HZK01-A9A3;
     ))
 (define-char
-  '((ideographic-radical . 1)  ; ⼀
+  '((<-denotational
+     ((=>ucs@cognate     . #x723E)     ; &A-cgnU+723E;
+      ))
+    (ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 13)
     (total-strokes      . 14)
     (=ucs              . #x2B743)      ; 𫝃

diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index ef73809..554c879 100644 (file)
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -381,17 +381,34 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (=ucs               . #x2FF1)   ; ⿱
        )
-       ((=ucs              . #x4EA0)   ; 亠
+       ((=+>ucs@unicode            . #x4EA0)   ; &o-J0-5035;
+       (=+>jis-x0208       . #x5035)   ; &o-J0-5035; [48-21]
        )
-       ((==ucs@unicode     . #x53E3)   ; &g2-AJ1-01969;
-       (==adobe-japan1-0   . 01969)    ; &g2-AJ1-01969;
+       ((=ucs              . #x53E3)   ; 口
        ))
-      (==big5-cdp        . #x8BAA)     ; &g2-CDP-8BAA;
-      )
-     ((=gt-k             . 01444)      ; &GT-K01444;
-      (=gt-pj-k1         . #x372D)     ; &GT-K01444; [23-13]
-      (<-identical@component/connect-below
-       ((=big5-cdp         . #x8BAA)   ; &CDP-8BAA;
+      (=>>big5-cdp       . #x8BAA)     ; &G-CDP-8BAA;
+      (->subsumptive
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+         (=ucs               . #x2FF1) ; ⿱
+         )
+        ((=+>ucs@unicode     . #x4EA0) ; &o-J0-5035;
+         (=+>jis-x0208       . #x5035) ; &o-J0-5035; [48-21]
+         )
+        ((==ucs@unicode      . #x53E3) ; &g2-AJ1-01969;
+         (==adobe-japan1-0   . 01969)  ; &g2-AJ1-01969;
+         ))
+       (==big5-cdp         . #x8BAA)   ; &g2-CDP-8BAA;
+       )
+       ((=gt-k             . 01444)    ; &GT-K01444;
+       (=gt-pj-k1          . #x372D)   ; &GT-K01444; [23-13]
+       (<-identical@component/connect-below
+        ((=>>big5-cdp        . #x8BAA) ; &G-CDP-8BAA;
+         ))
+       (->subsumptive
+        ((==gt-k             . 01444)  ; &g2-GT-K01444;
+         (==gt-pj-k1         . #x372D) ; &g2-GT-K01444; [23-13]
+         ))
        ))
       ))
     ))