Merge branch 'master' into single-inheritance.

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index d131407..8b4989d 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,22 @@
+2017-04-29  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+       * Ideograph-R071-Not.el (U+65E0): Separate UU+65E0.
+       (UU+65E0): Add `=>ucs@iwds-1'.
+       (U+65E0-itaiji-001): New character; use `<-denotational' for
+       U+65E0.
+       (BUCS+65E3): New abstract node.
+       (U+65E2): Add `<-denotational' for BUCS+65E3.
+       (U+65E3): Ditto.
+
+       * Ideograph-R070-Square.el (U-000230EA): Apply new conventions for
+       glyph granularity.
+
+       * Ideograph-R068-Dipper.el (U+65A2): Apply new conventions for
+       glyph granularity.
+
+       * Ideograph-R062-Halberd.el (U-000229C7): Apply new conventions
+       for glyph granularity.
+
 2017-04-28  MORIOKA Tomohiko  <tomo.git@chise.org>
 
        * Ideograph-R013-Down-Box.el (U+34BC-var-001): New character; use

diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index abaf02a..5e4b981 100644 (file)
--- a/lisp/utf-2000/Ideograph-R062-Halberd.el
+++ b/lisp/utf-2000/Ideograph-R062-Halberd.el
@@ -1511,6 +1511,14 @@
   '((ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 7)
     (total-strokes      . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x590C)     ; 夌
+      )
+     ((=ucs              . #x6208)     ; 戈
+      ))
     (=ucs              . #x229C7)      ; 𢧇
     ))
 (define-char
@@ -1520,7 +1528,17 @@
     (ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 7)
     (total-strokes      . 11)
-    (=daikanwa         . 11601)        ; &M-11601;
+    (=ucs@iso          . #x229C7)      ; &C5-3260;
+    (=cns11643-5       . #x3260)       ; &C5-3260; [18-64]
+    (=daikanwa         . 11601)        ; &I-M-11601;
+    (->subsumptive
+     ((==daikanwa        . 11601)      ; &g2-M-11601;
+      )
+     ((==ucs@iso         . #x229C7)    ; &g2-IU-000229C7;
+      )
+     ((==ucs@cns         . #x229C7)    ; &g2-CU+229C7;
+      (==cns11643-5      . #x3260)     ; &g2-CU+229C7; [18-64]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1533,19 +1551,6 @@
     (=gt-pj-3          . #x5A2C)       ; &GT-14620; [58-12]
     ))
 (define-char
-  '((<-denotational
-     ((=ucs              . #x229C7)    ; 𢧇
-      ))
-    (ideographic-radical . 62) ; ⼽
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (->subsumptive
-     ((=ucs@iso                  . #x229C7)    ; &U-000229C7;
-      )
-     ((=cns11643-5       . #x3260)     ; &C5-3260; [18-64]
-      ))
-    ))
-(define-char
   '((ideographic-radical . 62) ; ⼽
     (ideographic-strokes . 7)
     (total-strokes      . 11)

diff --git a/lisp/utf-2000/Ideograph-R068-Dipper.el b/lisp/utf-2000/Ideograph-R068-Dipper.el
index 50d51a5..344f45d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R068-Dipper.el
+++ b/lisp/utf-2000/Ideograph-R068-Dipper.el
@@ -1081,6 +1081,14 @@
     ))
 (define-char
   '((ideographic-radical . 68) ; ⽃
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=>jis-x0208@1997          . #x322B)     ; &J97-322B; [18-11]
+      )
+     ((=ucs              . #x6597)     ; 斗
+      ))
     (=ucs              . #x65A2)       ; 斢
     ))
 (define-char
@@ -1090,13 +1098,47 @@
     (ideographic-radical . 68) ; ⽃
     (ideographic-strokes . 12)
     (total-strokes      . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x9EC3)     ; 黃
+      )
+     ((=ucs              . #x6597)     ; 斗
+      ))
+    (=+>ucs@cns                . #x65A2)       ; &o-CU+65A2;
+    (=big5             . #xE9B2)       ; &o-CU+65A2;
     (->subsumptive
-     ((=ucs@big5         . #x65A2)     ; &M-13528;
-      (=big5             . #xE9B2)     ; &M-13528;
-      (=daikanwa         . 13528)      ; &I-M-13528;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
+       )
+       ((=ucs@unicode      . #x9EC3)   ; &GT-65324;
+       (=ks-x1001          . #x7C5C)   ; &GT-65324; [92-60]
+       (=jis-x0213-1       . #x7E71)   ; &I-JX1-7E71; [94-81]
+       (=daikanwa          . 47926)    ; &I-M-47926;
+       )
+       ((=ucs              . #x6597)   ; 斗
+       ))
+      (=daikanwa         . 13528)      ; &M-13528;
+      (->subsumptive
+       ((==daikanwa        . 13528)    ; &g2-M-13528;
+       ))
       )
-     ((=ucs@cns                  . #x65A2)     ; &C2-573D;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
+       )
+       ((=cns11643-1       . #x6327)   ; &C1-6327; [67-07]
+       )
+       ((=ucs              . #x6597)   ; 斗
+       ))
+      (=ucs@cns                  . #x65A2)     ; &C2-573D;
       (=cns11643-2       . #x573D)     ; &C2-573D; [55-29]
+      (->subsumptive
+       ((==ucs@cns         . #x65A2)   ; &g2-CU+65A2;
+       (==cns11643-2       . #x573D)   ; &g2-CU+65A2; [55-29]
+       ))
       ))
     ))
 (define-char
@@ -1106,8 +1148,34 @@
     (ideographic-radical . 68) ; ⽃
     (ideographic-strokes . 11)
     (total-strokes      . 15)
-    (=ucs@unicode      . #x65A2)       ; &EGB-2D4E;
-    (=iso-ir165                . #x2D4E)       ; &EGB-2D4E; [13-46]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x9EC4)     ; 黄
+      )
+     ((=ucs              . #x6597)     ; 斗
+      ))
+    (=+>ucs@unicode    . #x65A2)       ; &o-UU+65A2;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
+       )
+       ((=ucs@unicode      . #x9EC4)   ; &AJ1-01323;
+       (=adobe-japan1-0    . 01323)    ; &AJ1-01323;
+       )
+       ((=ucs              . #x6597)   ; 斗
+       ))
+      (=ucs@unicode      . #x65A2)     ; &EGB-2D4E;
+      (=ucs@JP/hanazono          . nil)
+      (=iso-ir165        . #x2D4E)     ; &EGB-2D4E; [13-46]
+      (->subsumptive
+       ((==ucs@unicode     . #x65A2)   ; &g2-UU+65A2;
+       (==ucs@JP/hanazono  . nil)
+       (==iso-ir165        . #x2D4E)   ; &g2-UU+65A2; [13-46]
+       ))
+      ))
     ))
 (define-char
   '((ideographic-radical . 68) ; ⽃

diff --git a/lisp/utf-2000/Ideograph-R070-Square.el b/lisp/utf-2000/Ideograph-R070-Square.el
index 8aabe37..63b9410 100644 (file)
--- a/lisp/utf-2000/Ideograph-R070-Square.el
+++ b/lisp/utf-2000/Ideograph-R070-Square.el
@@ -994,10 +994,30 @@
     (ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (->subsumptive
-     ((=daikanwa         . 13649)      ; &M-13649;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs              . #x2FF5)     ; ⿵
+      )
+     ((=big5-cdp         . #x86FC)     ; &CDP-86FC;
       )
-     ((=ucs@iso                  . #x230EA)    ; &U-000230EA;
+     ((=ucs              . #x65B9)     ; 方
+      ))
+    (=ucs@iso          . #x230EA)      ; &M-13649;
+    (=daikanwa         . 13649)        ; &M-13649;
+    (<-same
+     ((=ucs              . #x6EC2)     ; 滂
+      (=daikanwa         . 18003)      ; &I-M-18003;
+      ))
+    (<-same*sources
+     pianhai-leibian daikanwa)
+    (->subsumptive
+     ((==ucs@iso         . #x230EA)    ; &g2-M-13649;
+      (==daikanwa        . 13649)      ; &g2-M-13649;
+      (->subsumptive
+       ((===daikanwa       . 13649)    ; &R-M-13649;
+       )
+       ((===ucs@iso        . #x230EA)  ; &R-U-000230EA;
+       ))
       ))
     ))
 (define-char
@@ -1007,7 +1027,20 @@
     (ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 6)
     (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=big5-cdp         . #x86FC)     ; &CDP-86FC;
+      )
+     ((=ucs              . #x65B9)     ; 方
+      ))
+    (=ucs@cns          . #x230EA)      ; &C6-3835;
     (=cns11643-6       . #x3835)       ; &C6-3835; [24-21]
+    (->subsumptive
+     ((==ucs@cns         . #x230EA)    ; &g2-CU+230EA;
+      (==cns11643-6      . #x3835)     ; &g2-CU+230EA; [24-21]
+      ))
     ))
 (define-char
   '((ideographic-radical . 70) ; ⽅

diff --git a/lisp/utf-2000/Ideograph-R071-Not.el b/lisp/utf-2000/Ideograph-R071-Not.el
index 767d48c..35e93cf 100644 (file)
--- a/lisp/utf-2000/Ideograph-R071-Not.el
+++ b/lisp/utf-2000/Ideograph-R071-Not.el
@@ -2,9 +2,18 @@
 (define-char
   '((ideographic-radical . 71) ; ⽆
     (ideographic-strokes . 0)
-    (total-strokes      . 4)
     (=ucs              . #x65E0)       ; 无
-    (=adobe-japan1-0   . 05088)        ; &I-AJ1-05088;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x65E0)     ; 无
+      ))
+    (ideographic-radical . 71) ; ⽆
+    (ideographic-strokes . 0)
+    (total-strokes      . 4)
+    (=>ucs@iwds-1      . #x65E0)       ; &AJ1-05088;
+    (=ucs@unicode      . #x65E0)       ; &AJ1-05088;
+    (=adobe-japan1-0   . 05088)        ; &AJ1-05088;
     (=jis-x0208                . #x5A5B)       ; &I-J90-5A5B; [58-59]
     (=gb2312           . #x4E5E)       ; &I-G0-4E5E; [46-62]
     (=ks-x1001         . #x5969)       ; &I-K0-5969; [57-73]
@@ -15,7 +24,7 @@
     (=gt-k             . 00532)        ; &I-GT-K00532;
     (=gt-pj-1          . #x5A5B)       ; &I-GT-17330; [58-59]
     (=daikanwa         . 13716)        ; &I-M-13716;
-    (=shinjigen                .  3259)        ; 无
+    (=shinjigen                .  3259)        ; &AJ1-05088;
     (=cbeta            . 07099)        ; &I-CB07099;
     (=jef-china3       . #x82A3)       ; &I-JC3-82A3;
     (->subsumptive
@@ -75,6 +84,24 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs              . #x65E0)     ; 无
+      ))
+    (ideographic-radical . 71) ; ⽆
+    (ideographic-strokes . 0)
+    (total-strokes      . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs@unicode      . #x5DE5)     ; &AJ1-01979;
+      (=adobe-japan1-0   . 01979)      ; &AJ1-01979;
+      )
+     ((=ucs              . #x513F)     ; 儿
+      ))
+    (=ucs-itaiji-001   . #x65E0)       ; &U-i001+65E0;
+    ))
+(define-char
   '((ideographic-radical . 71) ; ⽆
     (ideographic-strokes . 1)
     (=ucs              . #x65E1)       ; 旡
@@ -189,6 +216,13 @@
     ))
 (define-char
   '((ideographic-radical . 71) ; ⽆
+    (==>ucs@bucs       . #x65E3)       ; &BUCS+65E3;
+    ))
+(define-char
+  '((<-denotational
+     ((==>ucs@bucs       . #x65E3)     ; &BUCS+65E3;
+      ))
+    (ideographic-radical . 71) ; ⽆
     (=ucs              . #x65E2)       ; 既
     ))
 (define-char
@@ -316,7 +350,10 @@
     (=daikanwa         . 13723)        ; &I-M-13723;
     ))
 (define-char
-  '((ideographic-radical . 71) ; ⽆
+  '((<-denotational
+     ((==>ucs@bucs       . #x65E3)     ; &BUCS+65E3;
+      ))
+    (ideographic-radical . 71) ; ⽆
     (ideographic-strokes . 7)
     (=ucs              . #x65E3)       ; 旣
     ))