From ae98048697dfbd7135b54445848eab1370aeff7b Mon Sep 17 00:00:00 2001 From: tomo Date: Fri, 22 Apr 2011 03:46:28 +0000 Subject: [PATCH] Sync up with r21-4-22-chise-0_25-9. --- lisp/ChangeLog | 8 ++++++++ lisp/mule/mule-coding.el | 1 + lisp/mule/mule-conf.el | 10 ++++++++++ lisp/utf-2000/ChangeLog | 17 +++++++++++++++++ lisp/utf-2000/Ideograph-R009-Man.el | 11 +++++++++++ lisp/utf-2000/Ideograph-R019-Power.el | 1 + lisp/utf-2000/Ideograph-R030-Mouth.el | 2 ++ lisp/utf-2000/char-db-util.el | 4 +++- 8 files changed, 53 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c1e93ac..f7e25a8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2011-04-20 MORIOKA Tomohiko + + * mule/mule-coding.el (coded-charset-entity-reference-alist): Add + setting for `=>>cbeta'. + + * mule/mule-conf.el (=>>cbeta): New coded-charset for XEmacs + CHISE. + 2011-04-01 MORIOKA Tomohiko * mule/mule-coding.el (coded-charset-entity-reference-alist): Add diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index a2d9fee..fe8535f 100644 --- a/lisp/mule/mule-coding.el +++ b/lisp/mule/mule-coding.el @@ -358,6 +358,7 @@ (=>>hanyo-denshi/ib "G-HD-IB-" 4 X) (=>>hanyo-denshi/jt "G-HD-JT-" 4 X) (=>>hanyo-denshi/ks "G-HD-KS-" 4 X) + (=>>cbeta "G-CB" 5 d) ( =>jis-x0208@usual "o-J0-" 4 X) ( =>jis-x0213-2@usual "o-JX2-" 4 X) ( =>jis-x0208@1997 "J97-" 4 X) diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index e3ede24..41474e5 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -961,6 +961,16 @@ direction l2r)) (define-charset-alias 'ideograph-cbeta '=cbeta) + (make-charset '=>>cbeta "CBETA abstract glyphs" + '(long-name "CBETA glyphs" + chars 256 + dimension 2 + registry "cbeta-0" + graphic 2 + columns 2 + direction l2r + mother =cbeta)) + (make-charset '=zinbun-oracle "Oracle Bones Script" `(long-name "Oracle Bones Script in Zinbun, Kyoto Univ." diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index fae7fd0..553aeec 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,20 @@ +2011-04-21 MORIOKA Tomohiko + + * Ideograph-R030-Mouth.el (G-HD-JT-AEC5): Unify G-CB01170. + + * char-db-util.el (char-db-insert-ccs-feature): Add setting for + `=>>cbeta'. + +2011-04-20 MORIOKA Tomohiko + + * Ideograph-R009-Man.el (mother of M-00626): Unify G-M-00626; add + ideographic-structure. + +2011-04-20 MORIOKA Tomohiko + + * char-db-util.el (char-db-coded-charset-priority-list): Add + `=hanyo-denshi/ks'. + 2011-04-19 MORIOKA Tomohiko * chise-subr.el (define-char-before): New function. diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index 6dd3ab2..87781bd 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -11443,6 +11443,16 @@ (ideographic-radical . 9) ; ⼈ (ideographic-strokes . 6) (total-strokes . 8) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((name . "CJK RADICAL PERSON") + (=ucs . #x2E85) ; ⺅ + ) + ((=>>ucs@cns . #x5173) ; &G-CU+5173; + )) + (=>>daikanwa . 00626) ; &A-M-00626; (->subsumptive ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -11452,6 +11462,7 @@ (=ucs . #x2E85) ; ⺅ ) ((=daikanwa . 01459) ; 关󠄂 + (=hanyo-denshi/ks . 017040) ; 关󠄂 )) (=daikanwa . 00626) ; &M-00626; ) diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el index 88d1fb0..707a3de 100644 --- a/lisp/utf-2000/Ideograph-R019-Power.el +++ b/lisp/utf-2000/Ideograph-R019-Power.el @@ -4306,6 +4306,7 @@ (<-simplified ((=daikanwa . 02486) ; &M-02486; (=shinjigen . 0751) ; &M-02486; + (=hanyo-denshi/ks . 028870) ; &M-02486; )) (<-simplified*sources songyuan-yilai-suzipu daikanwa shinjigen@1ed) diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 8b9cace..8d991f0 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -8514,6 +8514,7 @@ ((=>>ucs@cns . #x5173) ; &G-CU+5173; )) (=>>daikanwa . 03554) ; &G-HD-JT-AEC5; + (=>>cbeta . 01170) ; &G-HD-JT-AEC5; (=>>hanyo-denshi/jt . #xAEC5) ; &G-HD-JT-AEC5; (->subsumptive ((ideographic-structure @@ -8523,6 +8524,7 @@ ((=ucs . #x53E3) ; 口 ) ((=daikanwa . 01459) ; 关󠄂 + (=hanyo-denshi/ks . 017040) ; 关󠄂 )) (=daikanwa . 03554) ; &M-03554; (=shinjigen@1ed . 1072) ; &M-03554; diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 6e36360..c4a36c3 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -155,6 +155,7 @@ =hanyo-denshi/ia =hanyo-denshi/ib =hanyo-denshi/hg + =hanyo-denshi/ks =daikanwa =daikanwa@rev2 =daikanwa@rev1 @@ -475,7 +476,8 @@ =gt =>>>gt =>>gt =>gt =gt-k =>>gt-k =>gt-k =>>adobe-japan1 - =cbeta =zinbun-oracle =>zinbun-oracle)) + =cbeta =>>cbeta + =zinbun-oracle =>zinbun-oracle)) (string-match "^=adobe-" (symbol-name name))) "(%-18s . %05d)\t; %c") ((memq name '(=hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo)) -- 1.7.10.4