Merge branch 'master' into single-inheritance.

diff --combined lisp/utf-2000/ChangeLog
index 24a8d45,97ac162..32854ab
--- 1/lisp/utf-2000/ChangeLog
--- 2/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@@ -1,3 -1,35 +1,35 @@@
+ 2017-04-26  MORIOKA Tomohiko  <tomo.git@chise.org>
+ 
+       * Ideograph-R030-Mouth.el (U+3563): Add `ideographic-structure'.
+       (U+3563-var-001): New character; use `<-denotational' for U+3563.
+ 
+       * Ideograph-R038-Woman.el (U+59C5): Apply new conventions for
+       glyph granularity.
+       (U+59CC): Likewise.
+       (U+5A3D): Likewise.
+       (U+5A4B): Likewise.
+       (U+5A58): Likewise.
+       (U+5A5A): Likewise.
+       (U+36F0): Likewise.
+       (U+5AA5): Likewise.
+       (BUCS+5ABC): New node; unify B-B6FE.
+       (U+5AAA): Apply new conventions for glyph granularity; add
+       `<-denotational' for BUCS+5ABC.
+       (U+5AB6): Apply new conventions for glyph granularity.
+       (U+5ABC): Likewise; delete `japanese-strokes'; move B-B6FE to
+       BUCS+5ABC; add `<-denotational' for BUCS+5ABC.
+       (U+370E): Apply new conventions for glyph granularity.
+       (U+5ADF): Likewise.
+       (U+5AEB): Likewise.
+       (U+5AF3): Likewise.
+       (U+5B1E): Likewise.
+       (U-000218CC): Likewise.
+       (U+5B3D): Likewise; use `{ideographic|total}-strokes@ucs' instead
+       of `{ideographic|total}-strokes'; add `ideographic-strokes@cns';
+       use `total-strokes@cns' instead of `cns-total-strokes'.
+       (U+3734): Apply new conventions for glyph granularity.
+       (U+5B49): Likewise.
+ 
  2017-04-24  MORIOKA Tomohiko  <tomo.git@chise.org>
  
        * Ideograph-R058-Snout.el (o-UU+5F56): New node; use
@@@ -3975,11 -4007,6 +4007,11 @@@
  
  2016-11-21  MORIOKA Tomohiko  <tomo.git@chise.org>
  
 +      * ideograph-util.el (char-representative-of-daikanwa): Don't make
 +      temporal lists for `<-subsumptive' and `<-denotational'.
 +
 +2016-11-21  MORIOKA Tomohiko  <tomo.git@chise.org>
 +
        * Ideograph-R009-Man.el (G-IU+202E1): New abstract glyph node to
        subsume g2-IU+202E1 and g2-CU+202E1.
  
@@@ -4042,20 -4069,6 +4074,20 @@@
  
  2016-11-16  MORIOKA Tomohiko  <tomo.git@chise.org>
  
 +      * ideograph-util.el (update-ideograph-radical-table): Modify for
 +      `<-subsumptive'.
 +      (char-representative-of-daikanwa): Modify for `<-subsumptive' and
 +      `<-denotational'.
 +      (char-daikanwa): Likewise.
 +
 +      * chise-subr.el (map-char-family): Modify for `<-subsumptive' and
 +      `<-denotational'.
 +
 +      * char-db-util.el (char-db-insert-relation-feature): Accept
 +      character as argument `value'.
 +
 +2016-11-16  MORIOKA Tomohiko  <tomo.git@chise.org>
 +
        * Ideograph-R027-Cliff.el (A-UU+53A9): New abstract node; use
        `<-denotational' for U+53A9.
        (UU+53A9): Use A-UU+53A9 instead of U+53A9 as the mother.