Merge branch 'master' into single-inheritance.

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index bd6fd89..7edd2b8 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,5 +1,8 @@
 2017-05-18  MORIOKA Tomohiko  <tomo.git@chise.org>
 
+       * Ideograph-R008-Lid.el (U+4EA7): Use BC-8BAE instead of "⿱亠丷"
+       in `ideographic-structure'; use `->subsumptive'.
+
        * Ideograph-R047-River.el (U+5DDF): Apply new conventions for
        glyph granularity.
 

diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index 71167e7..2b461da 100644 (file)
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -876,41 +876,35 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (=ucs               . #x2FF1)   ; ⿱
-       )
-       ((=ucs              . #x4EA0)   ; 亠
-       )
-       ((=ucs              . #x4E37)   ; 丷
-       ))
+     ((=big5-cdp         . #x8BAE)     ; &CDP-8BAE;
       )
      ((=ucs              . #x5382)     ; 厂
       ))
     (=ucs              . #x4EA7)       ; 产
     (=gb2312           . #x327A)       ; &I-G0-327A; [18-90]
-    (=hanziku-1                . #xE06E)       ; &I-HZK01-E06E;
+    (=gt-k             . 02308)        ; &I-GT-K02308;
+    (=gt-pj-k1         . #x3A57)       ; 产 [26-55]
+    (=jef-china3       . #x81C1)       ; &I-JC3-81C1;
     (<-simplified@CN
      ((=ucs              . #x7523)     ; 産
       (=gb12345                  . #x327A)     ; 産 [18-90]
       ))
-    ))
-(define-char
-  '((=>ucs             . #x4EA7)       ; 产
-    (ideographic-radical . 8)  ; ⼇
-    (ideographic-strokes . 4)
-    (total-strokes      . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
-      )
-     ((=big5-cdp         . #x8BAE)     ; &CDP-8BAE;
-      )
-     ((=ucs              . #x5382)     ; 厂
+    (->subsumptive
+     ((==ucs@unicode     . #x4EA7)     ; &g2-GT-K02308;
+      (==gb2312                  . #x327A)     ; &g2-GT-K02308; [18-90]
+      (==gt-k            . 02308)      ; &g2-GT-K02308;
+      (==gt-pj-k1        . #x3A57)     ; &g2-GT-K02308; [26-55]
+      (==jef-china3      . #x81C1)     ; &g2-GT-K02308;
+      (->subsumptive
+       ((===gt-k           . 02308)    ; &R-GT-K02308;
+       )
+       ((===jef-china3     . #x81C1)   ; &R-JC3-81C1;
+       )
+       ((===ucs@unicode            . #x4EA7)   ; &R-UU+4EA7;
+       )
+       ((=hanziku-1        . #xE06E)   ; &HZK01-E06E;
+       ))
       ))
-    (=gt-k             . 02308)        ; &GT-K02308;
-    (=gt-pj-k1         . #x3A57)       ; &GT-K02308; [26-55]
-    (=jef-china3       . #x81C1)       ; &I-JC3-81C1;
     ))
 (define-char
   '((ideographic-radical . 8)  ; ⼇

diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el
index 043df1d..1a79c49 100644 (file)
--- a/lisp/utf-2000/Ideograph-R064-Hand.el
+++ b/lisp/utf-2000/Ideograph-R064-Hand.el
@@ -15613,7 +15613,7 @@
       )
      ((=ucs              . #x624C)     ; 扌
       )
-     ((=gt-k             . 06360)      ; &GT-K06360;
+     ((=gt-k             . 06360)      ; &U-i001+758C;
       ))
     (=ucs@unicode      . #x3A17)       ; &C3-3B6E;
     (=cns11643-3       . #x3B6E)       ; &C3-3B6E; [27-78]

diff --git a/lisp/utf-2000/Ideograph-R069-Axe.el b/lisp/utf-2000/Ideograph-R069-Axe.el
index f3ce823..8660e02 100644 (file)
--- a/lisp/utf-2000/Ideograph-R069-Axe.el
+++ b/lisp/utf-2000/Ideograph-R069-Axe.el
@@ -1313,8 +1313,8 @@
       )
      ((=ucs              . #x65A4)     ; 斤
       ))
-    (=cbeta            . 12143)        ; &CB12143;
-    (=ucs-itaiji-002   . #x7948)       ; &CB12143;
+    (=cbeta            . 12143)        ; &U-i002+7948;
+    (=ucs-itaiji-002   . #x7948)       ; &U-i002+7948;
     (->subsumptive
      ((==cbeta           . 12143)      ; &g2-CB12143;
       ))

diff --git a/lisp/utf-2000/Ideograph-R070-Square.el b/lisp/utf-2000/Ideograph-R070-Square.el
index 63b9410..394b0e1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R070-Square.el
+++ b/lisp/utf-2000/Ideograph-R070-Square.el
@@ -114,8 +114,8 @@
      ((name*             . "ideographic component person for top")
       (=ucs              . #x20089)    ; 𠂉
       ))
-    (=cbeta            . 12073)        ; &CB12073;
-    (=ucs-itaiji-001   . #x3AC3)       ; &CB12073;
+    (=cbeta            . 12073)        ; &U-i001+3AC3;
+    (=ucs-itaiji-001   . #x3AC3)       ; &U-i001+3AC3;
     (<-formed@component/surround-from-upper-left
      ((=ucs              . #x3AC3)     ; 㫃
       ))
@@ -2156,7 +2156,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
       (=ucs              . #x2FF8)     ; ⿸
       )
-     ((=cbeta            . 12073)      ; &CB12073;
+     ((=cbeta            . 12073)      ; &U-i001+3AC3;
       )
      ((=ucs              . #x7568)     ; 畨
       ))

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index ea564c5..deceeae 100644 (file)
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -1142,11 +1142,11 @@
       )
      ((=ucs              . #x65E7)     ; 旧
       ))
-    (=gt-k             . 03616)        ; &GT-K03616;
-    (=>>gt-k           . 03318)        ; &GT-K03616;
-    (=gt-pj-k1         . #x5E44)       ; &GT-K03616; [62-36]
-    (=ucs-itaiji-002   . #x81FD)       ; &GT-K03616;
-    (=ucs-itaiji-003   . #x81FD)       ; &GT-K03616;
+    (=gt-k             . 03616)        ; &U-i002+81FD;
+    (=>>gt-k           . 03318)        ; &U-i002+81FD;
+    (=gt-pj-k1         . #x5E44)       ; &U-i002+81FD; [62-36]
+    (=ucs-itaiji-002   . #x81FD)       ; &U-i002+81FD;
+    (=ucs-itaiji-003   . #x81FD)       ; &U-i002+81FD;
     (<-simplified@component
      ((=ucs              . #x81FD)     ; 臽
       ))
@@ -1178,8 +1178,8 @@
       (=gt-k             . 03318)      ; &GT-K03318;
       (=gt-pj-k1         . #x357D)     ; &GT-K03318; [21-93]
       (->subsumptive
-       ((==gt-k                    . 03318)    ; &g2-GT-K03318;
-       (==ucs-itaiji-003   . #x81FD)   ; &g2-GT-K03318;
+       ((==gt-k                    . 03318)    ; &g2-U-i003+81FD;
+       (==ucs-itaiji-003   . #x81FD)   ; &g2-U-i003+81FD;
        ))
       ))
     ))