From d53970157f5b3fe43b99dde93c0dae5374051d5f Mon Sep 17 00:00:00 2001
From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Tue, 14 Nov 2017 15:44:22 +0900
Subject: [PATCH] (www-format-encode-string): - Add entity-reference setting
 for `==cbeta'. - Display "&R-CBddddd;". - Display
 "&g2-iddd+hhhh;". - Fix alt property of img tag for
 "&CDP-iddd-hhhh;". - Display "&g2-U-vddd+hhhh;".
 (coded-charset-GlyphWiki-id-alist): Add settings for
 `==ucs-itaiji-005' and `=>>adobe-japan1-{0..6}'.

---
 cwiki-common.el |   23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/cwiki-common.el b/cwiki-common.el
index 35b0915..303e5af 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -869,13 +869,14 @@
 		'(=hanziku-10	     "HZK10-" 4 X)
 		'(=hanziku-11	     "HZK11-" 4 X)
 		'(=hanziku-12	     "HZK12-" 4 X)
+		'(==cbeta		"CB" 5 d)
 		'(=big5			 "B-" 4 X)
 		'(=daikanwa		 "M-" 5 d)
 		coded-charset-entity-reference-alist)))
 	  (encode-coding-region (point-min)(point-max) 'utf-8-mcs-er)
 
 	  (goto-char (point-min))
-	  (while (re-search-forward "&\\(A-\\|G-\\|g2-\\)?CB\\([0-9]+\\);" nil t)
+	  (while (re-search-forward "&\\(A-\\|G-\\|g2-\\|R-\\)?CB\\([0-9]+\\);" nil t)
 	    (setq code (string-to-int (match-string 2)))
 	    (replace-match
 	     (format "<img alt=\"CB%05d\" src=\"%s/cb-gaiji/%02d/CB%05d.gif\"
@@ -1074,7 +1075,7 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
 
 	  (goto-char (point-min))
 	  (while (re-search-forward
-		  "&\\(A-\\)?U-i\\([0-9]+\\)\\+\\([0-9A-F]+\\);"
+		  "&\\(A-\\|g2-\\)?U-i\\([0-9]+\\)\\+\\([0-9A-F]+\\);"
 		  nil t)
 	    (setq plane (string-to-int (match-string 2))
 		  code (string-to-int (match-string 3) 16))
@@ -1106,7 +1107,7 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
 	    (setq plane (string-to-int (match-string 2))
 		  code (string-to-int (match-string 3) 16))
 	    (replace-match
-	     (format "<img alt=\"u%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/cdp-%04x-itaiji-%03d.100px.png\"
+	     (format "<img alt=\"cdp-%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/cdp-%04x-itaiji-%03d.100px.png\"
 style=\"vertical-align:middle; width: 48px; height: 48px\">"
 		     code
 		     plane
@@ -1116,11 +1117,11 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
 	     t 'literal))
 
 	  (goto-char (point-min))
-	  (while (re-search-forward "&U-v\\([0-9]+\\)\\+\\([0-9A-F]+\\);" nil t)
-	    (setq plane (string-to-int (match-string 1))
-		  code (string-to-int (match-string 2) 16))
+	  (while (re-search-forward "&\\(g2-\\)?U-v\\([0-9]+\\)\\+\\([0-9A-F]+\\);" nil t)
+	    (setq plane (string-to-int (match-string 2))
+		  code (string-to-int (match-string 3) 16))
 	    (replace-match
-	     (format "<img alt=\"u%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/u%04x-var-%03d.100px.png\"
+	     (format "<img alt=\"u%04x-var-%03d\" src=\"http://glyphwiki.org/glyph/u%04x-var-%03d.100px.png\"
 style=\"vertical-align:middle; width: 48px; height: 48px\">"
 		     code
 		     plane
@@ -1321,6 +1322,7 @@ style=\"vertical-align:middle\">"
     (===ucs@jis		"u"	4 x nil)
     (===daikanwa	"dkw-"	5 d nil)
     (===ucs@ks		"u"	4 x "-k")
+    (==ucs-itaiji-005	"u"	4 x "-itaiji-005")
     (=ucs-var-001	"u"	4 x "-var-001")
     (=ucs-var-002	"u"	4 x "-var-002")
     (=ucs-var-003	"u"	4 x "-var-003")
@@ -1352,6 +1354,13 @@ style=\"vertical-align:middle\">"
     (=>>hanyo-denshi/ks	"koseki-" 6 d nil)
     (=>>jis-x0208@1978	"j78-"	4 x nil)
     (=>>big5-cdp	"cdp-"	4 x nil)
+    (=>>adobe-japan1-0	"aj1-"	5 d nil)
+    (=>>adobe-japan1-1	"aj1-"	5 d nil)
+    (=>>adobe-japan1-2	"aj1-"	5 d nil)
+    (=>>adobe-japan1-3	"aj1-"	5 d nil)
+    (=>>adobe-japan1-4	"aj1-"	5 d nil)
+    (=>>adobe-japan1-5	"aj1-"	5 d nil)
+    (=>>adobe-japan1-6	"aj1-"	5 d nil)
     (=>>jis-x0208	"j90-"	4 x nil)
     (=>>jis-x0208@1990	"j90-"	4 x nil)
     (=>>jis-x0208@1983	"j83-"	4 x nil)
-- 
1.7.10.4