(coded-charset-GlyphWiki-id-alist): Modify order to prefer

glyph-images (===foo) > abstract glyph-forms (==foo) > detailed
glyphs (=>>foo) > glyphs (=foo) > unified glyphs (=+>foo) > abstract
characters.

diff --git a/cwiki-common.el b/cwiki-common.el
index b21faea..bfc383d 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1210,20 +1210,23 @@ style=\"vertical-align:middle\">"
 ;;;
 
 (defvar coded-charset-GlyphWiki-id-alist
-  '((=ucs-var-001      "u"     4 x "-var-001")
+  '((===adobe-japan1-0 "aj1-"  5 d nil)
+    (===adobe-japan1-1 "aj1-"  5 d nil)
+    (===adobe-japan1-2 "aj1-"  5 d nil)
+    (===adobe-japan1-3 "aj1-"  5 d nil)
+    (===adobe-japan1-4 "aj1-"  5 d nil)
+    (===adobe-japan1-5 "aj1-"  5 d nil)
+    (===adobe-japan1-6 "aj1-"  5 d nil)
+    (===ucs@jis                "u"     4 x nil)
+    (===daikanwa       "dkw-"  5 d nil)
+    (===ucs@ks         "u"     4 x "-k")
+    (=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-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")
-    (=adobe-japan1-0   "aj1-"  5 d nil)
-    (=adobe-japan1-1   "aj1-"  5 d nil)
-    (=adobe-japan1-2   "aj1-"  5 d nil)
-    (=adobe-japan1-3   "aj1-"  5 d nil)
-    (=adobe-japan1-4   "aj1-"  5 d nil)
-    (=adobe-japan1-5   "aj1-"  5 d nil)
-    (=adobe-japan1-6   "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)
@@ -1231,51 +1234,53 @@ style=\"vertical-align:middle\">"
     (==adobe-japan1-4  "aj1-"  5 d nil)
     (==adobe-japan1-5  "aj1-"  5 d nil)
     (==adobe-japan1-6  "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)
-    (===adobe-japan1-3 "aj1-"  5 d nil)
-    (===adobe-japan1-4 "aj1-"  5 d nil)
-    (===adobe-japan1-5 "aj1-"  5 d nil)
-    (===adobe-japan1-6 "aj1-"  5 d nil)
+    (==ucs@jis         "u"     4 x nil)
+    (==ucs@iso         "u"     4 x nil)
+    (==ucs@cns         "u"     4 x "-t")
+    (==daikanwa                "dkw-"  5 d nil)
+    (==ucs@ks          "u"     4 x "-k")
+    (==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)
+    (=>>hanyo-denshi/ks        "koseki-" 6 d nil)
+    (=>>jis-x0208@1978 "j78-"  4 x nil)
+    (=>>big5-cdp       "cdp-"  4 x nil)
+    (=>>jis-x0208      "j90-"  4 x nil)
+    (=>>jis-x0208@1990 "j90-"  4 x nil)
+    (=>>jis-x0208@1983 "j83-"  4 x nil)
+    (=>>daikanwa       "dkw-"  5 d nil)
+    (=adobe-japan1-0   "aj1-"  5 d nil)
+    (=adobe-japan1-1   "aj1-"  5 d nil)
+    (=adobe-japan1-2   "aj1-"  5 d nil)
+    (=adobe-japan1-3   "aj1-"  5 d nil)
+    (=adobe-japan1-4   "aj1-"  5 d nil)
+    (=adobe-japan1-5   "aj1-"  5 d nil)
+    (=adobe-japan1-6   "aj1-"  5 d nil)
     (=decomposition@cid)
     (=decomposition@hanyo-denshi)
     (=hanyo-denshi/ks  "koseki-" 6 d nil)
-    (=>>hanyo-denshi/ks        "koseki-" 6 d nil)
     (=koseki           "koseki-" 6 d nil)
     (=ucs@jis          "u"     4 x nil)
-    (==ucs@jis         "u"     4 x nil)
-    (==ucs@iso         "u"     4 x nil)
-    (===ucs@jis                "u"     4 x nil)
     (=ucs@cns          "u"     4 x "-t")
-    (==ucs@cns         "u"     4 x "-t")
     (=jis-x0212                "jsp-"  4 x nil)
     (=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)
-    (==daikanwa                "dkw-"  5 d nil)
-    (===daikanwa       "dkw-"  5 d nil)
     (=gt-k             "gt-k"  5 d nil)
     (=jef-china3       "jc3-"  4 x nil)
-    (=big5             "b-"    4 x nil)
     (=ucs@ks           "u"     4 x "-k")
-    (==ucs@ks          "u"     4 x "-k")
-    (===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)
-    (=>>>jis-x0208@1978        "j78-"  4 x nil)
-    (=>>jis-x0208@1978 "j78-"  4 x nil)
-    (=+>jis-x0208@1978 "j78-"  4 x nil)
     (=ucs@JP           "u"     4 x nil)
     (=ucs@gb           "u"     4 x "-g")
     (=ucs@iso          "u"     4 x "-u")
     (=ucs@unicode      "u"     4 x "-us")
     (=big5-cdp         "cdp-"  4 x nil)
-    (=>>big5-cdp       "cdp-"  4 x nil)
     (=cns11643-1       "c1-"   4 x nil)
     (=cns11643-2       "c2-"   4 x nil)
     (=cns11643-3       "c3-"   4 x nil)
@@ -1284,22 +1289,17 @@ style=\"vertical-align:middle\">"
     (=cns11643-6       "c6-"   4 x nil)
     (=cns11643-7       "c7-"   4 x nil)
     (=jis-x0208                "j90-"  4 x nil)
-    (=>>>jis-x0208     "j90-"  4 x nil)
-    (=>>jis-x0208      "j90-"  4 x nil)
-    (=+>jis-x0208      "j90-"  4 x nil)
     (=jis-x0208@1990   "j90-"  4 x nil)
-    (=>>>jis-x0208@1990        "j90-"  4 x nil)
-    (=>>jis-x0208@1990 "j90-"  4 x nil)
-    (=+>jis-x0208@1990 "j90-"  4 x nil)
     (=jis-x0208@1983   "j83-"  4 x nil)
-    (=>>>jis-x0208@1983        "j83-"  4 x nil)
-    (=>>jis-x0208@1983 "j83-"  4 x nil)
-    (=+>jis-x0208@1983 "j83-"  4 x nil)
     (=cbeta            "cb"    5 d nil)
-    (=>>daikanwa       "dkw-"  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)