MNT: normalize X11/CSS/HTML colors

tacaswell · tacaswell · commit 010be02f1f0a · 2016-01-01T22:14:44.000-05:00
- removed darksage, lightsage, sage which are colors we added in 1ac590e These colors are now included in the XKCD mapping - correct sandybrown which mpl had as '#FAA460' but should be '#F4A460' according to the w3 group, wikipedia, the copy of rgb.txt bundled in the emacs source, and the mapping that we had bundled with AGG for a while. The original value goes back to ec45d17
diff --git a/lib/matplotlib/_color_data.py b/lib/matplotlib/_color_data.py
@@ -962,7 +962,8 @@
     'purple': '#7e1e9c'}
 
 
-X11_COLORS = {
+# https://drafts.csswg.org/css-color-4/#named-colors
+CSS4_COLORS = {
     'aliceblue':            '#F0F8FF',
     'antiquewhite':         '#FAEBD7',
     'aqua':                 '#00FFFF',
@@ -989,22 +990,24 @@
     'darkgoldenrod':        '#B8860B',
     'darkgray':             '#A9A9A9',
     'darkgreen':            '#006400',
+    'darkgrey':             '#A9A9A9',
     'darkkhaki':            '#BDB76B',
     'darkmagenta':          '#8B008B',
     'darkolivegreen':       '#556B2F',
     'darkorange':           '#FF8C00',
     'darkorchid':           '#9932CC',
     'darkred':              '#8B0000',
-    'darksage':             '#598556',
     'darksalmon':           '#E9967A',
     'darkseagreen':         '#8FBC8F',
     'darkslateblue':        '#483D8B',
     'darkslategray':        '#2F4F4F',
+    'darkslategrey':        '#2F4F4F',
     'darkturquoise':        '#00CED1',
     'darkviolet':           '#9400D3',
     'deeppink':             '#FF1493',
     'deepskyblue':          '#00BFFF',
     'dimgray':              '#696969',
+    'dimgrey':              '#696969',
     'dodgerblue':           '#1E90FF',
     'firebrick':            '#B22222',
     'floralwhite':          '#FFFAF0',
@@ -1017,6 +1020,7 @@
     'gray':                 '#808080',
     'green':                '#008000',
     'greenyellow':          '#ADFF2F',
+    'grey':                 '#808080',
     'honeydew':             '#F0FFF0',
     'hotpink':              '#FF69B4',
     'indianred':            '#CD5C5C',
@@ -1031,14 +1035,15 @@
     'lightcoral':           '#F08080',
     'lightcyan':            '#E0FFFF',
     'lightgoldenrodyellow': '#FAFAD2',
-    'lightgreen':           '#90EE90',
     'lightgray':            '#D3D3D3',
+    'lightgreen':           '#90EE90',
+    'lightgrey':            '#D3D3D3',
     'lightpink':            '#FFB6C1',
-    'lightsage':            '#BCECAC',
     'lightsalmon':          '#FFA07A',
     'lightseagreen':        '#20B2AA',
     'lightskyblue':         '#87CEFA',
     'lightslategray':       '#778899',
+    'lightslategrey':       '#778899',
     'lightsteelblue':       '#B0C4DE',
     'lightyellow':          '#FFFFE0',
     'lime':                 '#00FF00',
@@ -1078,20 +1083,21 @@
     'plum':                 '#DDA0DD',
     'powderblue':           '#B0E0E6',
     'purple':               '#800080',
+    'rebeccapurple':        '#663399',
     'red':                  '#FF0000',
     'rosybrown':            '#BC8F8F',
     'royalblue':            '#4169E1',
     'saddlebrown':          '#8B4513',
     'salmon':               '#FA8072',
-    'sage':                 '#87AE73',
-    'sandybrown':           '#FAA460',
+    'sandybrown':           '#F4A460',
     'seagreen':             '#2E8B57',
     'seashell':             '#FFF5EE',
     'sienna':               '#A0522D',
     'silver':               '#C0C0C0',
     'skyblue':              '#87CEEB',
     'slateblue':            '#6A5ACD',
     'slategray':            '#708090',
+    'slategrey':            '#708090',
     'snow':                 '#FFFAFA',
     'springgreen':          '#00FF7F',
     'steelblue':            '#4682B4',
@@ -1106,9 +1112,3 @@
     'whitesmoke':           '#F5F5F5',
     'yellow':               '#FFFF00',
     'yellowgreen':          '#9ACD32'}
-
-# add british equivs to X11 colors
-for k, v in list(six.iteritems(X11_COLORS)):
-    if k.find('gray') >= 0:
-        k = k.replace('gray', 'grey')
-        X11_COLORS[k] = v
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -56,13 +56,13 @@
 import numpy as np
 from numpy import ma
 import matplotlib.cbook as cbook
-from ._color_data import X11_COLORS, XKCD_COLORS
+from ._color_data import XKCD_COLORS, CSS4_COLORS
 
 # for back copatibility
-cnames = X11_COLORS
+cnames = CSS4_COLORS
 
-COLOR_NAMES = {'x11': X11_COLORS,
-               'xkcd': XKCD_COLORS}
+COLOR_NAMES = {'xkcd': XKCD_COLORS,
+               'css4': CSS4_COLORS}
 
 
 def is_color_like(c):
