(est-coded-charset-priority-list): Add `=ucs-itaiji-004',

`=ucs-itaiji-005', `=ucs-itaiji-006', `=ucs-itaiji-007',
`=ucs-itaiji-008', `=ucs-itaiji-009', `=ucs-itaiji-010',
`=ucs-itaiji-011', `=ucs-itaiji-084', `=ucs-var-001', `=ucs-var-002',
`=ucs-var-003', `=ucs-var-004', `=>ucs-itaiji-002',
`=>ucs-itaiji-003', `=>ucs-itaiji-004', `=>ucs-itaiji-005',
`=>ucs-itaiji-006' and `=>ucs-itaiji-007'.
(www-format-encode-string): Display "&(A-)CDP-iddd-hhhh;".
(coded-charset-GlyphWiki-id-alist): Add settings for `=ucs-var-004',
`=>ucs-itaiji-006', `=big5-cdp-itaiji-001', `=big5-cdp-itaiji-002' and
`=>big5-cdp-itaiji-001'.

diff --git a/cwiki-common.el b/cwiki-common.el
index ec53465..35b0915 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -101,6 +101,19 @@
     =ucs-itaiji-001
     =ucs-itaiji-002
     =ucs-itaiji-003
+    =ucs-itaiji-004
+    =ucs-itaiji-005
+    =ucs-itaiji-006
+    =ucs-itaiji-007
+    =ucs-itaiji-008
+    =ucs-itaiji-009
+    =ucs-itaiji-010
+    =ucs-itaiji-011
+    =ucs-itaiji-084
+    =ucs-var-001
+    =ucs-var-002
+    =ucs-var-003
+    =ucs-var-004
     =ucs@unicode
     ==ucs@unicode
     ===ucs@unicode
@@ -110,6 +123,12 @@
     =>ucs@iwds-1
     =>ucs@component
     =>ucs-itaiji-001
+    =>ucs-itaiji-002
+    =>ucs-itaiji-003
+    =>ucs-itaiji-004
+    =>ucs-itaiji-005
+    =>ucs-itaiji-006
+    =>ucs-itaiji-007
     ===adobe-japan1
     ===cns11643-1 ===cns11643-2 ===cns11643-3
     ===cns11643-4 ===cns11643-5 ===cns11643-6 ===cns11643-7
@@ -1081,6 +1100,22 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
             t 'literal))
 
          (goto-char (point-min))
+         (while (re-search-forward
+                 "&\\(A-\\)?CDP-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/cdp-%04x-itaiji-%03d.100px.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+                    code
+                    plane
+                    code
+                    plane
+                    www-format-char-img-style)
+            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))
@@ -1289,11 +1324,13 @@ style=\"vertical-align:middle\">"
     (=ucs-var-001      "u"     4 x "-var-001")
     (=ucs-var-002      "u"     4 x "-var-002")
     (=ucs-var-003      "u"     4 x "-var-003")
+    (=ucs-var-004      "u"     4 x "-var-004")
     (=ucs-itaiji-001   "u"     4 x "-itaiji-001")
     (=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")
+    (=>ucs-itaiji-006  "u"     4 x "-itaiji-006")
     (==adobe-japan1-0  "aj1-"  5 d nil)
     (==adobe-japan1-1  "aj1-"  5 d nil)
     (==adobe-japan1-2  "aj1-"  5 d nil)
@@ -1342,6 +1379,9 @@ style=\"vertical-align:middle\">"
     (=cbeta           "cbeta-" 5 d nil)
     (=big5-cdp-var-3   "cdp-"  4 x "-var-3")
     (=big5-cdp-var-5   "cdp-"  4 x "-var-5")
+    (=big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001")
+    (=big5-cdp-itaiji-002 "cdp-" 4 x "-itaiji-002")
+    (=>big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001")
     (=jef-china3       "jc3-"  4 x nil)
     (=jis-x0212                "jsp-"  4 x nil)
     (=jis-x0213-1@2000 "jx1-2000-" 4 x nil)