From c79a4c9e55aed133799bdc065ef1e65e66c58f5a Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Mon, 5 Oct 2020 10:16:23 +0900 Subject: [PATCH] (est-coded-charset-priority-list): Add `=ucs-var-010' and `=>ucs-itaiji-008'. (www-format-encode-string): Format "&g2-M-ddddd;" to display with GlyphWiki glyphs. (coded-charset-GlyphWiki-id-alist): Add settings for `=ucs-var-006', `=ucs-var-010', `=ucs-itaiji-004', `=ucs-itaiji-005', `=ucs-itaiji-006', `=ucs-itaiji-007', `=ucs-itaiji-008', `=>ucs-itaiji-002', `=>ucs-itaiji-003', `=>ucs-itaiji-004', `=>ucs-itaiji-005', `=>ucs-itaiji-007', `=>ucs-itaiji-008', `==gt', `==gt-k', `=+>big5-cdp', `=>big5-cdp@iwds-1', `=>cbeta', `=big5-cdp-var-001', `=big5-cdp-itaiji-003', `=>big5-cdp-itaiji-002', `=>big5-cdp-itaiji-003' and `=>gt-k'; omit settings for `==ucs@cns' and `=cns11643-*'; modify priority of `=hanyo-denshi/ks', `=hanyo-denshi/tk', `=gt', `=daikanwa', `=ruimoku-v6', `=>ruimoku-v6', `=ucs@iso' and `=ucs@unicode'; use `=big5-cdp-var-00{3|5}' instead of `=big5-cdp-var-{3|5}'. (char-GlyphWiki-id): Omit fallback code for `=cns11643-{1..7}'. --- cwiki-common.el | 84 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 29 deletions(-) diff --git a/cwiki-common.el b/cwiki-common.el index dbd983b..8e235d1 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -138,6 +138,7 @@ =ucs-var-002 =ucs-var-003 =ucs-var-004 + =ucs-var-010 =ucs@unicode ==ucs@unicode ===ucs@unicode @@ -154,6 +155,7 @@ =>ucs-itaiji-005 =>ucs-itaiji-006 =>ucs-itaiji-007 + =>ucs-itaiji-008 ===adobe-japan1 ===cns11643-1 ===cns11643-2 ===cns11643-3 ===cns11643-4 ===cns11643-5 ===cns11643-6 ===cns11643-7 @@ -1200,7 +1202,7 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">" (goto-char (point-min)) (while (re-search-forward - "&\\(A-\\)?M-\\([0-9]+\\);" + "&\\(A-\\|g2-\\)?M-\\([0-9]+\\);" nil t) (setq code (string-to-int (match-string 2))) (replace-match @@ -1423,12 +1425,25 @@ style=\"vertical-align:middle\">" (=ucs-var-002 "u" 4 x "-var-002") (=ucs-var-003 "u" 4 x "-var-003") (=ucs-var-004 "u" 4 x "-var-004") + (=ucs-var-006 "u" 4 x "-var-006") + (=ucs-var-010 "u" 4 x "-var-010") (=ucs-itaiji-001 "u" 4 x "-itaiji-001") (=ucs-itaiji-002 "u" 4 x "-itaiji-002") (=ucs-itaiji-003 "u" 4 x "-itaiji-003") + (=ucs-itaiji-004 "u" 4 x "-itaiji-004") + (=ucs-itaiji-005 "u" 4 x "-itaiji-005") + (=ucs-itaiji-006 "u" 4 x "-itaiji-006") + (=ucs-itaiji-007 "u" 4 x "-itaiji-007") + (=ucs-itaiji-008 "u" 4 x "-itaiji-008") (=ucs-itaiji-084 "u" 4 x "-itaiji-084") (=>ucs-itaiji-001 "u" 4 x "-itaiji-001") + (=>ucs-itaiji-002 "u" 4 x "-itaiji-002") + (=>ucs-itaiji-003 "u" 4 x "-itaiji-003") + (=>ucs-itaiji-004 "u" 4 x "-itaiji-004") + (=>ucs-itaiji-005 "u" 4 x "-itaiji-005") (=>ucs-itaiji-006 "u" 4 x "-itaiji-006") + (=>ucs-itaiji-007 "u" 4 x "-itaiji-007") + (=>ucs-itaiji-008 "u" 4 x "-itaiji-008") (==adobe-japan1-0 "aj1-" 5 d nil) (==adobe-japan1-1 "aj1-" 5 d nil) (==adobe-japan1-2 "aj1-" 5 d nil) @@ -1439,9 +1454,11 @@ style=\"vertical-align:middle\">" (==mj "jmj-" 6 d nil) (==ucs@jis "u" 4 x "-j") (==ucs@iso "u" 4 x nil) - (==ucs@cns "u" 4 x "-t") + ;; (==ucs@cns "u" 4 x "-t") (==ucs@unicode "u" 4 x "-us") (==ucs@JP/hanazono "u" 4 x "-jv") + (==gt "gt-" 5 d nil) + (==gt-k "gt-k" 5 d nil) (==daikanwa "dkw-" 5 d nil) (==ucs@ks "u" 4 x "-k") (==jis-x0208@1978 "j78-" 4 x nil) @@ -1470,33 +1487,46 @@ 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) + (=hanyo-denshi/ks "koseki-" 6 d nil) (=mj "jmj-" 6 d nil) (=decomposition@cid) (=decomposition@hanyo-denshi) - (=hanyo-denshi/ks "koseki-" 6 d nil) (=koseki "koseki-" 6 d nil) + (=hanyo-denshi/tk "toki-" 8 d nil) (=ucs@jis "u" 4 x "-j") - (=ucs@cns "u" 4 x "-t") + ;; (=ucs@cns "u" 4 x "-t") (=ucs@ks "u" 4 x "-k") (=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") (=big5-cdp "cdp-" 4 x nil) (=>big5-cdp "cdp-" 4 x nil) + (=+>big5-cdp "cdp-" 4 x nil) + (=>big5-cdp@iwds-1 "cdp-" 4 x nil) (=cbeta "cbeta-" 5 d nil) - (=big5-cdp-var-3 "cdp-" 4 x "-var-3") - (=big5-cdp-var-5 "cdp-" 4 x "-var-5") + (=>cbeta "cbeta-" 5 d nil) + (=big5-cdp-var-001 "cdp-" 4 x "-var-001") + (=big5-cdp-var-003 "cdp-" 4 x "-var-003") + (=big5-cdp-var-005 "cdp-" 4 x "-var-005") (=big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001") (=big5-cdp-itaiji-002 "cdp-" 4 x "-itaiji-002") + (=big5-cdp-itaiji-003 "cdp-" 4 x "-itaiji-003") (=>big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001") + (=>big5-cdp-itaiji-002 "cdp-" 4 x "-itaiji-002") + (=>big5-cdp-itaiji-003 "cdp-" 4 x "-itaiji-003") (=jef-china3 "jc3-" 4 x nil) (=jis-x0212 "jsp-" 4 x nil) (=jis-x0213-1@2000 "jx1-2000-" 4 x nil) (=jis-x0213-1@2004 "jx1-2004-" 4 x nil) (=jis-x0213-2 "jx2-" 4 x nil) + (=gt "gt-" 5 d nil) (=gt-k "gt-k" 5 d nil) + (=>gt-k "gt-k" 5 d nil) + (=daikanwa "dkw-" 5 d nil) + (=ruimoku-v6 "rui6-" 4 x nil) + (=>ruimoku-v6 "rui6-" 4 x nil) + (=ucs@iso "u" 4 x "-u") + (=ucs@unicode "u" 4 x "-us") (=jis-x0208@1978/1pr "j78-" 4 x nil) (=jis-x0208@1978/-4pr "j78-" 4 x nil) (=jis-x0208@1978 "j78-" 4 x nil) @@ -1506,18 +1536,14 @@ style=\"vertical-align:middle\">" (=+>jis-x0208@1983 "j83-" 4 x nil) (=ucs "u" 4 x nil) (=big5 "b-" 4 x nil) - (=daikanwa "dkw-" 5 d nil) - (=gt "gt-" 5 d nil) - (=ruimoku-v6 "rui6-" 4 x nil) - (=>ruimoku-v6 "rui6-" 4 x nil) (=ks-x1001 "k0-" 4 x nil) - (=cns11643-1 "c1-" 4 x nil) - (=cns11643-2 "c2-" 4 x nil) - (=cns11643-3 "c3-" 4 x nil) - (=cns11643-4 "c4-" 4 x nil) - (=cns11643-5 "c5-" 4 x nil) - (=cns11643-6 "c6-" 4 x nil) - (=cns11643-7 "c7-" 4 x nil) + ;; (=cns11643-1 "c1-" 4 x nil) + ;; (=cns11643-2 "c2-" 4 x nil) + ;; (=cns11643-3 "c3-" 4 x nil) + ;; (=cns11643-4 "c4-" 4 x nil) + ;; (=cns11643-5 "c5-" 4 x nil) + ;; (=cns11643-6 "c6-" 4 x nil) + ;; (=cns11643-7 "c7-" 4 x nil) (=jis-x0208 "j90-" 4 x nil) (=jis-x0208@1990 "j90-" 4 x nil) (=jis-x0208@1983 "j83-" 4 x nil) @@ -1547,16 +1573,16 @@ style=\"vertical-align:middle\">" (setq code (encode-char char '=ucs@gb))) (format "u%04x-g" code) ) - ((and (or (encode-char char '=cns11643-1) - (encode-char char '=cns11643-2) - (encode-char char '=cns11643-3) - (encode-char char '=cns11643-4) - (encode-char char '=cns11643-5) - (encode-char char '=cns11643-6) - (encode-char char '=cns11643-7)) - (setq code (encode-char char '=ucs@cns))) - (format "u%04x-t" code) - ) + ;; ((and (or (encode-char char '=cns11643-1) + ;; (encode-char char '=cns11643-2) + ;; (encode-char char '=cns11643-3) + ;; (encode-char char '=cns11643-4) + ;; (encode-char char '=cns11643-5) + ;; (encode-char char '=cns11643-6) + ;; (encode-char char '=cns11643-7)) + ;; (setq code (encode-char char '=ucs@cns))) + ;; (format "u%04x-t" code) + ;; ) ((and (encode-char char '=ks-x1001) (setq code (encode-char char '=ucs@ks))) (format "u%04x-k" code) -- 1.7.10.4