Merge branch 'master' into single-inheritance.

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 8c62215..72d3251 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -6,8 +6,21 @@
          abstract glyph-forms.
        (U+571D): Separate UU+571D.
 
+       * u02E00-CJK-Radical-Supplement.el (<CJK RADICAL EYE>): Unify
+       BC-8B48.
+
 2017-04-15  MORIOKA Tomohiko  <tomo.git@chise.org>
 
+       * Ideograph-R072-Sun.el (G-UU+65E5): Unify G-AJ1-03284.
+       (g2-UU+65E5): Unify g2-AJ1-03284.
+       (U+65E6): Add `<-denotational@component' for IWDS1-0114.
+       (U+3AD0): Add `<-denotational@component' for IWDS1-0355; add
+       `sound@ja/on'.
+       (U+6637): Add `<-denotational' for IWDS1-0320.
+       (IWDS1-0388): New abstract component.
+       (U+6649): Add `<-denotational' for IWDS1-0388.
+       (U+664B): Ditto.
+
        * ruimoku6.el (g2-IU+21A5C): Use g2-GT-K00586 and g2-BC-8B48
        instead of U+9FB6 and BC-8B48 in `ideographic-structure'.
 

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index 04c8d24..af48fcd 100644 (file)
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -51,16 +51,18 @@
          ))
        ))
       )
-     ((=>>ucs@unicode    . #x65E5)     ; &G-J0-467C;
-      (=>>mj             . 013151)     ; &G-J0-467C;
-      (=>>jis-x0208      . #x467C)     ; &G-J0-467C; [38-92]
-      (=>>cns11643-1     . #x454A)     ; &G-J0-467C; [37-42]
-      (=>>jis-x0213-1    . #x467C)     ; &G-J0-467C; [38-92]
-      (=>>gt             . 17359)      ; &G-J0-467C;
-      (=>>gt-k           . 00473)      ; &G-J0-467C;
+     ((=>>ucs@unicode    . #x65E5)     ; &G-AJ1-03284;
+      (=>>mj             . 013151)     ; &G-AJ1-03284;
+      (=>>adobe-japan1-0  . 03284)     ; &G-AJ1-03284;
+      (=>>jis-x0208      . #x467C)     ; &G-AJ1-03284; [38-92]
+      (=>>cns11643-1     . #x454A)     ; &G-AJ1-03284; [37-42]
+      (=>>jis-x0213-1    . #x467C)     ; &G-AJ1-03284; [38-92]
+      (=>>gt             . 17359)      ; &G-AJ1-03284;
+      (=>>gt-k           . 00473)      ; &G-AJ1-03284;
       (->subsumptive
        ((==ucs@unicode     . #x65E5)   ; &g2-MJ013151;
        (==mj               . 013151)   ; &g2-MJ013151;
+       (==adobe-japan1-0   . 03284)    ; &g2-MJ013151;
        (==gb2312           . #x4855)   ; &g2-MJ013151; [40-53]
        (==ks-x1001         . #x6C6D)   ; &g2-MJ013151; [76-77]
        (==jis-x0208        . #x467C)   ; &g2-MJ013151; [38-92]
@@ -74,6 +76,8 @@
         ((===jis-x0208       . #x467C) ; &R-J0-467C; [38-92]
          (===jis-x0213-1     . #x467C) ; &R-J0-467C; [38-92]
          )
+        ((===adobe-japan1-0  . 03284)  ; &R-AJ1-03284;
+         )
         ((===mj              . 013151) ; &R-MJ013151;
          )
         ((===ucs@ks          . #x65E5) ; &R-K0-6C6D;
@@ -96,7 +100,11 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 72) ; ⽇
+  '((<-denotational@component
+     ((=>ucs@component   . #x4E14)     ; &IWDS1-114;
+      (=>iwds-1                  .  0114)      ; &IWDS1-114;
+      ))
+    (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 1)
     (total-strokes      . 5)
     (=ucs              . #x65E6)       ; 旦
@@ -111,7 +119,7 @@
     (=gt-k             . 00977)        ; &I-GT-K00977;
     (=gt-pj-1          . #x4336)       ; &I-GT-17363; [35-22]
     (=daikanwa         . 13734)        ; &I-M-13734;
-    (=shinjigen@rev    .  3265)        ; 旦
+    (=shinjigen                .  3265)        ; 旦
     ))
 (define-char
   '((ideographic-radical . 72) ; ⽇
@@ -296,7 +304,11 @@
     (=daikanwa         . 13740)        ; &I-M-13740;
     ))
 (define-char
-  '((ideographic-radical . 72) ; ⽇
+  '((<-denotational@component
+     ((=>ucs@component   . #x7680)     ; &IWDS1-355;
+      (=>iwds-1                  .  0355)      ; &IWDS1-355;
+      ))
+    (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 2)
     (total-strokes      . 6)
     (ideographic-structure
@@ -307,6 +319,7 @@
       )
      ((=ucs              . #x5315)     ; 匕
       ))
+    (sound@ja/on       "Eu")
     (=ucs              . #x3AD0)       ; 㫐
     (=cns11643-4       . #x2278)       ; &I-C4-2278; [02-88]
     (=big5-cdp         . #x8AB7)       ; &I-CDP-8AB7;
@@ -4616,7 +4629,11 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 72) ; ⽇
+  '((<-denotational
+     ((=>ucs@component   . #x6637)     ; &IWDS1-320;
+      (=>iwds-1                  .  0320)      ; &IWDS1-320;
+      ))
+    (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 5)
     (total-strokes      . 9)
     (ideographic-structure
@@ -5324,6 +5341,17 @@
   '((ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 6)
     (total-strokes      . 10)
+    (=>ucs@component   . #x6649)       ; &IWDS1-388;
+    (=>iwds-1          .  0388)        ; &IWDS1-388;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@component   . #x6649)     ; &IWDS1-388;
+      (=>iwds-1                  .  0388)      ; &IWDS1-388;
+      ))
+    (ideographic-radical . 72) ; ⽇
+    (ideographic-strokes . 6)
+    (total-strokes      . 10)
     (=ucs              . #x6649)       ; 晉
     ))
 (define-char
@@ -5396,7 +5424,11 @@
     (=ucs              . #x2F8CD)      ; 晉
     ))
 (define-char
-  '((ideographic-radical . 72) ; ⽇
+  '((<-denotational
+     ((=>ucs@component   . #x6649)     ; &IWDS1-388;
+      (=>iwds-1                  .  0388)      ; &IWDS1-388;
+      ))
+    (ideographic-radical . 72) ; ⽇
     (ideographic-strokes . 6)
     (total-strokes      . 10)
     (=ucs              . #x664B)       ; 晋
@@ -10122,7 +10154,7 @@
        )
        ((=ucs              . #x65E5)   ; 日
        )
-       ((=big5-cdp         . #x8B48)   ; &GT-36329;
+       ((==ucs@unicode     . #x2EAB)   ; &g2-UU+2EAB;
        )
        ((==ucs@unicode     . #x65B9)   ; &g2-AJ1-03661;
        (==adobe-japan1-0   . 03661)    ; &g2-AJ1-03661;

diff --git a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
index 8e50371..c233df1 100644 (file)
--- a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
+++ b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
@@ -684,33 +684,36 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=big5-cdp         . #x8B48)     ; &GT-36329;
-      ))
-    (name              . "CJK RADICAL EYE")
+  '((name              . "CJK RADICAL EYE")
     (general-category  symbol other) ; Informative Category
     (bidi-category     . "ON")
     (mirrored          . nil)
-    (=ucs              . #x2EAB)       ; ⺫
-    (<-formed@component/connect-below
-     ((=ucs              . #x76EE)     ; 目
-      ))
-    (<-identical@component/connect-below
-     ((=big5-cdp         . #x8B48)     ; &GT-36329;
-      ))
-    ))
-(define-char
-  '((=>ucs             . #x2EAB)       ; ⺫
     (ideographic-radical . 109)        ; ⽬
     (ideographic-strokes . 0)
     (total-strokes      . 5)
-    (=big5-cdp         . #x8B48)       ; &GT-36329;
+    (=ucs              . #x2EAB)       ; ⺫
+    (=big5-cdp         . #x8B48)       ; &I-CDP-8B48;
     (=gt               . 36329)        ; &I-GT-36329;
     (=gt-k             . 01549)        ; &I-GT-K01549;
     (=gt-pj-5          . #x7264)       ; &I-GT-36329; [82-68]
     (<-formed@component
      ((=ucs              . #x76EE)     ; 目
       ))
+    (->subsumptive
+     ((==big5-cdp        . #x8B48)     ; &g2-CDP-8B48;
+      )
+     ((==gt              . 36329)      ; &g2-GT-36329;
+      (==gt-k            . 01549)      ; &g2-GT-36329;
+      )
+     ((==ucs@unicode     . #x2EAB)     ; &g2-UU+2EAB;
+      (<-formed@component/connect-below
+       ((=ucs              . #x76EE)   ; 目
+       ))
+      (<-identical@component/connect-below
+       ((name              . "CJK RADICAL EYE")
+       (=ucs               . #x2EAB)   ; ⺫
+       ))
+      ))
     ))
 (define-char
   '((<-denotational