From e9af3faf2e8fbe30179a09c9fa6890c796b88d03 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Thu, 14 Oct 2010 11:23:12 +0900 Subject: [PATCH] (www-display-object-desc): Fix problem when `object' is not a character. (www-batch-view): Support general genres. --- cwiki-view.el | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/cwiki-view.el b/cwiki-view.el index 075fce9..a83e0ec 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -59,7 +59,10 @@ (setq GlyphWiki-id (char-GlyphWiki-id object))) (princ (format "%s%s\n" level - (www-format-encode-string (char-to-string object)) + (www-format-encode-string + (if (eq genre 'character) + (char-to-string object) + (format "%s" (concord-object-id object)))) (if GlyphWiki-id (format " \"%s\"" @@ -125,12 +128,18 @@ "
\n") (princ (www-format-encode-string - (format "%c" object))) + (if (eq genre 'character) + (format "%c" object) + (format "%s" (concord-object-id object))))) (princ (format " " - (encode-coding-string (char-to-string object) 'utf-8-jp-er))) + (encode-coding-string + (if (eq genre 'character) + (char-to-string object) + (format "%s" (concord-object-id object))) + 'utf-8-jp-er))) (princ (www-format-encode-string "を\u542Bむ\u6F22\u5B57を\u63A2す")) @@ -310,9 +319,16 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" ((eq (car ret) 'feature) (www-display-feature-desc (decode-uri-string (cdr ret) 'utf-8-mcs-er) - (cdr (assq 'char target)) + (cdr (assq 'char target)) lang (eq mode 'simple)) + ) + (t + (www-display-object-desc + (car ret) + (cdr ret) + lang nil + (eq mode 'simple)) )) )) (princ "\n
\n") -- 1.7.10.4