(concord-assign-genre 'era@ruimoku "/usr/local/var/ruimoku/db")
(concord-assign-genre 'period@ruimoku "/usr/local/var/ruimoku/db")
(concord-assign-genre 'journal@ruimoku "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'journal-name@ruimoku "/usr/local/var/ruimoku/db")
+(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)
(defvar chise-wiki-view-url "view.cgi")
(defvar chise-wiki-edit-url "edit.cgi")
(defvar chise-wiki-bitmap-glyphs-url
- "http://chise.zinbun.kyoto-u.ac.jp/glyphs")
+ "http://www.chise.org/glyphs")
(defvar chise-wiki-glyph-cgi-url
- "http://chise.zinbun.kyoto-u.ac.jp/chisewiki/glyph.cgi")
+ "http://www.chise.org/chisewiki/glyph.cgi")
(defvar chise-wiki-displayed-features nil)
ret)
(let ((type (www-feature-type feature-name)))
(cond ((eq type 'relation)
- 'space-separated-char-list)
+ 'space-separated)
((eq type 'structure)
'space-separated-ids)
((eq type 'stext)
(= (charset-chars feature-name) 94))
'("0x" (HEX)
" (" (decimal) ") <" (ku-ten) "> " (prev-char) (next-char))
- '("0x" (HEX) " (" (decimal) ") " (prev-char) (next-char))))))
+ '("0x" (HEX) " (" (decimal) ") " (prev-char) (next-char))))
+ 'space-separated))
(defun char-feature-name-at-domain (feature-name domain)
(if domain
(defun www-uri-decode-feature-name (uri-feature)
(let (feature)
+ (setq uri-feature (decode-uri-string uri-feature 'utf-8-mcs-er))
(cond
((string-match "^from\\." uri-feature)
(intern (format "<-%s" (substring uri-feature (match-end 0))))
?>)
(substring uri-feature (match-end 0))))
)
+ ((string-match "^o\\." uri-feature)
+ (intern (format "=+>%s" (substring uri-feature (match-end 0))))
+ )
((string-match "^a\\." uri-feature)
(intern (format "=>%s" (substring uri-feature (match-end 0))))
)
(defun www-uri-encode-feature-name (feature-name)
(setq feature-name (symbol-name feature-name))
(cond
+ ((string-match "^=\\+>\\([^=>]+\\)" feature-name)
+ (concat "o." (substring feature-name (match-beginning 1)))
+ )
((string-match "^=\\([^=>]+\\)" feature-name)
(concat "rep." (substring feature-name (match-beginning 1)))
)
)
(t feature-name)))
-(defun www-uri-make-feature-name-url (uri-feature-name uri-char)
- (format "%s?feature=%s&char=%s"
- chise-wiki-view-url uri-feature-name uri-char))
+(defun www-uri-make-feature-name-url (uri-genre uri-feature-name uri-object)
+ (format "%s?feature=%s&%s=%s"
+ chise-wiki-view-url uri-feature-name uri-genre uri-object))
(defun www-uri-decode-object (genre char-rep)
(let (ccs cpos)
(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))
=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))
))))
(format "rep.id:%s" (concord-object-id object))))
-(defun est-format-object (object)
+(defun est-format-object (object &optional readable)
(if (characterp object)
(char-to-string object)
- (format "%s" (concord-object-id object))))
+ (let ((ret (or (if readable
+ (or (concord-object-get object 'name)
+ (concord-object-get object '=name)
+ (concord-object-get object 'title)))
+ (concord-object-id object))))
+ (format "%s" ret))))
+
+(defun www-uri-make-object-url (object &optional uri-object)
+ (format "%s?%s=%s"
+ chise-wiki-view-url
+ (est-object-genre object)
+ (or uri-object
+ (www-uri-encode-object object))))
;;; @ Feature name presentation
;;; @ HTML generator
;;;
-(defun www-format-encode-string (string &optional without-tags)
+(defvar www-format-char-img-style "vertical-align:bottom;")
+
+(defun www-format-encode-string (string &optional without-tags as-body)
(with-temp-buffer
(insert string)
(let (plane code start end char variants ret rret)
+ (when as-body
+ (goto-char (point-min))
+ (while (search-forward "&" nil t)
+ (replace-match "&" nil t)))
(goto-char (point-min))
(while (search-forward "<" nil t)
(replace-match "<" nil t))
(while (re-search-forward "&CB\\([0-9]+\\);" nil t)
(setq code (string-to-int (match-string 1)))
(replace-match
- (format "<img alt=\"CB%05d\" src=\"%s/cb-gaiji/%02d/CB%05d.gif\">"
+ (format "<img alt=\"CB%05d\" src=\"%s/cb-gaiji/%02d/CB%05d.gif\"
+style=\"%s\">"
code
chise-wiki-bitmap-glyphs-url
- (/ code 1000) code)
+ (/ code 1000) code
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&J\\(78\\|83\\|90\\|97\\|SP\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
- (setq plane (match-string 1)
- code (string-to-int (match-string 2) 16))
+ (while (re-search-forward "&\\(o-\\)?J\\(78\\|83\\|90\\|97\\|SP\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
+ (setq plane (match-string 2)
+ code (string-to-int (match-string 3) 16))
(replace-match
- (format "<img alt=\"J%s-%04X\" src=\"%s/JIS-%s/%02d-%02d.gif\">"
+ (format "<img alt=\"J%s-%04X\" src=\"%s/JIS-%s/%02d-%02d.gif\"
+style=\"%s\">"
plane code
chise-wiki-bitmap-glyphs-url
plane
(- (lsh code -8) 32)
- (- (logand code 255) 32))
+ (- (logand code 255) 32)
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
(setq plane (string-to-int (match-string 1))
code (string-to-int (match-string 2) 16))
(replace-match
- (format "<img alt=\"GB%d-%04X\" src=\"%s/GB%d/%02d-%02d.gif\">"
+ (format "<img alt=\"GB%d-%04X\" src=\"%s/GB%d/%02d-%02d.gif\"
+style=\"%s\">"
plane code
chise-wiki-bitmap-glyphs-url
plane
(- (lsh code -8) 32)
- (- (logand code 255) 32))
+ (- (logand code 255) 32)
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
(setq plane (string-to-int (match-string 1))
code (string-to-int (match-string 2) 16))
(replace-match
- (format "<img alt=\"CNS%d-%04X\" src=\"%s/CNS%d/%04X.gif\">"
+ (format "<img alt=\"CNS%d-%04X\" src=\"%s/CNS%d/%04X.gif\"
+style=\"%s\">"
plane code
chise-wiki-bitmap-glyphs-url
- plane code)
+ plane code
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
(while (re-search-forward "&\\(A-\\)?ZOB-\\([0-9]+\\);" nil t)
(setq code (string-to-int (match-string 2)))
(replace-match
- (format "<img alt=\"ZOB-%04d\" src=\"%s/ZOB-1968/%04d.png\">"
+ (format "<img alt=\"ZOB-%04d\" src=\"%s/ZOB-1968/%04d.png\"
+style=\"vertical-align:middle\">"
code
chise-wiki-bitmap-glyphs-url
- code)
+ code
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&\\(G-\\)?GT-\\([0-9]+\\);" nil t)
+ (while (re-search-forward "&\\(G-\\|g2-\\)?GT-\\([0-9]+\\);" nil t)
(setq code (string-to-int (match-string 2)))
(replace-match
- (format "<img alt=\"GT-%05d\" src=\"%s?char=GT-%05d\">"
+ (format "<img alt=\"GT-%05d\" src=\"%s?char=GT-%05d\"
+style=\"%s\">"
code
chise-wiki-glyph-cgi-url
- code)
+ code
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
(while (re-search-forward "&\\(G-\\)?GT-K\\([0-9]+\\);" nil t)
(setq code (string-to-int (match-string 2)))
(replace-match
- (format "<img alt=\"GT-K%05d\" src=\"%s?char=GT-K%05d\">"
+ (format "<img alt=\"GT-K%05d\" src=\"%s?char=GT-K%05d\"
+style=\"%s\">"
code
chise-wiki-glyph-cgi-url
- code)
+ code
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
(while (re-search-forward "&B-\\([0-9A-F]+\\);" nil t)
(setq code (string-to-int (match-string 1) 16))
(replace-match
- (format "<img alt=\"B-%04X\" src=\"%s?char=B-%04X\">"
+ (format "<img alt=\"B-%04X\" src=\"%s?char=B-%04X\"
+style=\"%s\">"
code
chise-wiki-glyph-cgi-url
- code)
+ code
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
(while (re-search-forward "&CDP-\\([0-9A-F]+\\);" nil t)
(setq code (string-to-int (match-string 1) 16))
(replace-match
- (format "<img alt=\"CDP-%04X\" src=\"%s?char=CDP-%04X\">"
+ (format "<img alt=\"CDP-%04X\" src=\"%s?char=CDP-%04X\"
+style=\"%s\">"
code
chise-wiki-glyph-cgi-url
- code)
+ 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
- (format "<img alt=\"RUI6-%04X\" src=\"%s?char=RUI6-%04X\">"
+ (format "<img alt=\"RUI6-%04X\" src=\"%s?char=RUI6-%04X\"
+style=\"vertical-align:middle\">"
code
chise-wiki-glyph-cgi-url
- code)
+ code
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&\\(UU\\+\\|U-\\)\\([0-9A-F]+\\);" nil t)
- (setq code (string-to-int (match-string 2) 16))
+ (while (re-search-forward "&\\(A-\\)?\\(UU\\+\\|U-\\)\\([0-9A-F]+\\);" nil t)
+ (setq code (string-to-int (match-string 3) 16))
(replace-match
- (format "<img alt=\"UU+%04X\" src=\"http://www.unicode.org/cgi-bin/refglyph?24-%04X\">"
+ (format "<img alt=\"UU+%04X\" src=\"http://www.unicode.org/cgi-bin/refglyph?24-%04X\"
+style=\"vertical-align:middle\">"
code
- code)
+ code
+ www-format-char-img-style)
t 'literal))
(goto-char (point-min))
(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)
(=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)
(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)
projects / chise / est.git / blobdiff