CHISE-wiki character: %s

X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=ec3f25677bc3f093c7fd155f4284a3b1917d8b1a;hb=9aa5a94e2d7fb0283c2450962d431d6ce1e51f27;hp=9893cfb58c51d1a5f47f81cb35cc4f8c6a7a5d86;hpb=17676957186130d268a249f0736caaa9212f15cd;p=chise%2Fest.git diff --git a/cwiki-view.el b/cwiki-view.el index 9893cfb..ec3f256 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -5,28 +5,31 @@ (defvar chise-wiki-edit-url "edit.cgi") (defvar chise-wiki-add-url "add.cgi") -(defun www-display-char-desc (uri-char &optional lang level simple) +(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 + (let ((object (www-uri-decode-object genre uri-object)) + logical-feature chise-wiki-displayed-features parents GlyphWiki-id) - (when (characterp char) - (when (= (length uri-char) 1) - (setq uri-char (www-uri-encode-char char))) + (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 " -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")) - (dolist (feature (char-feature-property '$object 'additional-features)) - (mount-char-attribute-table - (char-feature-name-at-domain feature '$rev=latest))) + (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 @@ -43,19 +46,25 @@

\n") - uri-char)) - (when (setq parents (www-char-feature char '<-denotational)) + 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-char-feature char '<-subsumptive)) + (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)))) - (setq GlyphWiki-id (char-GlyphWiki-id char)) + (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\"$ " @@ -65,33 +74,33 @@ 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 + lang uri-object nil simple)) (unless simple (princ (format " " chise-wiki-edit-url - (www-format-encode-string uri-char) + (www-format-encode-string uri-object) (www-format-encode-string (www-uri-encode-feature-name (intern (format "%s*note" @@ -99,77 +108,99 @@ ))))))) (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 - (format "%c" char))) - (princ - (format - " \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 (char-to-string char) 'utf-8-jp-er))) - ;; (princ (www-format-encode-string "ã¨")) - ;; (princ "") - (princ - (www-format-encode-string - "ã\u542Bã\u6F22\u5B57ã\u63A2ã")) - (princ " \n") - (princ "
\n") + (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 @@ -177,20 +208,16 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (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) @@ -203,24 +230,34 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") 'default) 'default 'without-tags))) - ;; (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)) + (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) @@ -262,8 +299,9 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (setq ret (match-end 0)) (setq target (concat "char=" - (www-uri-encode-char - (www-uri-decode-char (match-string 1 target))) + (www-uri-encode-object + (www-uri-decode-object + 'character (match-string 1 target))) (substring target ret)))) (setq target (mapcar (lambda (cell) @@ -278,16 +316,25 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (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 nil (eq mode 'simple)) + (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") @@ -295,7 +342,7 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (princ (format "user=%s\n" user)) ;; (princ (format "local user=%s\n" (user-login-name))) (princ (format "lang=%S\n" lang)) - (princ (emacs-version)) + (princ (encode-coding-string (emacs-version) 'utf-8-jp-er)) ;; (princ " CHISE ") ;; (princ xemacs-chise-version) (princ "