(est-coded-charset-priority-list): Add `=>ucs-itaiji-001'.

(www-format-encode-string): Display "&A-MJdddddd;", "&A-U-iddd+hhhh;",
"&g2-GT-Kddddd;", "&A-CDP-hhhh;" and "&A-RUI6-hhhh;" entity
references.
(coded-charset-GlyphWiki-id-alist): Add settings for
`=>ucs-itaiji-001', `=>big5-cdp', `=ruimoku-v6' and `=>ruimoku-v6'.

diff --git a/cwiki-common.el b/cwiki-common.el
index 51c36be..2ddf4a7 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -107,7 +107,9 @@
     ===daikanwa/+p
     ===gt
     =>ucs@iwds-1
-    =>ucs@component))
+    =>ucs@component
+    =>ucs-itaiji-001
+    ))
 
 (defun decode-uri-string (string &optional coding-system)
   (if (> (length string) 0)
@@ -1015,7 +1017,7 @@ style=\"vertical-align:middle\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?MJ\\([0-9]+\\);" nil t)
+         (while (re-search-forward "&\\(A-\\|o-\\|G-\\|g2-\\|R-\\)?MJ\\([0-9]+\\);" nil t)
            (setq code (string-to-int (match-string 2)))
            (replace-match
             (format "<img alt=\"MJ%06d\" src=\"http://mojikiban.ipa.go.jp/search/MJ%06d\"
@@ -1048,9 +1050,11 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&U-i\\([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
+                 "&\\(A-\\)?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))
            (replace-match
             (format "<img alt=\"u%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/u%04x-itaiji-%03d.100px.png\"
 style=\"vertical-align:middle; width: 48px; height: 48px\">"
@@ -1099,7 +1103,7 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(A-\\|G-\\)?GT-K\\([0-9]+\\);" nil t)
+         (while (re-search-forward "&\\(A-\\|G-\\|g2-\\)?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\"
@@ -1123,7 +1127,8 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(G-\\|g2-\\|R-\\)?CDP-\\([0-9A-F]+\\);" nil t)
+         (while (re-search-forward
+                 "&\\(A-\\|G-\\|g2-\\|R-\\)?CDP-\\([0-9A-F]+\\);" nil t)
            (setq code (string-to-int (match-string 2) 16))
            (replace-match
             (format "<img alt=\"CDP-%04X\" src=\"%s?char=CDP-%04X\"
@@ -1151,7 +1156,7 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(G-\\|g2-\\|R-\\)?RUI6-\\([0-9A-F]+\\);" nil t)
+         (while (re-search-forward "&\\(A-\\|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\"
@@ -1284,6 +1289,7 @@ style=\"vertical-align:middle\">"
     (=ucs-itaiji-002   "u"     4 x "-itaiji-002")
     (=ucs-itaiji-003   "u"     4 x "-itaiji-003")
     (=ucs-itaiji-084   "u"     4 x "-itaiji-084")
+    (=>ucs-itaiji-001  "u"     4 x "-itaiji-001")
     (==adobe-japan1-0  "aj1-"  5 d nil)
     (==adobe-japan1-1  "aj1-"  5 d nil)
     (==adobe-japan1-2  "aj1-"  5 d nil)
@@ -1328,6 +1334,7 @@ style=\"vertical-align:middle\">"
     (=ucs@iso          "u"     4 x "-u")
     (=ucs@unicode      "u"     4 x "-us")
     (=big5-cdp         "cdp-"  4 x nil)
+    (=>big5-cdp                "cdp-"  4 x nil)
     (=cbeta           "cbeta-" 5 d nil)
     (=big5-cdp-var-3   "cdp-"  4 x "-var-3")
     (=big5-cdp-var-5   "cdp-"  4 x "-var-5")
@@ -1348,6 +1355,8 @@ style=\"vertical-align:middle\">"
     (=big5             "b-"    4 x nil)
     (=daikanwa         "dkw-"  5 d nil)
     (=gt               "gt-"   5 d nil)
+    (=ruimoku-v6       "rui6-" 4 x nil)
+    (=>ruimoku-v6      "rui6-" 4 x nil)
     (=ks-x1001         "k0-"   4 x nil)
     (=cns11643-1       "c1-"   4 x nil)
     (=cns11643-2       "c2-"   4 x nil)