(www-display-object-desc): New function.

diff --git a/cwiki-view.el b/cwiki-view.el
index a83e0ec..28c25f4 100644 (file)
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -60,9 +60,11 @@
       (princ (format "<h%d>%s%s</h%d>\n"
                     level
                     (www-format-encode-string
-                     (if (eq genre 'character)
-                         (char-to-string object)
-                       (format "%s" (concord-object-id object))))
+                     (est-format-object object)
+                      ;; (if (eq genre 'character)
+                      ;;     (char-to-string object)
+                      ;;   (format "%s" (concord-object-id object)))
+                     )
                     (if GlyphWiki-id
                         (format
                          " <a href=\"http://glyphwiki.org/wiki/%s\"><img alt=\"%s\" src=\"http://glyphwiki.org/glyph/%s.50px.png\" /></a>"
@@ -128,17 +130,20 @@
        "<form action=\"http://chise.zinbun.kyoto-u.ac.jp/ids-find\">\n")
       (princ
        (www-format-encode-string
-       (if (eq genre 'character)
-           (format "%c" object)
-         (format "%s" (concord-object-id object)))))
+       (est-format-object object)
+        ;; (if (eq genre 'character)
+        ;;     (format "%c" object)
+        ;;   (format "%s" (concord-object-id object)))
+       ))
       (princ
        (format
        " <input type=\"text\" name=\"components\"
 size=\"30\" maxlength=\"30\" value=\"%s\" />"
        (encode-coding-string
-        (if (eq genre 'character)
-            (char-to-string object)
-          (format "%s" (concord-object-id object)))
+         (est-format-object object)
+        ;; (if (eq genre 'character)
+         ;;     (char-to-string object)
+         ;;   (format "%s" (concord-object-id object)))
         'utf-8-jp-er)))
       (princ
        (www-format-encode-string