Merge branch 'master' into single-inheritance

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 91be50e..aa17419 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,21 @@
+2018-01-17  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+       * Ideograph-R070-Square.el (U+65C1): Unify HD-KS153270.
+       (G-UU+65C1): New node; use `<-subsumptive' for U+65C1.
+       (g2-UU+65C1): Use G-UU+65C1 instead of U+65C1 as its mother.
+       (MJ057637): New character; use `<-subsumptive' for U+65C1; unify
+       G-HD-KS153270.
+       (g2-S-3247): Use MJ057637 instead of U+65C1 as its mother; unify
+       g2-MJ057637 and g2-HD-KS153270.
+
+2018-01-16  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+       * Ideograph-R146-West.el (U+8985): Apply new conventions for glyph
+       granularity.
+
+       * Ideograph-R130-Meat.el (U-00026785): Apply new conventions for
+       glyph granularity.
+
 2018-01-16  MORIOKA Tomohiko  <tomo.git@chise.org>
 
        * Ideograph-R028-Private.el (U-00020AD3): Add

diff --git a/lisp/utf-2000/Ideograph-R035-Go-Slowly.el b/lisp/utf-2000/Ideograph-R035-Go-Slowly.el
index e9d5967..e89d9a1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R035-Go-Slowly.el
+++ b/lisp/utf-2000/Ideograph-R035-Go-Slowly.el
@@ -743,7 +743,8 @@
       (=mj               . 033332)     ; &MJ033332;
       ))
     (->formed
-     ((=daikanwa         . 28764)      ; &M-28764;
+     ((=mj               . 045183)     ; &MJ045183;
+      (=daikanwa         . 28764)      ; &I-M-28764;
       )
      ((=cns11643-4       . #x656D)     ; &C4-656D; [69-77]
       (=daikanwa         . 47120)      ; &I-M-47120;

diff --git a/lisp/utf-2000/Ideograph-R070-Square.el b/lisp/utf-2000/Ideograph-R070-Square.el
index d3f0e46..a4e2ee9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R070-Square.el
+++ b/lisp/utf-2000/Ideograph-R070-Square.el
@@ -729,42 +729,65 @@
     (=cns11643-1       . #x5569)       ; &I-C1-5569; [53-73]
     (=jis-x0213-1      . #x5A55)       ; &I-JX1-5A55; [58-53]
     (=big5             . #xAEC7)       ; &I-B-AEC7;
+    (=hanyo-denshi/ks  . 153270)       ; 旁
     (=gt               . 17242)        ; &I-GT-17242;
     (=gt-k             . 06597)        ; &I-GT-K06597;
     (=gt-pj-1          . #x5A55)       ; &I-GT-17242; [58-53]
     (=daikanwa         . 13637)        ; &I-M-13637;
     (=shinjigen                .  3247)        ; 旁
     (->subsumptive
-     ((==ucs@unicode     . #x65C1)     ; &g2-AJ1-05082;
-      (==adobe-japan1-0          . 05082)      ; &g2-AJ1-05082;
-      (==gb2312                  . #x4554)     ; &g2-AJ1-05082; [37-52]
-      (==ks-x1001        . #x5B31)     ; &g2-AJ1-05082; [59-17]
-      (==jis-x0208       . #x5A55)     ; &g2-AJ1-05082; [58-53]
-      (==cns11643-1      . #x5569)     ; &g2-AJ1-05082; [53-73]
-      (==jis-x0213-1     . #x5A55)     ; &g2-AJ1-05082; [58-53]
-      (==gt              . 17242)      ; &g2-AJ1-05082;
-      (==gt-k            . 06597)      ; &g2-AJ1-05082;
-      (==daikanwa        . 13637)      ; &g2-AJ1-05082;
+     ((=>>ucs@unicode    . #x65C1)     ; &G-AJ1-05082;
+      (=>>adobe-japan1-0  . 05082)     ; &G-AJ1-05082;
+      (=>>jis-x0208      . #x5A55)     ; &G-AJ1-05082; [58-53]
+      (=>>cns11643-1     . #x5569)     ; &G-AJ1-05082; [53-73]
+      (=>>jis-x0213-1    . #x5A55)     ; &G-AJ1-05082; [58-53]
+      (=>>gt             . 17242)      ; &G-AJ1-05082;
+      (=>>gt-k           . 06597)      ; &G-AJ1-05082;
+      (=>>daikanwa       . 13637)      ; &G-AJ1-05082;
       (->subsumptive
-       ((===daikanwa       . 13637)    ; &R-M-13637;
-       )
-       ((===jis-x0208      . #x5A55)   ; &R-J0-5A55; [58-53]
-       (===jis-x0213-1     . #x5A55)   ; &R-J0-5A55; [58-53]
-       )
-       ((===adobe-japan1-0  . 05082)   ; &R-AJ1-05082;
-       )
-       ((===ucs@ks         . #x65C1)   ; &R-K0-5B31;
-       (===ks-x1001        . #x5B31)   ; &R-K0-5B31; [59-17]
-       )
-       ((===gt             . 17242)    ; &R-GT-17242;
-       (===gt-k            . 06597)    ; &R-GT-17242;
-       )
-       ((===ucs@unicode            . #x65C1)   ; &R-UU+65C1;
-       )
-       ((===cns11643-1     . #x5569)   ; &R-C1-5569; [53-73]
+       ((==ucs@unicode     . #x65C1)   ; &g2-AJ1-05082;
+       (==adobe-japan1-0   . 05082)    ; &g2-AJ1-05082;
+       (==gb2312           . #x4554)   ; &g2-AJ1-05082; [37-52]
+       (==ks-x1001         . #x5B31)   ; &g2-AJ1-05082; [59-17]
+       (==jis-x0208        . #x5A55)   ; &g2-AJ1-05082; [58-53]
+       (==cns11643-1       . #x5569)   ; &g2-AJ1-05082; [53-73]
+       (==jis-x0213-1      . #x5A55)   ; &g2-AJ1-05082; [58-53]
+       (==gt               . 17242)    ; &g2-AJ1-05082;
+       (==gt-k             . 06597)    ; &g2-AJ1-05082;
+       (==daikanwa         . 13637)    ; &g2-AJ1-05082;
+       (->subsumptive
+        ((===daikanwa        . 13637)  ; &R-M-13637;
+         )
+        ((===jis-x0208       . #x5A55) ; &R-J0-5A55; [58-53]
+         (===jis-x0213-1     . #x5A55) ; &R-J0-5A55; [58-53]
+         )
+        ((===adobe-japan1-0  . 05082)  ; &R-AJ1-05082;
+         )
+        ((===ucs@ks          . #x65C1) ; &R-K0-5B31;
+         (===ks-x1001        . #x5B31) ; &R-K0-5B31; [59-17]
+         )
+        ((===gt              . 17242)  ; &R-GT-17242;
+         (===gt-k            . 06597)  ; &R-GT-17242;
+         )
+        ((===ucs@unicode     . #x65C1) ; &R-UU+65C1;
+         )
+        ((===cns11643-1      . #x5569) ; &R-C1-5569; [53-73]
+         ))
        ))
       )
-     ((==shinjigen       .  3247)      ; &g2-SJG2-3247;
+     ((=mj               . 057637)     ; &MJ057637;
+      (=>>hanyo-denshi/ks . 153270)    ; &MJ057637;
+      (->subsumptive
+       ((==mj              . 057637)   ; &g2-MJ057637;
+       (==hanyo-denshi/ks  . 153270)   ; &g2-MJ057637;
+       (==shinjigen        .  3247)    ; &g2-MJ057637;
+       (->subsumptive
+        ((===hanyo-denshi/ks . 153270) ; &R-HD-KS-153270;
+         (=hanyo-denshi/ks/mf . #x3BDF)        ; &R-HD-KS-153270;
+         )
+        ((===mj              . 057637) ; &R-MJ057637;
+         ))
+       ))
       ))
     ))
 (define-char

diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el
index 72ae22a..dbab8bc 100644 (file)
--- a/lisp/utf-2000/Ideograph-R130-Meat.el
+++ b/lisp/utf-2000/Ideograph-R130-Meat.el
@@ -15022,14 +15022,44 @@
   '((ideographic-radical . 130)        ; ⾁
     (ideographic-strokes . 9)
     (total-strokes      . 13)
+    (hanyu-dazidian    3 2096 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=gt-k             . 05805)      ; &GT-K05805;
+      )
+     ((=>ucs@component   . #x6708)     ; &A-compU+6708;
+      (=>iwds-1                  .  0053)      ; &A-compU+6708;
+      ))
+    (sound@ja/on       "Wi")
     (=ucs              . #x26785)      ; 𦞅
+    (=cns11643-6       . #x5722)       ; &I-C6-5722; [55-02]
+    (=daikanwa         . 29741)        ; &I-M-29741;
+    (<-formed@shuowen
+     ((=ucs              . #x80C3)     ; 胃
+      ))
+    (<-formed@shuowen*sources
+     zhengzitong)
+    (<-same
+     ((=ucs              . #x80C3)     ; 胃
+      (=daikanwa         . 29348)      ; &I-M-29348;
+      ))
+    (<-same*sources
+     zhengzitong daikanwa)
     (->subsumptive
-     ((hanyu-dazidian    3 2096 10)
-      (=ucs@iso                  . #x26785)    ; &M-29741;
-      (=daikanwa         . 29741)      ; &M-29741;
-      (=hanziku-6        . #xAFBB)     ; &I-HZK06-AFBB;
+     ((==ucs@iso         . #x26785)    ; &g2-M-29741;
+      (==daikanwa        . 29741)      ; &g2-M-29741;
+      (->subsumptive
+       ((===daikanwa       . 29741)    ; &R-M-29741;
+       )
+       ((===ucs@iso        . #x26785)  ; &R-U-00026785;
+       )
+       ((=hanziku-6        . #xAFBB)   ; &HZK06-AFBB;
+       ))
       )
-     ((=cns11643-6       . #x5722)     ; &C6-5722; [55-02]
+     ((==ucs@cns         . #x26785)    ; &g2-CU+26785;
+      (==cns11643-6      . #x5722)     ; &g2-CU+26785; [55-02]
       ))
     ))
 (define-char

diff --git a/lisp/utf-2000/Ideograph-R142-Insect.el b/lisp/utf-2000/Ideograph-R142-Insect.el
index fe57b26..a512424 100644 (file)
--- a/lisp/utf-2000/Ideograph-R142-Insect.el
+++ b/lisp/utf-2000/Ideograph-R142-Insect.el
@@ -19045,8 +19045,8 @@
       )
      ((=ucs              . #x866B)     ; 虫
       )
-     ((=ucs@cns                  . #x8449)     ; &C1-6634;
-      (=cns11643-1       . #x6634)     ; &C1-6634; [70-20]
+     ((=ucs@cns                  . #x8449)     ; &HD-JT-B9DA;
+      (=cns11643-1       . #x6634)     ; &HD-JT-B9DA; [70-20]
       (=daikanwa         . 31387)      ; &I-M-31387;
       ))
     (=ucs@cns          . #x8802)       ; &C2-6673;

diff --git a/lisp/utf-2000/Ideograph-R146-West.el b/lisp/utf-2000/Ideograph-R146-West.el
index 58a8558..56c9b99 100644 (file)
--- a/lisp/utf-2000/Ideograph-R146-West.el
+++ b/lisp/utf-2000/Ideograph-R146-West.el
@@ -858,6 +858,15 @@
   '((ideographic-radical . 146)        ; ⾑
     (ideographic-strokes . 7)
     (total-strokes      . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x8981)     ; 要
+      )
+     ((=ucs              . #x52FF)     ; 勿
+      ))
+    (sound@ja/on       "ki")
     (=ucs              . #x8985)       ; 覅
     ))
 (define-char
@@ -867,7 +876,18 @@
     (ideographic-radical . 146)        ; ⾑
     (ideographic-strokes . 7)
     (total-strokes      . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=daikanwa         . 34768)      ; &M-34768;
+      )
+     ((=ucs              . #x52FF)     ; 勿
+      ))
     (=daikanwa         . 34780)        ; &M-34780;
+    (->subsumptive
+     ((==daikanwa        . 34780)      ; &g2-M-34780;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -876,11 +896,26 @@
     (ideographic-radical . 146)        ; ⾑
     (ideographic-strokes . 7)
     (total-strokes      . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs@unicode      . #x8981)     ; &AJ1-03905;
+      (=adobe-japan1-0   . 03905)      ; &AJ1-03905;
+      )
+     ((=ucs              . #x52FF)     ; 勿
+      ))
+    (=ucs@unicode      . #x8985)       ; &C2-4741;
+    (=cns11643-2       . #x4741)       ; &C2-4741; [39-33]
+    (=big5             . #xDFFA)       ; &I-B-DFFA;
     (->subsumptive
-     ((=ucs@unicode      . #x8985)     ; &UU+8985;
-      (=big5             . #xDFFA)     ; &UU+8985;
+     ((==ucs@unicode     . #x8985)     ; &g2-UU+8985;
+      (->subsumptive
+       ((===ucs@unicode            . #x8985)   ; &R-UU+8985;
+       ))
       )
-     ((=cns11643-2       . #x4741)     ; &C2-4741; [39-33]
+     ((==ucs@cns         . #x8985)     ; &g2-CU+8985;
+      (==cns11643-2      . #x4741)     ; &g2-CU+8985; [39-33]
       ))
     ))
 (define-char