(www-xml-format-unit): Escape `&'.

[chise/est.git] / cwiki-view.el

diff --git a/cwiki-view.el b/cwiki-view.el
index 9e0a10c..30d07ae 100644 (file)
--- 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))
@@ -55,6 +28,9 @@
                     level))
       (if (> level 1)
          (princ "<ul>"))
+      (dolist (feature (char-feature-property '$object 'additional-features))
+       (mount-char-attribute-table
+        (char-feature-name-at-domain feature '$rev=latest)))
       (dolist (cell (sort (char-attribute-alist char)
                          (lambda (a b)
                            (char-attribute-name< (car a)(car b)))))
@@ -121,12 +97,18 @@
              (symbol-name feature-name))))
     (princ (format "<p>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)
+    (princ
+     (format " <a href=\"%s?feature=%s&property=name&format=string&char=%s\"
+><input type=\"submit\" value=\"edit\" /></a>"
             chise-wiki-edit-url
-            uri-feature-name ; (www-uri-encode-feature-name feature-name)
+            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 "</p>")
     (when lang
       (princ "<p>")
@@ -135,12 +117,19 @@
        (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]]]"
+      (princ
+       (format " <a href=\"%s?feature=%s&property=%s&format=string&char=%s\"
+><input type=\"submit\" value=\"edit\" /></a>"
               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 "</p>"))
     (www-html-display-paragraph
      (format "type : %s"
@@ -148,6 +137,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)
                 "")))