X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=cwiki-common.el;h=9817062192355028b9dd81e334078990e16bde89;hp=1f7e08240427d15e4b1f62bbcf447b82416e5ade;hb=df2fa617d25de8d6ccae25b062f2b973e2d95113;hpb=d1e966abdea0032bd1a78b264e97b1402c03c022 diff --git a/cwiki-common.el b/cwiki-common.el index 1f7e082..9817062 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -36,11 +36,25 @@ (mount-char-attribute-table '*instance@morpheme-entry/zh-classical) +(concord-assign-genre 'ud@zh-classical "/usr/local/var/kanbun/db") + (concord-assign-genre 'hng-card "/usr/local/var/hng-card/db") (mount-char-attribute-table '->HNG) (mount-char-attribute-table '<-HNG) +(mount-char-attribute-table '->HNG@CN/manuscript) +(mount-char-attribute-table '<-HNG@CN/manuscript) +(mount-char-attribute-table '->HNG@CN/printed) +(mount-char-attribute-table '<-HNG@CN/printed) +(mount-char-attribute-table '->HNG@JP/manuscript) +(mount-char-attribute-table '<-HNG@JP/manuscript) +(mount-char-attribute-table '->HNG@JP/printed) +(mount-char-attribute-table '<-HNG@JP/printed) +(mount-char-attribute-table '->HNG@KR) +(mount-char-attribute-table '<-HNG@KR) +(mount-char-attribute-table '->HNG@MISC) +(mount-char-attribute-table '<-HNG@MISC) (defvar est-hide-cgi-mode nil) @@ -85,6 +99,7 @@ =>>gt =>ucs@iso =>ucs@unicode =>ucs@jis =>ucs@cns =>ucs@ks + =+>ucs@iso =+>ucs@unicode =>>ucs@iso =>>ucs@unicode =>>ucs@jis =>>ucs@cns =>>ucs@ks =>>>ucs@iso =>>>ucs@unicode @@ -100,12 +115,38 @@ =ucs-itaiji-001 =ucs-itaiji-002 =ucs-itaiji-003 + =ucs-itaiji-004 + =ucs-itaiji-005 + =ucs-itaiji-006 + =ucs-itaiji-007 + =ucs-itaiji-008 + =ucs-itaiji-009 + =ucs-itaiji-010 + =ucs-itaiji-011 + =ucs-itaiji-084 + =ucs-var-001 + =ucs-var-002 + =ucs-var-003 + =ucs-var-004 =ucs@unicode ==ucs@unicode ===ucs@unicode ==>ucs@bucs ===daikanwa/+p - ===gt)) + ===gt + =>ucs@iwds-1 + =>ucs@component + =>ucs-itaiji-001 + =>ucs-itaiji-002 + =>ucs-itaiji-003 + =>ucs-itaiji-004 + =>ucs-itaiji-005 + =>ucs-itaiji-006 + =>ucs-itaiji-007 + ===adobe-japan1 + ===cns11643-1 ===cns11643-2 ===cns11643-3 + ===cns11643-4 ===cns11643-5 ===cns11643-6 ===cns11643-7 + )) (defun decode-uri-string (string &optional coding-system) (if (> (length string) 0) @@ -810,6 +851,7 @@ '(=cns11643-7 "C7-" 4 X) '(=adobe-japan1-6 "AJ1-" 5 d) '(=big5-cdp "CDP-" 4 X) + '(=>big5-cdp "A-CDP-" 4 X) '(=gb2312 "G0-" 4 X) '(=gb12345 "G1-" 4 X) '(=jis-x0208@1990 "J90-" 4 X) @@ -842,13 +884,14 @@ '(=hanziku-10 "HZK10-" 4 X) '(=hanziku-11 "HZK11-" 4 X) '(=hanziku-12 "HZK12-" 4 X) + '(==cbeta "CB" 5 d) '(=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 "&\\(A-\\|G-\\|g2-\\)?CB\\([0-9]+\\);" nil t) + (while (re-search-forward "&\\(A-\\|G-\\|g2-\\|R-\\)?CB\\([0-9]+\\);" nil t) (setq code (string-to-int (match-string 2))) (replace-match (format "\"CB%05d\"" t 'literal)) (goto-char (point-min)) - (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?MJ\\([0-9]+\\);" nil t) + (while (re-search-forward "&\\(A-\\|o-\\|G-\\|g2-\\|R-\\)?MJ\\([0-9]+\\);" nil t) (setq code (string-to-int (match-string 2))) (replace-match - (format "\"MJ%06d\"" code code @@ -1035,9 +1078,22 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">" t 'literal)) (goto-char (point-min)) - (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)) + (while (re-search-forward "&A-\\(comp\\|cgn\\)U[+-]\\([0-9A-F]+\\);" nil t) + (setq code (string-to-int (match-string 2) 16)) + (replace-match + (format "\"u%04x\"" + code + code + www-format-char-img-style) + t 'literal)) + + (goto-char (point-min)) + (while (re-search-forward + "&\\(A-\\|g2-\\)?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)) (replace-match (format "\"u%04x-itaiji-%03d\"" @@ -1060,11 +1116,27 @@ 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)) + (while (re-search-forward + "&\\(A-\\)?CDP-i\\([0-9]+\\)-\\([0-9A-F]+\\);" + nil t) + (setq plane (string-to-int (match-string 2)) + code (string-to-int (match-string 3) 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 "&\\(g2-\\)?U-v\\([0-9]+\\)\\+\\([0-9A-F]+\\);" nil t) + (setq plane (string-to-int (match-string 2)) + code (string-to-int (match-string 3) 16)) + (replace-match + (format "\"u%04x-var-%03d\"" code plane @@ -1086,7 +1158,7 @@ style=\"%s\">" t 'literal)) (goto-char (point-min)) - (while (re-search-forward "&\\(A-\\|G-\\)?GT-K\\([0-9]+\\);" nil t) + (while (re-search-forward "&\\(A-\\|G-\\|g2-\\)?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 "&\\(G-\\|g2-\\|R-\\)?CDP-\\([0-9A-F]+\\);" nil t) + (while (re-search-forward + "&\\(A-\\|G-\\|g2-\\|R-\\)?CDP-\\([0-9A-F]+\\);" nil t) (setq code (string-to-int (match-string 2) 16)) (replace-match (format "\"CDP-%04X\"" t 'literal)) (goto-char (point-min)) - (while (re-search-forward "&\\(G-\\|g2-\\|R-\\)?RUI6-\\([0-9A-F]+\\);" nil t) + (while (re-search-forward "&\\(A-\\|G-\\|g2-\\|R-\\)?RUI6-\\([0-9A-F]+\\);" nil t) (setq code (string-to-int (match-string 2) 16)) (replace-match (format "\"RUI6-%04X\"" (===ucs@jis "u" 4 x nil) (===daikanwa "dkw-" 5 d nil) (===ucs@ks "u" 4 x "-k") + (==ucs-itaiji-005 "u" 4 x "-itaiji-005") (=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-var-004 "u" 4 x "-var-004") (=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-itaiji-001 "u" 4 x "-itaiji-001") + (=>ucs-itaiji-006 "u" 4 x "-itaiji-006") (==adobe-japan1-0 "aj1-" 5 d nil) (==adobe-japan1-1 "aj1-" 5 d nil) (==adobe-japan1-2 "aj1-" 5 d nil) @@ -1292,6 +1369,13 @@ style=\"vertical-align:middle\">" (=>>hanyo-denshi/ks "koseki-" 6 d nil) (=>>jis-x0208@1978 "j78-" 4 x nil) (=>>big5-cdp "cdp-" 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) (=>>jis-x0208 "j90-" 4 x nil) (=>>jis-x0208@1990 "j90-" 4 x nil) (=>>jis-x0208@1983 "j83-" 4 x nil) @@ -1315,9 +1399,13 @@ style=\"vertical-align:middle\">" (=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 "cbeta-" 5 d nil) (=big5-cdp-var-3 "cdp-" 4 x "-var-3") (=big5-cdp-var-5 "cdp-" 4 x "-var-5") + (=big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001") + (=big5-cdp-itaiji-002 "cdp-" 4 x "-itaiji-002") + (=>big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001") (=jef-china3 "jc3-" 4 x nil) (=jis-x0212 "jsp-" 4 x nil) (=jis-x0213-1@2000 "jx1-2000-" 4 x nil) @@ -1335,6 +1423,8 @@ style=\"vertical-align:middle\">" (=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) @@ -1353,7 +1443,7 @@ style=\"vertical-align:middle\">" spec ret code) (while (and rest (setq spec (pop rest)) - (null (setq ret (char-feature char (car spec)))))) + (null (setq ret (get-char-attribute char (car spec)))))) (when ret (or (and (listp ret)