(www-format-encode-string): Check return value of

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

diff --git a/cwiki-common.el b/cwiki-common.el
index 8777b1f..1f7e082 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1,9 +1,13 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (require 'char-db-util)
+;; (require 'concord-images)
 
 (setq file-name-coding-system 'utf-8-mcs-er)
 
 
+(concord-assign-genre 'image-resource "/usr/local/var/photo/db")
+(concord-assign-genre 'glyph-image "/usr/local/var/photo/db")
+
 (concord-assign-genre 'creator@ruimoku "/usr/local/var/ruimoku/db")
 (concord-assign-genre 'person-name@ruimoku "/usr/local/var/ruimoku/db")
 
@@ -33,6 +37,8 @@
 (mount-char-attribute-table '*instance@morpheme-entry/zh-classical)
 
 
+(concord-assign-genre 'hng-card "/usr/local/var/hng-card/db")
+
 (mount-char-attribute-table '->HNG)
 (mount-char-attribute-table '<-HNG)
 
@@ -980,12 +986,18 @@ style=\"vertical-align:middle\">"
                    (char-to-string (decode-char 'ascii (+ 96 subcode)))))
            (replace-match
             (format
-             "<img alt=\"HNG%s-%04d%s\" src=\"%s/%s/%04d%s.png\"
-style=\"vertical-align:middle; width: 48px; height: 48px\">"
+             "<div class=\"tooltip\"><img alt=\"HNG%s-%04d%s\" src=\"%s/%s/%04d%s.png\" style=\"
+vertical-align:middle; width: 48px; height: 48px\"><span
+class=\"tooltiptext\">%s</span></div>"
              plane code subcode
              chise-wiki-hng-bitmap-glyphs-url
              plane code subcode
-             www-format-char-img-style)
+             (charset-description
+              (car (find (format "HNG%s-" plane)
+                         coded-charset-entity-reference-alist
+                         :test (lambda (key cell)
+                                 (string= key (nth 1 cell))))))
+             )
             t 'literal))
 
          (goto-char (point-min))
@@ -1074,7 +1086,7 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(G-\\)?GT-K\\([0-9]+\\);" nil t)
+         (while (re-search-forward "&\\(A-\\|G-\\)?GT-K\\([0-9]+\\);" nil t)
            (setq code (string-to-int (match-string 2)))
            (replace-match
             (format "<img alt=\"GT-K%05d\" src=\"%s?char=GT-K%05d\"
@@ -1126,8 +1138,8 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&RUI6-\\([0-9A-F]+\\);" nil t)
-           (setq code (string-to-int (match-string 1) 16))
+         (while (re-search-forward "&\\(G-\\|g2-\\|R-\\)?RUI6-\\([0-9A-F]+\\);" nil t)
+           (setq code (string-to-int (match-string 2) 16))
            (replace-match
             (format "<img alt=\"RUI6-%04X\" src=\"%s?char=RUI6-%04X\"
 style=\"vertical-align:middle\">"
@@ -1171,7 +1183,9 @@ style=\"vertical-align:middle\">"
                         (or (www-get-feature-value char '->subsumptive)
                             (www-get-feature-value char '->denotational)))
                   (progn
-                    (while (and variants
+                    (if (characterp variants)
+                        (setq variants (list variants)))
+                    (while (and variants
                                 (setq ret (www-format-encode-string
                                            (char-to-string (car variants))))
                                 (string-match "&MCS-\\([0-9A-F]+\\);" ret))