(www-format-encode-string): Add setting for `=mj' and `==mj'.

(coded-charset-GlyphWiki-id-alist): Don't prefer `=ucs' to other
CCSes.

diff --git a/cwiki-common.el b/cwiki-common.el
index 78766fe..6e5abc3 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -754,6 +754,7 @@
        (let ((coded-charset-entity-reference-alist
               (list*
                '(=gt                   "GT-" 5 d)
        (let ((coded-charset-entity-reference-alist
               (list*
                '(=gt                   "GT-" 5 d)

+               '(=mj                    "MJ" 6 d)

                '(=hanyo-denshi/ja   "HD-JA-" 4 X)
                '(=hanyo-denshi/jb   "HD-JB-" 4 X)
                '(=hanyo-denshi/jc   "HD-JC-" 4 X)
                '(=hanyo-denshi/ja   "HD-JA-" 4 X)
                '(=hanyo-denshi/jb   "HD-JB-" 4 X)
                '(=hanyo-denshi/jc   "HD-JC-" 4 X)

@@ -776,6 +777,7 @@
                '(=>>hanyo-denshi/ip "G-HD-IP-" 4 X)
                '(=>>hanyo-denshi/jt "G-HD-JT-" 4 X)
                '(=>>hanyo-denshi/ks "G-HD-KS-" 6 d)
                '(=>>hanyo-denshi/ip "G-HD-IP-" 4 X)
                '(=>>hanyo-denshi/jt "G-HD-JT-" 4 X)
                '(=>>hanyo-denshi/ks "G-HD-KS-" 6 d)

+               '(==mj                  "g2-MJ" 6 d)

                '(==hanyo-denshi/ja "g2-HD-JA-" 4 X)
                '(==hanyo-denshi/jb "g2-HD-JB-" 4 X)
                '(==hanyo-denshi/jc "g2-HD-JC-" 4 X)
                '(==hanyo-denshi/ja "g2-HD-JA-" 4 X)
                '(==hanyo-denshi/jb "g2-HD-JB-" 4 X)
                '(==hanyo-denshi/jc "g2-HD-JC-" 4 X)

@@ -1214,7 +1216,6 @@ 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-002   "u"     4 x "-itaiji-002")
     (=ucs-itaiji-003   "u"     4 x "-itaiji-003")
     (=ucs-itaiji-084   "u"     4 x "-itaiji-084")

-    (=ucs              "u"     4 x nil)

     (=adobe-japan1-0   "aj1-"  5 d nil)
     (=adobe-japan1-1   "aj1-"  5 d nil)
     (=adobe-japan1-2   "aj1-"  5 d nil)
     (=adobe-japan1-0   "aj1-"  5 d nil)
     (=adobe-japan1-1   "aj1-"  5 d nil)
     (=adobe-japan1-2   "aj1-"  5 d nil)

@@ -1297,6 +1298,7 @@ style=\"vertical-align:middle\">"
     (=>>daikanwa       "dkw-"  5 d nil)
     (=big5-cdp-var-3   "cdp-"  4 x "-var-3")
     (=big5-cdp-var-5   "cdp-"  4 x "-var-5")
     (=>>daikanwa       "dkw-"  5 d nil)
     (=big5-cdp-var-3   "cdp-"  4 x "-var-3")
     (=big5-cdp-var-5   "cdp-"  4 x "-var-5")

+    (=ucs              "u"     4 x nil)

     ))
 
 (defun char-GlyphWiki-id (char)
     ))
 
 (defun char-GlyphWiki-id (char)