From: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
Date: Fri, 19 Mar 2010 04:05:37 +0000 (+0900)
Subject: (www-display-feature-desc): Display `value-format' and `format'.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbea22b806234b09874a52e1044ee48a37429647;p=chise%2Fest.git

(www-display-feature-desc): Display `value-format' and `format'.
---

diff --git a/cwiki-view.el b/cwiki-view.el
index 23f6469..17d1996 100644
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -5,33 +5,6 @@
 (defvar chise-wiki-edit-url "edit/edit.cgi")
 (defvar chise-wiki-add-url "edit/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)
   (unless level
     (setq level 1))
@@ -151,6 +124,16 @@
 		 ;; (char-feature-property feature-name 'type)
 		 'generic)))
     (www-html-display-paragraph
+     (format "value-format : %s"
+	     (www-xml-format-list
+	      (or (www-feature-value-format feature-name)
+		  'default))))
+    (www-html-display-paragraph
+     (format "format : %s"
+	     (www-xml-format-list
+	      (or (char-feature-property feature-name 'format)
+		  '((name) " : " (value))))))
+    (www-html-display-paragraph
      (format "description : %s"
              (or (char-feature-property feature-name 'description)
 		 "")))