X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=cwiki-common.el;h=cf49f79ee55c2a45971b453bbf50aec4a2fa73bd;hp=b21faea99bba1b85e725cca8583c7b662c9f3e17;hb=8d1f45bec95682f85a982025a9cb384c4f07d307;hpb=dc687aeeb4bd60393e64f13baf20078cf1a20b04 diff --git a/cwiki-common.el b/cwiki-common.el index b21faea..cf49f79 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -1018,9 +1018,9 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">" t 'literal)) (goto-char (point-min)) - (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?U-i\\([0-9]+\\)\\+\\([0-9A-F]+\\);" nil t) - (setq plane (string-to-int (match-string 2)) - code (string-to-int (match-string 3) 16)) + (while (re-search-forward "&U-i\\([0-9]+\\)\\+\\([0-9A-F]+\\);" nil t) + (setq plane (string-to-int (match-string 1)) + code (string-to-int (match-string 2) 16)) (replace-match (format "\"u%04x-itaiji-%03d\"" @@ -1032,6 +1032,20 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">" t 'literal)) (goto-char (point-min)) + (while (re-search-forward "&U-v\\([0-9]+\\)\\+\\([0-9A-F]+\\);" nil t) + (setq plane (string-to-int (match-string 1)) + code (string-to-int (match-string 2) 16)) + (replace-match + (format "\"u%04x-itaiji-%03d\"" + code + plane + code + plane + www-format-char-img-style) + t 'literal)) + + (goto-char (point-min)) (while (re-search-forward "&\\(A-\\|G-\\|R-\\|g2-\\)?GT-\\([0-9]+\\);" nil t) (setq code (string-to-int (match-string 2))) (replace-match @@ -1210,20 +1224,23 @@ style=\"vertical-align:middle\">" ;;; (defvar coded-charset-GlyphWiki-id-alist - '((=ucs-var-001 "u" 4 x "-var-001") + '((===adobe-japan1-0 "aj1-" 5 d nil) + (===adobe-japan1-1 "aj1-" 5 d nil) + (===adobe-japan1-2 "aj1-" 5 d nil) + (===adobe-japan1-3 "aj1-" 5 d nil) + (===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) + (===daikanwa "dkw-" 5 d nil) + (===ucs@ks "u" 4 x "-k") + (=ucs-var-001 "u" 4 x "-var-001") (=ucs-var-002 "u" 4 x "-var-002") (=ucs-var-003 "u" 4 x "-var-003") (=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-084 "u" 4 x "-itaiji-084") - (=adobe-japan1-0 "aj1-" 5 d nil) - (=adobe-japan1-1 "aj1-" 5 d nil) - (=adobe-japan1-2 "aj1-" 5 d nil) - (=adobe-japan1-3 "aj1-" 5 d nil) - (=adobe-japan1-4 "aj1-" 5 d nil) - (=adobe-japan1-5 "aj1-" 5 d nil) - (=adobe-japan1-6 "aj1-" 5 d nil) (==adobe-japan1-0 "aj1-" 5 d nil) (==adobe-japan1-1 "aj1-" 5 d nil) (==adobe-japan1-2 "aj1-" 5 d nil) @@ -1231,51 +1248,63 @@ 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) - (===adobe-japan1-0 "aj1-" 5 d nil) - (===adobe-japan1-1 "aj1-" 5 d nil) - (===adobe-japan1-2 "aj1-" 5 d nil) - (===adobe-japan1-3 "aj1-" 5 d nil) - (===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) + (==ucs@iso "u" 4 x nil) + (==ucs@cns "u" 4 x "-t") + (==ucs@unicode "u" 4 x "-us") + (==daikanwa "dkw-" 5 d nil) + (==ucs@ks "u" 4 x "-k") + (==jis-x0208@1978 "j78-" 4 x nil) + (==jis-x0208 "j90-" 4 x nil) + (==jis-x0208@1990 "j90-" 4 x nil) + (==jis-x0208@1983 "j83-" 4 x nil) + (=>>hanyo-denshi/ks "koseki-" 6 d nil) + (=>>jis-x0208@1978 "j78-" 4 x nil) + (=>>big5-cdp "cdp-" 4 x nil) + (=>>jis-x0208 "j90-" 4 x nil) + (=>>jis-x0208@1990 "j90-" 4 x nil) + (=>>jis-x0208@1983 "j83-" 4 x nil) + (=>>daikanwa "dkw-" 5 d nil) + (=adobe-japan1-0 "aj1-" 5 d nil) + (=adobe-japan1-1 "aj1-" 5 d nil) + (=adobe-japan1-2 "aj1-" 5 d nil) + (=adobe-japan1-3 "aj1-" 5 d nil) + (=adobe-japan1-4 "aj1-" 5 d nil) + (=adobe-japan1-5 "aj1-" 5 d nil) + (=adobe-japan1-6 "aj1-" 5 d nil) (=decomposition@cid) (=decomposition@hanyo-denshi) (=hanyo-denshi/ks "koseki-" 6 d nil) - (=>>hanyo-denshi/ks "koseki-" 6 d nil) (=koseki "koseki-" 6 d nil) (=ucs@jis "u" 4 x nil) - (==ucs@jis "u" 4 x nil) - (==ucs@iso "u" 4 x nil) - (===ucs@jis "u" 4 x nil) (=ucs@cns "u" 4 x "-t") - (==ucs@cns "u" 4 x "-t") (=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) - (=daikanwa "dkw-" 5 d nil) - (==daikanwa "dkw-" 5 d nil) - (===daikanwa "dkw-" 5 d nil) - (=gt-k "gt-k" 5 d nil) (=jef-china3 "jc3-" 4 x nil) - (=big5 "b-" 4 x nil) (=ucs@ks "u" 4 x "-k") - (==ucs@ks "u" 4 x "-k") - (===ucs@ks "u" 4 x "-k") - (=ks-x1001 "k0-" 4 x nil) (=jis-x0208@1978/1pr "j78-" 4 x nil) (=jis-x0208@1978/-4pr "j78-" 4 x nil) (=jis-x0208@1978 "j78-" 4 x nil) - (=>>>jis-x0208@1978 "j78-" 4 x nil) - (=>>jis-x0208@1978 "j78-" 4 x nil) - (=+>jis-x0208@1978 "j78-" 4 x nil) (=ucs@JP "u" 4 x nil) (=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) + (=cbeta "cb" 5 d nil) + (=big5-cdp-var-3 "cdp-" 4 x "-var-3") + (=big5-cdp-var-5 "cdp-" 4 x "-var-5") + (=gt-k "gt-k" 5 d nil) + (=+>jis-x0208@1978 "j78-" 4 x nil) + (=+>jis-x0208 "j90-" 4 x nil) + (=+>jis-x0208@1990 "j90-" 4 x nil) + (=+>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) + (=ks-x1001 "k0-" 4 x nil) (=cns11643-1 "c1-" 4 x nil) (=cns11643-2 "c2-" 4 x nil) (=cns11643-3 "c3-" 4 x nil) @@ -1284,22 +1313,8 @@ style=\"vertical-align:middle\">" (=cns11643-6 "c6-" 4 x nil) (=cns11643-7 "c7-" 4 x nil) (=jis-x0208 "j90-" 4 x nil) - (=>>>jis-x0208 "j90-" 4 x nil) - (=>>jis-x0208 "j90-" 4 x nil) - (=+>jis-x0208 "j90-" 4 x nil) (=jis-x0208@1990 "j90-" 4 x nil) - (=>>>jis-x0208@1990 "j90-" 4 x nil) - (=>>jis-x0208@1990 "j90-" 4 x nil) - (=+>jis-x0208@1990 "j90-" 4 x nil) (=jis-x0208@1983 "j83-" 4 x nil) - (=>>>jis-x0208@1983 "j83-" 4 x nil) - (=>>jis-x0208@1983 "j83-" 4 x nil) - (=+>jis-x0208@1983 "j83-" 4 x nil) - (=cbeta "cb" 5 d nil) - (=>>daikanwa "dkw-" 5 d nil) - (=big5-cdp-var-3 "cdp-" 4 x "-var-3") - (=big5-cdp-var-5 "cdp-" 4 x "-var-5") - (=ucs "u" 4 x nil) )) (defun char-GlyphWiki-id (char)