Adding names to the color in the new Vega10 color cycle

trpham · tacaswell · commit 44d71277fa3b · 2017-01-16T15:12:16.000-05:00
diff --git a/doc/users/colors.rst b/doc/users/colors.rst
@@ -17,6 +17,9 @@ it can be provided as:
 * a name from the `xkcd color survey <https://xkcd.com/color/rgb/>`__
   prefixed with ``'xkcd:'`` (e.g., ``'xkcd:sky blue'``)
 * one of ``{'C0', 'C1', 'C2', 'C3', 'C4', 'C5', 'C6', 'C7', 'C8', 'C9'}``
+* one of ``{'vega:blue', 'vega:orange', 'vega:green',
+  'vega:red', 'vega:purple', 'vega:brown', 'vega:pink',
+  'vega:gray', 'vega:olive', 'vega:cyan'}``
 
 All string specifications of color are case-insensitive.
 
diff --git a/lib/matplotlib/_color_data.py b/lib/matplotlib/_color_data.py
@@ -15,6 +15,23 @@
     'w': (1, 1, 1)}
 
 
+VEGA_COLORS = {
+    'blue': '#1f77b4',
+    'orange': '#ff7f0e',
+    'green': '#2ca02c',
+    'red': '#d62728',
+    'purple': '#9467bd',
+    'brown': '#8c564b',
+    'pink': '#e377c2',
+    'gray': '#7f7f7f',
+    'olive': '#bcbd22',
+    'cyan': '#17becf'}
+
+
+# Normalize name to "vega10:<name>" to avoid name collisions.
+VEGA_COLORS = {'vega:' + name: value for name, value in VEGA_COLORS.items()}
+
+
 # This mapping of color names -> hex values is taken from
 # a survey run by Randel Monroe see:
 # http://blog.xkcd.com/2010/05/03/color-survey-results/
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -66,7 +66,7 @@
 import numpy as np
 from numpy import ma
 import matplotlib.cbook as cbook
-from ._color_data import BASE_COLORS, CSS4_COLORS, XKCD_COLORS
+from ._color_data import BASE_COLORS, VEGA_COLORS, CSS4_COLORS, XKCD_COLORS
 
 
 class _ColorMapping(dict):
@@ -87,6 +87,7 @@ def __delitem__(self, key, value):
 # Set by reverse priority order.
 _colors_full_map.update(XKCD_COLORS)
 _colors_full_map.update(CSS4_COLORS)
+_colors_full_map.update(VEGA_COLORS)
 _colors_full_map.update(BASE_COLORS)
 _colors_full_map = _ColorMapping(_colors_full_map)
 
@@ -253,7 +254,7 @@ def to_hex(c, keep_alpha=False):
 ### Backwards-compatible color-conversion API
 
 cnames = CSS4_COLORS
-COLOR_NAMES = {'xkcd': XKCD_COLORS, 'css4': CSS4_COLORS}
+COLOR_NAMES = {'xkcd': XKCD_COLORS, 'css4': CSS4_COLORS, 'vega': VEGA_COLORS}
 hexColorPattern = re.compile("\A#[a-fA-F0-9]{6}\Z")
 
 
@@ -404,7 +405,7 @@ class Colormap(object):
 
     """
     def __init__(self, name, N=256):
-        r"""
+        """
         Parameters
         ----------
         name : str
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -571,9 +571,10 @@ def angled_plane(azimuth, elevation, angle, x, y):
             assert_array_almost_equal(h, np.cos(np.radians(angle)))
 
 
-def test_xkcd():
+def test_color_names():
     assert mcolors.to_hex("blue") == "#0000ff"
     assert mcolors.to_hex("xkcd:blue") == "#0343df"
+    assert mcolors.to_hex("vega:blue") == "#1f77b4"
 
 
 def _sph2cart(theta, phi):
