X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=cwiki-common.el;h=6cb9d195f7285cc3ea3ef16a2bf31b8e5b0658dd;hp=f931c80935dc2693b67882c2302151c84041a3cc;hb=10b0dfa3e7b3272ef35e564bfeee23ea28154876;hpb=d1101dc76c81a101e8e80a66917be886dcc6125c diff --git a/cwiki-common.el b/cwiki-common.el index f931c80..6cb9d19 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -1,9 +1,13 @@ ;; -*- coding: utf-8-mcs-er -*- (require 'char-db-util) +;; (require 'concord-images) (setq file-name-coding-system 'utf-8-mcs-er) +(concord-assign-genre 'image-resource "/usr/local/var/photo/db") +(concord-assign-genre 'glyph-image "/usr/local/var/photo/db") + (concord-assign-genre 'creator@ruimoku "/usr/local/var/ruimoku/db") (concord-assign-genre 'person-name@ruimoku "/usr/local/var/ruimoku/db") @@ -33,6 +37,8 @@ (mount-char-attribute-table '*instance@morpheme-entry/zh-classical) +(concord-assign-genre 'hng-card "/usr/local/var/hng-card/db") + (mount-char-attribute-table '->HNG) (mount-char-attribute-table '<-HNG) @@ -87,8 +93,19 @@ =ruimoku-v6 =big5 =big5-cdp + =>cbeta + =mj + ==mj + ===mj =ucs-itaiji-001 - =ucs-itaiji-002)) + =ucs-itaiji-002 + =ucs-itaiji-003 + =ucs@unicode + ==ucs@unicode + ===ucs@unicode + ==>ucs@bucs + ===daikanwa/+p + ===gt)) (defun decode-uri-string (string &optional coding-system) (if (> (length string) 0) @@ -749,6 +766,7 @@ (let ((coded-charset-entity-reference-alist (list* '(=gt "GT-" 5 d) + '(=mj "MJ" 6 d) '(=hanyo-denshi/ja "HD-JA-" 4 X) '(=hanyo-denshi/jb "HD-JB-" 4 X) '(=hanyo-denshi/jc "HD-JC-" 4 X) @@ -771,6 +789,7 @@ '(=>>hanyo-denshi/ip "G-HD-IP-" 4 X) '(=>>hanyo-denshi/jt "G-HD-JT-" 4 X) '(=>>hanyo-denshi/ks "G-HD-KS-" 6 d) + '(==mj "g2-MJ" 6 d) '(==hanyo-denshi/ja "g2-HD-JA-" 4 X) '(==hanyo-denshi/jb "g2-HD-JB-" 4 X) '(==hanyo-denshi/jc "g2-HD-JC-" 4 X) @@ -804,7 +823,6 @@ '(=jef-china3 "JC3-" 4 X) '(=ucs@unicode "UU+" 4 X) '(=ucs@JP/hanazono "hanaJU+" 4 X) - '(=daikanwa "M-" 5 d) '(==cns11643-1 "R-C1-" 4 X) '(==cns11643-2 "R-C2-" 4 X) '(==cns11643-3 "R-C3-" 4 X) @@ -812,12 +830,26 @@ '(==cns11643-5 "R-C5-" 4 X) '(==cns11643-6 "R-C6-" 4 X) '(==cns11643-7 "R-C7-" 4 X) + '(=hanziku-1 "HZK01-" 4 X) + '(=hanziku-2 "HZK02-" 4 X) + '(=hanziku-3 "HZK03-" 4 X) + '(=hanziku-4 "HZK04-" 4 X) + '(=hanziku-5 "HZK05-" 4 X) + '(=hanziku-6 "HZK06-" 4 X) + '(=hanziku-7 "HZK07-" 4 X) + '(=hanziku-8 "HZK08-" 4 X) + '(=hanziku-9 "HZK09-" 4 X) + '(=hanziku-10 "HZK10-" 4 X) + '(=hanziku-11 "HZK11-" 4 X) + '(=hanziku-12 "HZK12-" 4 X) + '(=big5 "B-" 4 X) + '(=daikanwa "M-" 5 d) coded-charset-entity-reference-alist))) (encode-coding-region (point-min)(point-max) 'utf-8-mcs-er) (goto-char (point-min)) - (while (re-search-forward "&CB\\([0-9]+\\);" nil t) - (setq code (string-to-int (match-string 1))) + (while (re-search-forward "&\\(A-\\|G-\\|g2-\\)?CB\\([0-9]+\\);" nil t) + (setq code (string-to-int (match-string 2))) (replace-match (format "\"CB%05d\"" @@ -954,12 +986,18 @@ style=\"vertical-align:middle\">" (char-to-string (decode-char 'ascii (+ 96 subcode))))) (replace-match (format - "\"HNG%s-%04d%s\"" + "
\"HNG%s-%04d%s\"%s
" plane code subcode chise-wiki-hng-bitmap-glyphs-url plane code subcode - www-format-char-img-style) + (charset-description + (car (find (format "HNG%s-" plane) + coded-charset-entity-reference-alist + :test (lambda (key cell) + (string= key (nth 1 cell)))))) + ) t 'literal)) (goto-char (point-min)) @@ -986,7 +1024,7 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">" t 'literal)) (goto-char (point-min)) - (while (re-search-forward "&\\(o-\\|G-\\|g2-\\)?IU-\\([0-9A-F]+\\);" nil t) + (while (re-search-forward "&\\(o-\\|G-\\|g2-\\)?IU[+-]\\([0-9A-F]+\\);" nil t) (setq code (string-to-int (match-string 2) 16)) (replace-match (format "\"u%04x\"" 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\"" @@ -1011,7 +1049,32 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">" t 'literal)) (goto-char (point-min)) - (while (re-search-forward "&\\(G-\\|R-\\|g2-\\)?GT-\\([0-9]+\\);" nil t) + (while (re-search-forward "&A-IWDSU\\+\\([0-9A-F]+\\);" nil t) + (setq code (string-to-int (match-string 1) 16)) + (replace-match + (format "\"A-IWDSU+%04x\"" + code + code + www-format-char-img-style) + 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 (format "\"GT-%05d\"" t 'literal)) (goto-char (point-min)) - (while (re-search-forward "&\\(G-\\)?GT-K\\([0-9]+\\);" nil t) + (while (re-search-forward "&\\(A-\\|G-\\)?GT-K\\([0-9]+\\);" nil t) (setq code (string-to-int (match-string 2))) (replace-match (format "\"GT-K%05d\"" t 'literal)) (goto-char (point-min)) - (while (re-search-forward "&RUI6-\\([0-9A-F]+\\);" nil t) - (setq code (string-to-int (match-string 1) 16)) + (while (re-search-forward + "&\\(I-\\)?HZK\\(0[1-9]\\|1[0-2]\\)-\\([0-9A-F]+\\);" nil t) + (setq plane (match-string 2) + code (string-to-int (match-string 3) 16)) + (replace-match + (format "\"HZK%s-%04X\"" + plane + code + chise-wiki-glyph-cgi-url + plane + code + www-format-char-img-style) + t 'literal)) + + (goto-char (point-min)) + (while (re-search-forward "&\\(G-\\|g2-\\|R-\\)?RUI6-\\([0-9A-F]+\\);" nil t) + (setq code (string-to-int (match-string 2) 16)) (replace-match (format "\"RUI6-%04X\"" @@ -1173,20 +1252,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") - (=ucs "u" 4 x 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) (==adobe-japan1-0 "aj1-" 5 d nil) (==adobe-japan1-1 "aj1-" 5 d nil) (==adobe-japan1-2 "aj1-" 5 d nil) @@ -1194,50 +1276,64 @@ 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) + (==cbeta "cbeta-" 5 d 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") + (=ucs@ks "u" 4 x "-k") + (=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) + (=cbeta "cbeta-" 5 d nil) + (=big5-cdp-var-3 "cdp-" 4 x "-var-3") + (=big5-cdp-var-5 "cdp-" 4 x "-var-5") + (=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) - (=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) + (=+>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) @@ -1246,21 +1342,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") )) (defun char-GlyphWiki-id (char)