X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cwiki-common.el;h=cf49f79ee55c2a45971b453bbf50aec4a2fa73bd;hb=8d1f45bec95682f85a982025a9cb384c4f07d307;hp=97fbc62b33f72f02be1bdb8b85a1af2383afb2fe;hpb=a2e7005a5e6c061dddbde3664c940215e74ff30a;p=chise%2Fest.git
diff --git a/cwiki-common.el b/cwiki-common.el
index 97fbc62..cf49f79 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -87,7 +87,14 @@
=ruimoku-v6
=big5
=big5-cdp
- =ucs-itaiji-002))
+ =>cbeta
+ =mj
+ ==mj
+ ===mj
+ =ucs-itaiji-001
+ =ucs-itaiji-002
+ =ucs-itaiji-003
+ =ucs@unicode))
(defun decode-uri-string (string &optional coding-system)
(if (> (length string) 0)
@@ -748,6 +755,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)
@@ -770,6 +778,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)
@@ -803,7 +812,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)
@@ -811,12 +819,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\"](\"%s/cb-gaiji/%02d/CB%05d.gif\")
"
@@ -985,7 +1007,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\"](\"http://glyphwiki.org/glyph/u%04x.100px.png\")
"
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\"](\"http://glyphwiki.org/glyph/u%04x-itaiji-%03d.100px.png\")
"
@@ -1010,7 +1032,21 @@ 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 "&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\"](\"http://glyphwiki.org/glyph/u%04x-var-%03d.100px.png\")
"
+ 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\"](\"%s?char=GT-%05d\")
"
t 'literal))
(goto-char (point-min))
+ (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\"](\"%s?char=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 "&RUI6-\\([0-9A-F]+\\);" nil t)
(setq code (string-to-int (match-string 1) 16))
(replace-match
@@ -1172,14 +1224,23 @@ style=\"vertical-align:middle\">"
;;;
(defvar coded-charset-GlyphWiki-id-alist
- '((=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)
+ (===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)
@@ -1187,50 +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)
@@ -1239,26 +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)
- (=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-002 "u" 4 x "-itaiji-002")
- (=ucs-itaiji-084 "u" 4 x "-itaiji-084")
- (=big5-cdp-var-3 "cdp-" 4 x "-var-3")
- (=big5-cdp-var-5 "cdp-" 4 x "-var-5")
))
(defun char-GlyphWiki-id (char)