Rearrange styles

Now there are 4 styles in total. Tableau 10, Tableau 20, and Tableau’s color blind friendly all enact color style changes. The “clean” style performs all of my custom plot formatting, as seen in the “Bachelors degree” example. I removed the figsize changes in my custom formatting. Examples have also been updated in accordance with the changes.
matplotlib · rhiever · Oct 22, 2014 · Oct 22, 2014 · Oct 22, 2014 · Oct 22, 2014
commit 98c1d8c3c4b32894d1db58d1cee4ccf3307dd9f0
diff --git a/examples/showcase/bachelors_degrees_by_gender.py b/examples/showcase/bachelors_degrees_by_gender.py
@@ -2,8 +2,9 @@
 from matplotlib.mlab import csv2rec
 from matplotlib.cbook import get_sample_data
 
-# Activate the Tableau 20 styling. This call does most of the styling for you.
-plt.style.use("tableau20")
+# Activate the Tableau 20 and clean styling.
+# This call does most of the styling for you.
+plt.style.use(["clean", "tableau_20colors"])
 
 fname = get_sample_data("percent_bachelors_degrees_women_usa.csv")
 gender_degree_data = csv2rec(fname)

diff --git a/examples/style_sheets/plot_tableau10.py → examples/style_sheets/plot_clean.py b/examples/style_sheets/plot_tableau10.py → examples/style_sheets/plot_clean.py
@@ -1,6 +1,5 @@
 """
-This shows an example of the "tableau10" styling, which 
-uses Tableau's "Tableau10" color scheme.
+This shows an example of the "clean" styling.
 """
 
 
@@ -9,7 +8,7 @@
 
 x = np.linspace(0, 10)
 
-with plt.style.context('tableau10'):
+with plt.style.context('clean'):
     plt.plot(x, np.sin(x) + x + np.random.randn(50))
     plt.plot(x, np.sin(x) + 0.5 * x + np.random.randn(50))
     plt.plot(x, np.sin(x) + 2 * x + np.random.randn(50))

diff --git a/examples/style_sheets/plot_colorblind_10colors.py b/examples/style_sheets/plot_colorblind_10colors.py
@@ -0,0 +1,20 @@
+"""
+This shows an example of the "colorblind_10colors" styling,
+which  uses Tableau's "Color Blind 10" color scheme.
+"""
+
+
+from matplotlib import pyplot as plt
+import numpy as np
+
+x = np.linspace(0, 10)
+
+with plt.style.context('colorblind_10colors'):
+    plt.plot(x, np.sin(x) + x + np.random.randn(50))
+    plt.plot(x, np.sin(x) + 0.5 * x + np.random.randn(50))
+    plt.plot(x, np.sin(x) + 2 * x + np.random.randn(50))
+    plt.plot(x, np.sin(x) + 3 * x + np.random.randn(50))
+    plt.plot(x, np.sin(x) + 4 * x + np.random.randn(50))
+    plt.plot(x, np.sin(x) + 5 * x + np.random.randn(50))
+
+plt.show()
diff --git a/examples/style_sheets/plot_colorblind10.py → ...les/style_sheets/plot_tableau_10colors.py b/examples/style_sheets/plot_colorblind10.py → ...les/style_sheets/plot_tableau_10colors.py
@@ -1,6 +1,6 @@
 """
-This shows an example of the "colorblind10" styling, which 
-uses Tableau's "Color Blind 10" color scheme.
+This shows an example of the "tableau_10colors" styling,
+which uses Tableau's "Tableau 10" color scheme.
 """
 
 
@@ -9,7 +9,7 @@
 
 x = np.linspace(0, 10)
 
-with plt.style.context('colorblind10'):
+with plt.style.context('tableau_10colors'):
     plt.plot(x, np.sin(x) + x + np.random.randn(50))
     plt.plot(x, np.sin(x) + 0.5 * x + np.random.randn(50))
     plt.plot(x, np.sin(x) + 2 * x + np.random.randn(50))

diff --git a/examples/style_sheets/plot_tableau20.py → ...les/style_sheets/plot_tableau_20colors.py b/examples/style_sheets/plot_tableau20.py → ...les/style_sheets/plot_tableau_20colors.py
@@ -1,6 +1,6 @@
 """
-This shows an example of the "tableau10" styling, which 
-uses Tableau's "Tableau20" color scheme.
+This shows an example of the "tableau_20colors" styling,
+which uses Tableau's "Tableau 20" color scheme.
 """
 
 
@@ -9,7 +9,7 @@
 
 x = np.linspace(0, 10)
 
-with plt.style.context('tableau20'):
+with plt.style.context('tableau_20colors'):
     plt.plot(x, np.sin(x) + x + np.random.randn(50))
     plt.plot(x, np.sin(x) + 0.5 * x + np.random.randn(50))
     plt.plot(x, np.sin(x) + 2 * x + np.random.randn(50))

diff --git a/...tlib/mpl-data/stylelib/tableau10.mplstyle → ...tplotlib/mpl-data/stylelib/clean.mplstyle b/...tlib/mpl-data/stylelib/tableau10.mplstyle → ...tplotlib/mpl-data/stylelib/clean.mplstyle
@@ -1,7 +1,6 @@
 # Author: Randal S. Olson (randalolson.com / @randal_olson)
-# Uses Tableau's Tableau10 color scheme
+# Produces a clean plotting template with default matplotlib colors.
 
-figure.figsize: 12, 7
 figure.edgecolor: white
 figure.facecolor: white
 
@@ -14,7 +13,6 @@ legend.fancybox: True
 
 font.size: 14
 
-axes.color_cycle: 1f77b4, ff7f0e, 2ca02c, d62728, 9467bd, 8c564b, e377c2, 7f7f7f, bcbd22, 17becf
 axes.linewidth: 0
 axes.titlesize: 22
 axes.labelsize: 16

diff --git a/lib/matplotlib/mpl-data/stylelib/colorblind10.mplstyle b/lib/matplotlib/mpl-data/stylelib/colorblind10.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/colorblind_10colors.mplstyle b/lib/matplotlib/mpl-data/stylelib/colorblind_10colors.mplstyle
@@ -0,0 +1,4 @@
+# Author: Randal S. Olson (randalolson.com / @randal_olson)
+# Uses Tableau's Color Blind 10 color scheme
+
+axes.color_cycle: 006ba4, ff800e, ababab, 595959, 5f9ed1, c85200, 898989, a2c8ec, ffbc79, cfcfcf
diff --git a/lib/matplotlib/mpl-data/stylelib/tableau20.mplstyle b/lib/matplotlib/mpl-data/stylelib/tableau20.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/tableau_10colors.mplstyle b/lib/matplotlib/mpl-data/stylelib/tableau_10colors.mplstyle
@@ -0,0 +1,4 @@
+# Author: Randal S. Olson (randalolson.com / @randal_olson)
+# Uses Tableau's Tableau 10 color scheme
+
+axes.color_cycle: 1f77b4, ff7f0e, 2ca02c, d62728, 9467bd, 8c564b, e377c2, 7f7f7f, bcbd22, 17becf
diff --git a/lib/matplotlib/mpl-data/stylelib/tableau_20colors.mplstyle b/lib/matplotlib/mpl-data/stylelib/tableau_20colors.mplstyle
@@ -0,0 +1,4 @@
+# Author: Randal S. Olson (randalolson.com / @randal_olson)
+# Uses Tableau's Tableau 20 color scheme
+
+axes.color_cycle: 1f77b4, aec7e8, ff7f0e, ffbb78, 2ca02c, 98df8a, d62728, ff9896, 9467bd, c5b0d5, 8c564b, c49c94, e377c2, f7b6d2, 7f7f7f, c7c7c7, bcbd22, dbdb8d, 17becf, 9edae5