(est-coded-charset-priority-list): Add settings for `=+>ucs@iso',

[chise/est.git] / cwiki-common.el

diff --git a/cwiki-common.el b/cwiki-common.el
index 6cb9d19..ec53465 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -85,6 +85,7 @@
     =>>gt
     =>ucs@iso =>ucs@unicode
     =>ucs@jis =>ucs@cns =>ucs@ks
+    =+>ucs@iso =+>ucs@unicode
     =>>ucs@iso =>>ucs@unicode
     =>>ucs@jis =>>ucs@cns =>>ucs@ks
     =>>>ucs@iso =>>>ucs@unicode
@@ -105,7 +106,14 @@
     ===ucs@unicode
     ==>ucs@bucs
     ===daikanwa/+p
-    ===gt))
+    ===gt
+    =>ucs@iwds-1
+    =>ucs@component
+    =>ucs-itaiji-001
+    ===adobe-japan1
+    ===cns11643-1 ===cns11643-2 ===cns11643-3
+    ===cns11643-4 ===cns11643-5 ===cns11643-6 ===cns11643-7
+    ))
 
 (defun decode-uri-string (string &optional coding-system)
   (if (> (length string) 0)
@@ -1013,7 +1021,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\"
@@ -1035,9 +1043,22 @@ 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-compU[+-]\\([0-9A-F]+\\);" nil t)
+           (setq code (string-to-int (match-string 1) 16))
+           (replace-match
+            (format "<img alt=\"u%04x\" src=\"http://glyphwiki.org/glyph/u%04x.100px.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+                    code
+                    code
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (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\">"
@@ -1086,7 +1107,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\"
@@ -1110,7 +1131,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\"
@@ -1138,7 +1160,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\"
@@ -1183,7 +1205,9 @@ style=\"vertical-align:middle\">"
                         (or (www-get-feature-value char '->subsumptive)
                             (www-get-feature-value char '->denotational)))
                   (progn
-                    (while (and variants
+                    (if (characterp variants)
+                        (setq variants (list variants)))
+                    (while (and variants
                                 (setq ret (www-format-encode-string
                                            (char-to-string (car variants))))
                                 (string-match "&MCS-\\([0-9A-F]+\\);" ret))
@@ -1269,6 +1293,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)
@@ -1313,6 +1338,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")
@@ -1333,6 +1359,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)