From 647fa6d103cc8e42e630c1a5bbb770599dd1b24f Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Mon, 15 Jun 2020 15:06:13 +0900 Subject: [PATCH] (coded-charset-GlyphWiki-id-alist): - Add settings for `===mj', `==mj' `==ucs@JP/hanazono', `=mj' and `=ucs@JP/hanazono'. - Use uXXXX-j instead of uXXXX for `===ucs@jis', `==ucs@jis' and `=ucs@jis'. - Use uXXXX-jv instead of uXXXX for `=ucs@JP'. (char-GlyphWiki-id): Use uXXXX-j instead of uXXXX for character objects which have `=jis-x0208@1990', `=jis-x0212', `=jis-x0213-1' and `=jis-x0213-2'. --- cwiki-common.el | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cwiki-common.el b/cwiki-common.el index 2b67a5f..336f9d4 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -1385,7 +1385,8 @@ style=\"vertical-align:middle\">" (===adobe-japan1-4 "aj1-" 5 d nil) (===adobe-japan1-5 "aj1-" 5 d nil) (===adobe-japan1-6 "aj1-" 5 d nil) - (===ucs@jis "u" 4 x nil) + (===mj "jmj-" 6 d nil) + (===ucs@jis "u" 4 x "-j") (===daikanwa "dkw-" 5 d nil) (===ucs@ks "u" 4 x "-k") (==ucs-itaiji-005 "u" 4 x "-itaiji-005") @@ -1406,10 +1407,12 @@ style=\"vertical-align:middle\">" (==adobe-japan1-4 "aj1-" 5 d nil) (==adobe-japan1-5 "aj1-" 5 d nil) (==adobe-japan1-6 "aj1-" 5 d nil) - (==ucs@jis "u" 4 x nil) + (==mj "jmj-" 6 d nil) + (==ucs@jis "u" 4 x "-j") (==ucs@iso "u" 4 x nil) (==ucs@cns "u" 4 x "-t") (==ucs@unicode "u" 4 x "-us") + (==ucs@JP/hanazono "u" 4 x "-jv") (==daikanwa "dkw-" 5 d nil) (==ucs@ks "u" 4 x "-k") (==jis-x0208@1978 "j78-" 4 x nil) @@ -1438,14 +1441,16 @@ style=\"vertical-align:middle\">" (=adobe-japan1-4 "aj1-" 5 d nil) (=adobe-japan1-5 "aj1-" 5 d nil) (=adobe-japan1-6 "aj1-" 5 d nil) + (=mj "jmj-" 6 d nil) (=decomposition@cid) (=decomposition@hanyo-denshi) (=hanyo-denshi/ks "koseki-" 6 d nil) (=koseki "koseki-" 6 d nil) - (=ucs@jis "u" 4 x nil) + (=ucs@jis "u" 4 x "-j") (=ucs@cns "u" 4 x "-t") (=ucs@ks "u" 4 x "-k") - (=ucs@JP "u" 4 x nil) + (=ucs@JP "u" 4 x "-jv") + (=ucs@JP/hanazono "u" 4 x "-jv") (=ucs@gb "u" 4 x "-g") (=ucs@iso "u" 4 x "-u") (=ucs@unicode "u" 4 x "-us") @@ -1506,7 +1511,7 @@ style=\"vertical-align:middle\">" (encode-char char '=jis-x0213-1) (encode-char char '=jis-x0213-2)) (setq code (encode-char char '=ucs@jis))) - (format "u%04x" code) + (format "u%04x-j" code) ) ((and (or (encode-char char '=gb2312) (encode-char char '=gb12345)) -- 1.7.10.4