(www-format-encode-string): Display "&U-vnnn-xxxx;"; omit support for

"&{o|G|g2|R}-U-innn+xxxx;".
(coded-charset-GlyphWiki-id-alist): Add setting for `==ucs@unicode'.

diff --git a/cwiki-common.el b/cwiki-common.el
index bfc383d..cf49f79 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1018,9 +1018,9 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?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))
+         (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))
            (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\">"
@@ -1032,6 +1032,20 @@ 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))
+           (replace-match
+            (format "<img alt=\"u%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/u%04x-var-%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 "&\\(A-\\|G-\\|R-\\|g2-\\)?GT-\\([0-9]+\\);" nil t)
            (setq code (string-to-int (match-string 2)))
            (replace-match
@@ -1237,6 +1251,7 @@ style=\"vertical-align:middle\">"
     (==ucs@jis         "u"     4 x nil)
     (==ucs@iso         "u"     4 x nil)
     (==ucs@cns         "u"     4 x "-t")
+    (==ucs@unicode     "u"     4 x "-us")
     (==daikanwa                "dkw-"  5 d nil)
     (==ucs@ks          "u"     4 x "-k")
     (==jis-x0208@1978  "j78-"  4 x nil)
@@ -1267,12 +1282,8 @@ style=\"vertical-align:middle\">"
     (=jis-x0213-1@2000 "jx1-2000-" 4 x nil)
     (=jis-x0213-1@2004 "jx1-2004-" 4 x nil)
     (=jis-x0213-2      "jx2-"  4 x nil)
-    (=gt               "gt-"   5 d nil)
-    (=daikanwa         "dkw-"  5 d nil)
-    (=gt-k             "gt-k"  5 d nil)
     (=jef-china3       "jc3-"  4 x nil)
     (=ucs@ks           "u"     4 x "-k")
-    (=ks-x1001         "k0-"   4 x nil)
     (=jis-x0208@1978/1pr "j78-"        4 x nil)
     (=jis-x0208@1978/-4pr "j78-" 4 x nil)
     (=jis-x0208@1978   "j78-"  4 x nil)
@@ -1281,6 +1292,19 @@ style=\"vertical-align:middle\">"
     (=ucs@iso          "u"     4 x "-u")
     (=ucs@unicode      "u"     4 x "-us")
     (=big5-cdp         "cdp-"  4 x nil)
+    (=cbeta            "cb"    5 d nil)
+    (=big5-cdp-var-3   "cdp-"  4 x "-var-3")
+    (=big5-cdp-var-5   "cdp-"  4 x "-var-5")
+    (=gt-k             "gt-k"  5 d nil)
+    (=+>jis-x0208@1978 "j78-"  4 x nil)
+    (=+>jis-x0208      "j90-"  4 x nil)
+    (=+>jis-x0208@1990 "j90-"  4 x nil)
+    (=+>jis-x0208@1983 "j83-"  4 x nil)
+    (=ucs              "u"     4 x nil)
+    (=big5             "b-"    4 x nil)
+    (=daikanwa         "dkw-"  5 d nil)
+    (=gt               "gt-"   5 d nil)
+    (=ks-x1001         "k0-"   4 x nil)
     (=cns11643-1       "c1-"   4 x nil)
     (=cns11643-2       "c2-"   4 x nil)
     (=cns11643-3       "c3-"   4 x nil)
@@ -1291,15 +1315,6 @@ style=\"vertical-align:middle\">"
     (=jis-x0208                "j90-"  4 x nil)
     (=jis-x0208@1990   "j90-"  4 x nil)
     (=jis-x0208@1983   "j83-"  4 x nil)
-    (=cbeta            "cb"    5 d nil)
-    (=big5-cdp-var-3   "cdp-"  4 x "-var-3")
-    (=big5-cdp-var-5   "cdp-"  4 x "-var-5")
-    (=+>jis-x0208@1978 "j78-"  4 x nil)
-    (=+>jis-x0208      "j90-"  4 x nil)
-    (=+>jis-x0208@1990 "j90-"  4 x nil)
-    (=+>jis-x0208@1983 "j83-"  4 x nil)
-    (=ucs              "u"     4 x nil)
-    (=big5             "b-"    4 x nil)
     ))
 
 (defun char-GlyphWiki-id (char)