X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-common.el;h=78c3481730722d2366ae68801d06de16c5c7f99c;hb=77f17ee7b5150d5761b40ae209ba8b48070c2ce3;hp=60a93a28b6d124776b8854aedd752312bb61592f;hpb=0b7104c6236c019112fa1b4a870589cb987df56a;p=chise%2Fest.git diff --git a/cwiki-common.el b/cwiki-common.el index 60a93a2..78c3481 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -20,8 +20,8 @@ (concord-assign-genre 'publisher@ruimoku "/usr/local/var/ruimoku/db") (concord-assign-genre 'publisher-name@ruimoku "/usr/local/var/ruimoku/db") -(mount-char-attribute-table 'instance@ruimoku/bibliography/title) -;; (mount-char-attribute-table 'instance@ruimoku/bibliography/content*note) +(mount-char-attribute-table '*instance@ruimoku/bibliography/title) +;; (mount-char-attribute-table '*instance@ruimoku/bibliography/content*note) (defvar chise-wiki-view-url "view.cgi") @@ -85,13 +85,16 @@ '((name) " : " (value)))) (defun www-feature-value-format (feature-name) - (or (char-feature-property feature-name 'value-format) + (or (char-feature-property feature-name 'value-presentation-format) + (char-feature-property feature-name 'value-format) (let (fn parent ret) (setq fn feature-name) (while (and (setq parent (char-feature-name-parent fn)) (null (setq ret - (char-feature-property - parent 'value-format)))) + (or (char-feature-property + parent 'value-presentation-format) + (char-feature-property + parent 'value-format))))) (setq fn parent)) ret) (let ((type (www-feature-type feature-name))) @@ -395,7 +398,9 @@ (string-to-number (substring cpos (match-end 0)) 16)) ) (t - (setq cpos (car (read-from-string cpos))) + (setq cpos (car (read-from-string + (decode-uri-string + cpos file-name-coding-system)))) )) (if (and (eq genre 'character) (numberp cpos)) @@ -431,19 +436,30 @@ =cns11643-4 =cns11643-5 =cns11643-6 =cns11643-7 =gb2312 =gb12345 =jis-x0208 =jis-x0208@1990 + =jis-x0213-2 =jis-x0212 + =adobe-japan1 =cbeta =jef-china3 =jis-x0213-1@2000 =jis-x0213-1@2004 =jis-x0208@1983 =jis-x0208@1978 =zinbun-oracle =>zinbun-oracle =daikanwa =gt =gt-k - =>>jis-x0208 =>>jis-x0213-1 + =>>>adobe-japan1 + =>>>jis-x0208 =>>>jis-x0213-1 =>>>jis-x0213-2 + =>>jis-x0208 =>>jis-x0213-1 =>>jis-x0213-2 + =>>adobe-japan1 + =+>jis-x0208 =+>jis-x0213-1 =+>jis-x0213-2 =+>jis-x0208@1978 + =+>adobe-japan1 =>jis-x0208 =>jis-x0213-1 =>>gt =>ucs@iso =>ucs@unicode =>ucs@jis =>ucs@cns =>ucs@ks + =>>ucs@iso =>>ucs@unicode + =>>ucs@jis =>>ucs@cns =>>ucs@ks + =>>>ucs@iso =>>>ucs@unicode + =>>>ucs@jis =>>>ucs@cns =>>>ucs@ks =ruimoku-v6 =big5 =big5-cdp)) @@ -850,26 +866,43 @@ style=\"vertical-align:middle\">" (defvar coded-charset-GlyphWiki-id-alist '((=ucs "u" 4 x nil) - (=ucs@JP "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) + (=decomposition@cid) + (=decomposition@hanyo-denshi) + (=hanyo-denshi/ks "koseki-" 6 d nil) + (=>>hanyo-denshi/ks "koseki-" 6 d nil) (=ucs@jis "u" 4 x nil) - (=ucs@gb "u" 4 x "-g") (=ucs@cns "u" 4 x "-t") - (=ucs@ks "u" 4 x "-k") - (=ucs@iso "u" 4 x "-u") - (=ucs@unicode "u" 4 x "-us") - (=adobe-japan1-6 "aj1-" 5 d nil) - (=gt "gt-" 5 d nil) - (=big5-cdp "cdp-" 4 x nil) - (=cbeta "cb" 5 d 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@1983 "j83-" 4 x nil) - (=jis-x0208@1990 "j90-" 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) + (=gt-k "gt-k" 5 d nil) + (=jef-china3 "jc3-" 4 x nil) + (=big5 "b-" 4 x nil) + (=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@ks "u" 4 x "-k") + (=ucs@iso "u" 4 x "-u") + (=ucs@unicode "u" 4 x "-us") + (=big5-cdp "cdp-" 4 x nil) + (=>>big5-cdp "cdp-" 4 x nil) (=cns11643-1 "c1-" 4 x nil) (=cns11643-2 "c2-" 4 x nil) (=cns11643-3 "c3-" 4 x nil) @@ -877,11 +910,19 @@ style=\"vertical-align:middle\">" (=cns11643-5 "c5-" 4 x nil) (=cns11643-6 "c6-" 4 x nil) (=cns11643-7 "c7-" 4 x nil) - (=daikanwa "dkw-" 5 d nil) - (=gt-k "gt-k" 5 d nil) - (=jef-china3 "jc3-" 4 x nil) - (=big5 "b-" 4 x nil) - (=ks-x1001 "k0-" 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) )) (defun char-GlyphWiki-id (char) @@ -892,6 +933,8 @@ style=\"vertical-align:middle\">" (null (setq ret (char-feature char (car spec)))))) (when ret (or + (and (listp ret) + (mapconcat #'char-GlyphWiki-id ret "-")) (and (memq (car spec) '(=ucs@unicode '=ucs@iso)) (cond ((and (or (encode-char char '=jis-x0208@1990)