update.

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

diff --git a/cwiki-view.el b/cwiki-view.el
index 1605d68..85dc284 100644 (file)
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -14,6 +14,9 @@
     (setq format 'default))
   (unless value
     (setq value (www-get-feature-value char feature-name)))
+  (if (and (symbolp value)
+          (eq format 'wiki-text))
+      (setq value (list (list value))))
   (princ
    (format "<p><input type=\"text\" name=\"feature-name\"
 size=\"32\" maxlength=\"256\" value=\"%s\">"
@@ -35,8 +38,7 @@ size=\"64\" maxlength=\"256\" value=\"%s\">
                         ((eq c ?\u0022) "&quot;")
                         (t
                          (char-to-string c))))
-                     (www-format-value char feature-name
-                                       value format 'without-tags)
+                     (est-format-list value format nil nil " ")
                      "")))
   )
 
@@ -116,11 +118,7 @@ size=\"64\" maxlength=\"256\" value=\"%s\">
       (princ (format "<h%d>%s%s</h%d>\n"
                     level
                     (www-format-encode-string
-                     (est-format-object object)
-                      ;; (if (eq genre 'character)
-                      ;;     (char-to-string object)
-                      ;;   (format "%s" (concord-object-id object)))
-                     )
+                     (est-format-object object 'readable))
                     (if GlyphWiki-id
                         (format
                          " <a href=\"http://glyphwiki.org/wiki/%s\"><img alt=\"%s\" src=\"http://glyphwiki.org/glyph/%s.50px.png\" /></a>"
@@ -323,7 +321,8 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
                    (or (www-feature-value-format feature-name)
                        'default)
                    'default
-                   'without-tags)))
+                   'without-tags)
+                  ))
     (unless simple
       (princ
        (format