From: MORIOKA Tomohiko Date: Tue, 12 Oct 2010 01:12:45 +0000 (+0900) Subject: (www-display-object-desc): Renamed from `www-display-char-desc'; add X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40a45a1caa6e826bb9c46d342d34dec90b49551c;p=chise%2Fest.git (www-display-object-desc): Renamed from `www-display-char-desc'; add new argument `genre'. --- diff --git a/cwiki-view.el b/cwiki-view.el index 826503f..075fce9 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)) + (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-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")) - (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,20 @@

\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 (char-to-string object)) (if GlyphWiki-id (format " $\"%s\"$ " @@ -65,7 +69,9 @@ level)) (if (> level 1) (princ "

\n" @@ -122,15 +125,12 @@ "

\n") (princ (www-format-encode-string - (format "%c" char))) + (format "%c" object))) (princ (format " " - (encode-coding-string (char-to-string char) 'utf-8-jp-er))) - ;; (princ (www-format-encode-string "ã¨")) - ;; (princ "") + (encode-coding-string (char-to-string object) 'utf-8-jp-er))) (princ (www-format-encode-string "ã\u542Bã\u6F22\u5B57ã\u63A2ã")) @@ -142,14 +142,14 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") "

\n")) ))) -(defun www-display-feature-desc (uri-feature-name uri-char +(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)) @@ -170,7 +170,7 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />")

\n") - uri-feature-name uri-char)) + uri-feature-name uri-object)) (princ (format "

%s

\n" (www-format-encode-string @@ -183,7 +183,7 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") " " chise-wiki-edit-url uri-feature-name - uri-char)) + uri-object)) (princ "\n")) (princ "

\n") (when lang @@ -200,7 +200,7 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") chise-wiki-edit-url uri-feature-name name@lang - uri-char)) + uri-object)) (princ "\n")) (princ "

\n")) (www-html-display-paragraph @@ -222,7 +222,7 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") >" chise-wiki-edit-url uri-feature-name - uri-char)) + uri-object)) (princ "\n")) (princ "

\n") @@ -239,7 +239,7 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") >" chise-wiki-edit-url uri-feature-name - uri-char)) + uri-object)) (princ "\n")) (princ "

\n") @@ -285,7 +285,8 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (setq target (concat "char=" (www-uri-encode-char - (www-uri-decode-char (match-string 1 target))) + (www-uri-decode-object + 'character (match-string 1 target))) (substring target ret)))) (setq target (mapcar (lambda (cell) @@ -300,7 +301,8 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (split-string target "&"))) (setq ret (car target)) (cond ((eq (car ret) 'char) - (www-display-char-desc + (www-display-object-desc + 'character (cdr ret) lang nil (eq mode 'simple))