Merge branch 'master' into single-inheritance

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index df5cc23..e2c2c5b 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,5 +1,17 @@
 2017-12-28  MORIOKA Tomohiko  <tomo.git@chise.org>
 
+       * Ideograph-R141-Tiger.el (U+8658): Apply new conventions for
+       glyph granularity.
+       (U-000271F3): New character.
+
+       * Ideograph-R033-Scholar.el (U+21523-var-001): New character; use
+       `<-denotational' for U-00021523.
+
+2017-12-28  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+       * Ideograph-R001-One.el (U-0002CEC0): Add
+       `<-denotational@component' for A-IWDSU+26B07.
+
        * Ideograph-R108-Dish.el: Use `leipian' instead of `leibian' to
        indicate 類篇.
 

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index 9d5481a..42906a8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -3945,7 +3945,11 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 1)  ; ⼀
+  '((<-denotational@component
+     ((=>ucs@iwds-1      . #x26B07)    ; &A-IWDSU+26B07;
+      (=>ucs@component   . #x26B07)    ; &A-IWDSU+26B07;
+      ))
+    (ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 5)
     (total-strokes      . 6)
     (ideographic-structure

diff --git a/lisp/utf-2000/Ideograph-R033-Scholar.el b/lisp/utf-2000/Ideograph-R033-Scholar.el
index 32edbe4..07530e6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R033-Scholar.el
+++ b/lisp/utf-2000/Ideograph-R033-Scholar.el
@@ -1025,6 +1025,23 @@
     ))
 (define-char
   '((<-denotational
+     ((=ucs              . #x21523)    ; 𡔣
+      ))
+    (ideographic-radical . 33) ; ⼠
+    (ideographic-strokes . 7)
+    (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (=ucs              . #x2FFA)     ; ⿺
+      )
+     ((=big5-cdp         . #x8CD5)     ; &CDP-8CD5;
+      )
+     ((=ucs              . #x20BB7)    ; 𠮷
+      ))
+    (=ucs-var-001      . #x21523)      ; &U-v001+21523;
+    ))
+(define-char
+  '((<-denotational
      ((=>ucs@iwds-1      . #x21523)    ; &A-IWDSU+21523;
       ))
     (ideographic-radical . 33) ; ⼠

diff --git a/lisp/utf-2000/Ideograph-R141-Tiger.el b/lisp/utf-2000/Ideograph-R141-Tiger.el
index bac7f73..98b3db9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R141-Tiger.el
+++ b/lisp/utf-2000/Ideograph-R141-Tiger.el
@@ -1194,16 +1194,57 @@
   '((ideographic-radical . 141)        ; ⾌
     (ideographic-strokes . 5)
     (total-strokes      . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs              . #x2FF8)     ; ⿸
+      )
+     ((=ucs              . #x864D)     ; 虍
+      )
+     ((=>ucs@component   . #x4E14)     ; &A-compU+4E14;
+      (=>iwds-1                  .  0114)      ; &A-compU+4E14;
+      ))
     (=ucs              . #x8658)       ; 虘
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x8658)     ; 虘
+      ))
+    (ideographic-radical . 141)        ; ⾌
+    (ideographic-strokes . 5)
+    (total-strokes      . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs              . #x2FF8)     ; ⿸
+      )
+     ((=ucs              . #x864D)     ; 虍
+      )
+     ((=ucs              . #x4E14)     ; 且
+      ))
+    (=ucs@unicode      . #x8658)       ; &JSP-5A3D;
+    (=jis-x0212                . #x5A3D)       ; &JSP-5A3D; [58-29]
+    (=cns11643-3       . #x3860)       ; &I-C3-3860; [24-64]
+    (=daikanwa         . 32701)        ; &I-M-32701;
+    (=cbeta            . 08841)        ; &I-CB08841;
+    (=jef-china3       . #x63A9)       ; &I-JC3-63A9;
     (->subsumptive
-     ((=ucs@unicode      . #x8658)     ; &JSP-5A3D;
-      (=jis-x0212        . #x5A3D)     ; &JSP-5A3D; [58-29]
-      (=daikanwa         . 32701)      ; &I-M-32701;
-      (=jef-china3       . #x63A9)     ; &I-JC3-63A9;
+     ((==ucs@unicode     . #x8658)     ; &g2-JSP-5A3D;
+      (==jis-x0212       . #x5A3D)     ; &g2-JSP-5A3D; [58-29]
+      (==daikanwa        . 32701)      ; &g2-JSP-5A3D;
+      (==jef-china3      . #x63A9)     ; &g2-JSP-5A3D;
+      (->subsumptive
+       ((===daikanwa       . 32701)    ; &R-M-32701;
+       )
+       ((===jis-x0212      . #x5A3D)   ; &R-JSP-5A3D; [58-29]
+       )
+       ((===jef-china3     . #x63A9)   ; &R-JC3-63A9;
+       )
+       ((===ucs@unicode            . #x8658)   ; &R-UU+8658;
+       ))
       )
-     ((=cbeta            . 08841)      ; &CB08841;
+     ((==cbeta           . 08841)      ; &g2-CB08841;
       )
-     ((=cns11643-3       . #x3860)     ; &C3-3860; [24-64]
+     ((==ucs@cns         . #x8658)     ; &g2-CU+8658;
+      (==cns11643-3      . #x3860)     ; &g2-CU+8658; [24-64]
       ))
     ))
 (define-char
@@ -3588,6 +3629,24 @@
     ))
 (define-char
   '((ideographic-radical . 141)        ; ⾌
+    (ideographic-strokes . 11)
+    (total-strokes      . 17)
+    (=ucs              . #x271F3)      ; 𧇳
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x271F3)    ; 𧇳
+      ))
+    (ideographic-radical . 141)        ; ⾌
+    (ideographic-strokes . 11)
+    (total-strokes      . 17)
+    (=ucs@iso          . #x271F3)      ; &U-000271F3;
+    (->subsumptive
+     ((==ucs@iso         . #x271F3)    ; &g2-IU-000271F3;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 141)        ; ⾌
     (ideographic-strokes . 12)
     (total-strokes      . 18)
     (=ucs              . #x459A)       ; 䖚