projects / chise / est.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(www-format-value-default): New function.
[chise/est.git] / cwiki-view.el
diff --git a/cwiki-view.el b/cwiki-view.el
index 30d07ae..72aeb42 100644 (file)
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -9,7 +9,8 @@
   (unless level
     (setq level 1))
   (let ((char (www-uri-decode-char uri-char))
-       logical-feature displayed-features)
+       logical-feature displayed-features
+       parents)
     (when (characterp char)
       (when (= (length uri-char) 1)
        (setq uri-char (www-uri-encode-char char)))
@@ -22,15 +23,23 @@
                  (decode-uri-string uri-char 'utf-8-mcs-er))
          'utf-8-mcs-er))
        (princ "<body>\n"))
+      (dolist (feature (char-feature-property '$object 'additional-features))
+       (mount-char-attribute-table
+        (char-feature-name-at-domain feature '$rev=latest)))
+      (when (setq parents (www-char-feature char '<-denotational))
+       (princ (format "<p>%s %s</p>\n<hr>\n"
+                      (www-format-value-as-char-list parents)
+                      (www-format-feature-name '->denotational lang))))
+      (when (setq parents (www-char-feature char '<-subsumptive))
+       (princ (format "<p>%s %s</p>\n<hr>\n"
+                      (www-format-value-as-char-list parents)
+                      (www-format-feature-name '->subsumptive lang))))
       (princ (format "<h%d>%s</h%d>\n"
                     level
                     (www-format-encode-string (char-to-string char))
                     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)))))
@@ -136,11 +145,26 @@
              (or (www-feature-type feature-name)
                 ;; (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))))
+    (princ (format "<p>value-format : %s "
+                  (www-format-value
+                   nil 'value-format 
+                   (or (www-feature-value-format feature-name)
+                       '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
+      " <a href=\"%s?feature=%s&property=value-format&format=wiki-text&char=%s\"
+><input type=\"submit\" value=\"edit\" /></a></p>"
+      chise-wiki-edit-url
+      uri-feature-name
+      uri-char))
+
     (www-html-display-paragraph
      (format "format : %s"
             (www-xml-format-list