CHISE-wiki character: %s

X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=28c25f4df5273383a2ba4e7aac08bc9f2aa693e0;hb=87f16c052aa13de7486d57236c04eeb44dae17af;hp=911b190b1f47e99bcafa2ae2ee54f66e753b4a00;hpb=cb2d550713bf881152792dd8555557a72734a3a3;p=chise%2Fest.git diff --git a/cwiki-view.el b/cwiki-view.el index 911b190..28c25f4 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -2,114 +2,204 @@ (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-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)) - 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-char object))) (when (= level 1) (princ (encode-coding-string (format " -CHISE-wiki character: %s +EsT %s = %s \n" - (decode-uri-string uri-char 'utf-8-mcs-er)) + genre + (decode-uri-string uri-object 'utf-8-mcs-er)) 'utf-8-mcs-er)) (princ "\n")) - (princ (format "%s\n" + (when (eq genre 'character) + (dolist (feature (char-feature-property '$object 'additional-features)) + (mount-char-attribute-table + (char-feature-name-at-domain feature '$rev=latest)))) + (princ + (format + (if simple + "

+ + + + +

\n" + "

+ + + +

\n") + uri-object)) + (when (setq parents (www-get-feature-value object '<-denotational)) + (princ (format "

%s %s

\n" + (www-format-value-as-char-list parents) + (www-format-feature-name '->denotational lang)))) + (when (setq parents (www-get-feature-value object '<-subsumptive)) + (princ (format "

%s %s

\n" + (www-format-value-as-char-list parents) + (www-format-feature-name '->subsumptive lang)))) + (when (eq genre 'character) + (setq GlyphWiki-id (char-GlyphWiki-id object))) + (princ (format "%s%s\n" level - (www-format-encode-string (char-to-string char)) + (www-format-encode-string + (est-format-object object) + ;; (if (eq genre 'character) + ;; (char-to-string object) + ;; (format "%s" (concord-object-id object))) + ) + (if GlyphWiki-id + (format + " $\"%s\"$ " + GlyphWiki-id + GlyphWiki-id GlyphWiki-id) + "") level)) (if (> level 1) (princ "

\n" + "

\n" "

\n")) (princ (www-format-eval-list - (or (char-feature-property logical-feature ; (car cell) - 'format) - '((name) " : " (value))) - char + (www-feature-format logical-feature) + object logical-feature ; (car cell) - lang uri-char)) - (princ - (format " " - chise-wiki-edit-url - (www-format-encode-string uri-char) - (www-format-encode-string - (www-uri-encode-feature-name - (intern (format "%s*note" - logical-feature ; (car cell) - )))))) + chise-wiki-edit-url + (www-format-encode-string uri-object) + (www-format-encode-string + (www-uri-encode-feature-name + (intern (format "%s*note" + logical-feature ; (car cell) + ))))))) (princ (if (= level 1) - "

\n" + "

\n")) )) (princ (if (= level 1) "
\n" "
\n")) - (princ - (format " " - chise-wiki-add-url - (www-format-encode-string uri-char))) + chise-wiki-add-url + (www-format-encode-string uri-object)))) + (princ + (if (= level 1) + "
\n" + "
\n")) + (princ + "
\n") + (princ + (www-format-encode-string + (est-format-object object) + ;; (if (eq genre 'character) + ;; (format "%c" object) + ;; (format "%s" (concord-object-id object))) + )) + (princ + (format + " " + (encode-coding-string + (est-format-object object) + ;; (if (eq genre 'character) + ;; (char-to-string object) + ;; (format "%s" (concord-object-id object))) + 'utf-8-jp-er))) + (princ + (www-format-encode-string + "ã\u542Bã\u6F22\u5B57ã\u63A2ã")) + (princ " \n") + (princ "
\n") (princ (if (= level 1) "
\n" "
\n")) ))) -(defun www-display-feature-desc (uri-feature-name uri-char &optional lang) +(defun www-display-feature-desc (uri-feature-name uri-object + &optional lang simple) (let ((feature-name (www-uri-decode-feature-name uri-feature-name)) (name@lang (intern (format "name@%s" lang)))) (princ (encode-coding-string (format " -CHISE-wiki feature: %s +EsT feature: %s \n" feature-name) 'utf-8-mcs-er)) (princ "\n") (princ + (format + (if simple + "
+ + + + +
+
\n" + "
+ + + +
+
\n") + uri-feature-name uri-object)) + (princ (format "
%s
\n" (www-format-encode-string (symbol-name feature-name)))) (princ (format "
name : %s " (or (www-format-feature-name feature-name) ""))) - (princ - (format " " - chise-wiki-edit-url - uri-feature-name - uri-char)) - ;; (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 @@ -117,48 +207,56 @@ (format "%s : %s" name@lang (or (char-feature-property feature-name name@lang) "")))) - (princ - (format " " - chise-wiki-edit-url - uri-feature-name - name@lang - uri-char)) - ;; (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-encode-string - (www-xml-format-list - (or (www-feature-value-format feature-name) - 'default))))) - ;; (www-html-display-paragraph - ;; (format "value-format : %s" - ;; (www-xml-format-list - ;; (or (www-feature-value-format feature-name) - ;; 'default)))) - (princ - (format - "
" - chise-wiki-edit-url - uri-feature-name - uri-char)) + (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") - (www-html-display-paragraph - (format "format : %s" - (www-xml-format-list - (or (char-feature-property feature-name 'format) - '((name) " : " (value)))))) + (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) @@ -179,6 +277,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 @@ -195,6 +294,14 @@ ") (cond ((stringp target) + (when (string-match "^char=\$&[^&;]+;\$" target) + (setq ret (match-end 0)) + (setq target + (concat "char=" + (www-uri-encode-char + (www-uri-decode-object + 'character (match-string 1 target))) + (substring target ret)))) (setq target (mapcar (lambda (cell) (if (string-match "=" cell) @@ -208,25 +315,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
\n") + (princ (format "mode=%S\n" mode)) (princ (format "user=%s\n" user)) - (princ (format "local user=%s\n" (user-login-name))) + ;; (princ (format "local user=%s\n" (user-login-name))) (princ (format "lang=%S\n" lang)) - (princ emacs-version) - (princ " CHISE ") - (princ xemacs-chise-version) + (princ (emacs-version)) + ;; (princ " CHISE ") + ;; (princ xemacs-chise-version) (princ " ")