Merge branch 'master' into single-inheritance

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7e51d9..eeac99c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2017-11-28  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+       * mule/mule-charset.el (default-coded-charset-priority-list): Add
+       `==hanyo-denshi/tk/mf-01'.
+
+       * mule/mule-conf.el (==hanyo-denshi/tk/mf-01): New coded-charset
+       for XEmacs CHISE.
+
 2017-11-15  MORIOKA Tomohiko  <tomo.git@chise.org>
 
        * mule/mule-conf.el: Define `=ucs-itaiji-007' before

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index e4a906e..c2c38a0 100644 (file)
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -465,6 +465,7 @@ DESCRIPTION (string) is the description string of the charset."
          ==ruimoku-v6
          ==gt-pj-k1
          ==gt-pj-k2
+         ==hanyo-denshi/tk/mf-01
          ==daikanwa
          ==cbeta
          ==jef-china3

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 445633c..7d99e2f 100644 (file)
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -2192,6 +2192,17 @@
               graphic 2
               direction l2r
               registry "HanyoDenshi\\.TKMF-1$"))
+  (make-charset
+   '==hanyo-denshi/tk/mf-01
+   "font encoding for TK (TouKi) characters"
+   `(long-name "Han'you-Denshi/TK font encoding"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =hanyo-denshi/tk/mf-01
+              registry "HanyoDenshi\\.TKMF-1$"))
 
   (make-charset
    '===mj

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index a27c438..8bb291c 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,5 +1,8 @@
 2017-11-27  MORIOKA Tomohiko  <tomo.git@chise.org>
 
+       * Ideograph-R109-Eye.el (<CJK RADICAL EYE>): Add
+       `<-denotational@component' for U+7F52 and A-compU+76BF.
+
        * Ideograph-R008-Lid.el (G-BC-8BAA): New glyph node to subsume
        g2-BC-8BAA and GT-K01444; use `<-subsumptive' for BC-8BAA.
 

diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el
index 3754b6a..5e7626f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R109-Eye.el
+++ b/lisp/utf-2000/Ideograph-R109-Eye.el
@@ -53,7 +53,12 @@
       ))
     ))
 (define-char
-  '((name              . "CJK RADICAL EYE")
+  '((<-denotational@component
+     ((=ucs              . #x7F52)     ; 罒
+      )
+     ((=>ucs@component   . #x76BF)     ; &A-compU+76BF;
+      ))
+    (name              . "CJK RADICAL EYE")
     (general-category  symbol other) ; Informative Category
     (bidi-category     . "ON")
     (mirrored          . nil)