X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=ec3f25677bc3f093c7fd155f4284a3b1917d8b1a;hb=9aa5a94e2d7fb0283c2450962d431d6ce1e51f27;hp=ae8bb22ddef0d5133b692a38940a1a98635fb14e;hpb=f77d94ad5cb5544f0f5249316addb6a5f92cc55f;p=chise%2Fest.git diff --git a/cwiki-view.el b/cwiki-view.el index ae8bb22..ec3f256 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -2,136 +2,205 @@ (require 'cwiki-common) (defvar chise-wiki-view-url "view.cgi") -(defvar chise-wiki-edit-url "edit/edit.cgi") -(defvar chise-wiki-add-url "edit/add.cgi") +(defvar chise-wiki-edit-url "edit.cgi") +(defvar chise-wiki-add-url "add.cgi") -(defun www-char-display-feature-default (char feature-name &optional value - lang uri-char) - (unless value - (setq value (www-char-feature char feature-name))) - (unless uri-char - (setq uri-char (char-to-string char))) - (www-html-display-paragraph - (format "[[%s|%?feature=%s&char=%s]] : %s [[[edit|%s?char=%s&feature=%s]]]" - (www-format-feature-name feature-name lang) - chise-wiki-view-url - (www-uri-encode-feature-name feature-name) - uri-char - (www-format-value value feature-name) - chise-wiki-edit-url - uri-char - (www-uri-encode-feature-name feature-name) - ))) - -(defun www-char-display-feature-as-ucs (char feature-name &optional value) - (unless value - (setq value (www-char-feature char feature-name))) - (www-html-display-paragraph - (format "= [[U+%s|http://www.unicode.org/cgi-bin/GetUnihanData.pl?codepoint=%s]] (%d)" - (www-format-value-as-HEX value) - (www-format-value-as-HEX value) - value))) - -(defun www-display-char-desc (uri-char &optional lang level) +(defun www-display-object-desc (genre uri-object &optional lang level simple) (unless level (setq level 1)) - (let ((char (www-uri-decode-char uri-char)) - feature-name logical-feature displayed-features) - (when (characterp char) - (when (= (length uri-char) 1) - (setq uri-char (www-uri-encode-char char))) + (let ((object (www-uri-decode-object genre uri-object)) + logical-feature chise-wiki-displayed-features + parents + GlyphWiki-id) + (when object + (when (and (eq genre 'character) + (= (length uri-object) 1)) + (setq uri-object (www-uri-encode-object object))) (when (= level 1) (princ (encode-coding-string (format "
-%s %s
\n%s %s
\n\n" + "
\n" "
\n" + "
name : %s " (or (www-format-feature-name feature-name) ""))) - (www-html-display-text - (format "[[[edit|%s?feature=%s&property=name&char=%s]]]" - ;; (char-feature-property feature-name 'name) - chise-wiki-edit-url - uri-feature-name ; (www-uri-encode-feature-name feature-name) - uri-char)) - (princ "
") + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + uri-object)) + (princ "\n")) + (princ "\n") (when lang (princ "") (princ @@ -139,18 +208,56 @@ (format "%s : %s" name@lang (or (char-feature-property feature-name name@lang) "")))) - (www-html-display-text - (format " [[[edit|%s?feature=%s&property=%s&char=%s]]]" - chise-wiki-edit-url - uri-feature-name - name@lang - uri-char)) - (princ "
")) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + name@lang + uri-object)) + (princ "\n")) + (princ "\n")) (www-html-display-paragraph (format "type : %s" (or (www-feature-type feature-name) ;; (char-feature-property feature-name 'type) 'generic))) + (princ (format "value-format : %s " + (www-format-value + nil 'value-format + (or (www-feature-value-format feature-name) + 'default) + 'default + 'without-tags))) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + uri-object)) + (princ "\n")) + (princ "
\n") + + (princ "format : ") + (www-html-display-text + (decode-coding-string + (www-xml-format-list + (www-feature-format feature-name)) + 'utf-8-mcs-er)) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + uri-object)) + (princ "\n")) + (princ "
\n") + (www-html-display-paragraph (format "description : %s" (or (char-feature-property feature-name 'description) @@ -171,6 +278,7 @@ (let* ((target (pop command-line-args-left)) (user (pop command-line-args-left)) (accept-language (pop command-line-args-left)) + (mode (intern (pop command-line-args-left))) (lang (intern (car (split-string @@ -187,6 +295,14 @@ ") (cond ((stringp target) + (when (string-match "^char=\\(&[^&;]+;\\)" target) + (setq ret (match-end 0)) + (setq target + (concat "char=" + (www-uri-encode-object + (www-uri-decode-object + 'character (match-string 1 target))) + (substring target ret)))) (setq target (mapcar (lambda (cell) (if (string-match "=" cell) @@ -200,25 +316,35 @@ (split-string target "&"))) (setq ret (car target)) (cond ((eq (car ret) 'char) - (www-display-char-desc - (cdr ret) ; (decode-uri-string (cdr ret) 'utf-8-mcs-er) - lang) + (www-display-object-desc + 'character + (cdr ret) + lang nil + (eq mode 'simple)) ) ((eq (car ret) 'feature) (www-display-feature-desc (decode-uri-string (cdr ret) 'utf-8-mcs-er) - (cdr (assq 'char target)) - ;; (decode-uri-string (cdr (assq 'char target))) - lang) + (cdr (assq 'char target)) + lang + (eq mode 'simple)) + ) + (t + (www-display-object-desc + (car ret) + (cdr ret) + lang nil + (eq mode 'simple)) )) )) (princ "\n