(est-coded-charset-priority-list): Add `=>cbeta'.

(www-format-encode-string): Support &A-CBddddd;

diff --git a/cwiki-common.el b/cwiki-common.el
index f931c80..1454ece 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -87,6 +87,7 @@
     =ruimoku-v6
     =big5
     =big5-cdp
+    =>cbeta
     =ucs-itaiji-001
     =ucs-itaiji-002))
 
@@ -816,8 +817,8 @@
          (encode-coding-region (point-min)(point-max) 'utf-8-mcs-er)
 
          (goto-char (point-min))
-         (while (re-search-forward "&CB\\([0-9]+\\);" nil t)
-           (setq code (string-to-int (match-string 1)))
+         (while (re-search-forward "&\\(A-\\)?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\"
 style=\"%s\">"