From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Fri, 14 Dec 2018 10:25:37 +0000 (+0900)
Subject: (www-format-encode-string):
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1a11294a6e72f8632243e3835f4094cc88b407db;p=chise%2Fest.git

(www-format-encode-string):
- Add code for &SW-JIGUGE[45]-ddddd;.
- Use "width: auto; max-height: 60px" instead of "width: 48px; height:
  48px" for HNG glyph images.
---

diff --git a/cwiki-common.el b/cwiki-common.el
index 9817062..cd01912 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1019,6 +1019,27 @@ style=\"vertical-align:middle\">"
 	     t 'literal))
 
 	  (goto-char (point-min))
+	  (while (re-search-forward "&SW-JIGUGE\\([45]?\\)-\\([0-9]+\\);" nil t)
+	    (setq subcode (match-string 1)
+		  code (string-to-int (match-string 2)))
+	    (setq plane
+		  (if (string= subcode "")
+		      "5"
+		    subcode))
+	    (replace-match
+	     (format "<div class=\"tooltip\"><img alt=\"SW-JIGUGE%s-%05d\" src=\"%s/ShuoWen/Jiguge%s/%05d.png\"
+style=\"vertical-align:middle; width: auto; max-height: 80px\"><span
+class=\"tooltiptext\">%s</span></div>"
+		     plane code
+		     chise-wiki-bitmap-glyphs-url
+		     plane code
+		     (charset-description
+		      (if (string= subcode "")
+			  '=shuowen-jiguge
+			(intern (format "===shuowen-jiguge%s" subcode)))))
+	     t 'literal))
+
+	  (goto-char (point-min))
 	  (while (re-search-forward "&HNG\\([0-9]+\\)-\\([0-9][0-9][0-9][0-9]\\)\\([0-9]\\);" nil t)
 	    (setq plane (match-string 1)
 		  code (string-to-int (match-string 2))
@@ -1030,7 +1051,7 @@ style=\"vertical-align:middle\">"
 	    (replace-match
 	     (format
 	      "<div class=\"tooltip\"><img alt=\"HNG%s-%04d%s\" src=\"%s/%s/%04d%s.png\" style=\"
-vertical-align:middle; width: 48px; height: 48px\"><span
+vertical-align:middle; width: auto; max-height: 60px\"><span
 class=\"tooltiptext\">%s</span></div>"
 	      plane code subcode
 	      chise-wiki-hng-bitmap-glyphs-url