fix matplotlib#4854: set default numpoints of legend entries to 1

mdboom · Jan 4, 2016 · 418b7cc · 418b7cc
1 parent 409a943
commit 418b7cc
Show file tree

Hide file tree

Showing 33 changed files with 1,794 additions and 1,838 deletions.
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -256,7 +256,7 @@ legend.fancybox      : False  # if True, use a rounded box for the
                               # legend, else a rectangle
 legend.loc           : upper right
 legend.isaxes        : True   # this option is internally ignored
-legend.numpoints     : 2      # the number of points in the legend line
+legend.numpoints     : 1      # the number of points in the legend line
 legend.fontsize      : large
 legend.borderpad     : 0.4    # border whitespace in fontsize units
 legend.markerscale   : 1.0    # the relative size of legend markers vs. original

diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -1026,7 +1026,7 @@ def validate_hist_bins(s):
     'legend.isaxes': [True, validate_bool],
 
     # the number of points in the legend line
-    'legend.numpoints': [2, validate_int],
+    'legend.numpoints': [1, validate_int],
     # the number of points in the legend line for scatter
     'legend.scatterpoints': [3, validate_int],
     'legend.fontsize': ['large', validate_fontsize],

diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery.pdf b/lib/matplotlib/tests/baseline_images/test_axes/markevery.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery.png b/lib/matplotlib/tests/baseline_images/test_axes/markevery.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery.svg b/lib/matplotlib/tests/baseline_images/test_axes/markevery.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.pdf b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.png b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.pdf b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.pdf
diff --git a/...tlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.png b/...tlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.png