MNT: add xkcd prefix + switch priority order

tacaswell · tacaswell · commit b2543f67d212 · 2016-01-04T23:47:37.000-05:00
- prefer the CSS4 str -&gt; hex values because they are the 'standard'.
   The xkcd colors might be 'better', but we are not the right place to
   lead that change.  If users use CSS/HTML/X11 color in mpl they should
   expect it to match the same color set in html for embedding mpl
   figures into websites and such.

 - Provide entries in XKCD dict of all names (with and with out spaces)
   prefixed with XKCD.  Thus to get XKCD's version of blue use
   `color='xkcdblue'
diff --git a/lib/matplotlib/_color_data.py b/lib/matplotlib/_color_data.py
@@ -961,11 +961,14 @@
     'green': '#15b01a',
     'purple': '#7e1e9c'}
 
-# normalize to names with no spaces
+# normalize to names with no spaces and provide versions with XKCD
+# prefix.
 for k in list(XKCD_COLORS):
+    XKCD_COLORS['XKCD'+k] = XKCD_COLORS[k]
     _k = k.replace(' ', '')
     if _k != k:
         XKCD_COLORS[_k] = XKCD_COLORS[k]
+        XKCD_COLORS['XKCD'+_k] = XKCD_COLORS[k]
 
 
 # https://drafts.csswg.org/css-color-4/#named-colors
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -115,7 +115,7 @@ class ColorConverter(object):
         'w': '#ffffff'}
 
     cache = {}
-    CN_LOOKUPS = [colors, ] + [COLOR_NAMES[k] for k in ['xkcd', 'css4']]
+    CN_LOOKUPS = [colors, ] + [COLOR_NAMES[k] for k in ['css4', 'xkcd']]
 
     def to_rgb(self, arg):
         """
