Merge remote-tracking branch 'matplotlib/v2.x'

Author: jenshnielsen

.travis.yml

@@ -147,7 +147,7 @@ script:
       fi
     else
       cd doc
-      python make.py html --small
+      python make.py html
       # We don't build the LaTeX docs here, so linkchecker will complain
       touch build/html/Matplotlib.pdf
       # Linkchecker only works with python 2.7 for the time being

doc/api/api_changes/2016-07-20-EF.rst

@@ -0,0 +1,10 @@
+`Legend` initializers gain edgecolor and facecolor kwargs
+``````````````````````````````````````````````````````````
+
+The :class:`~matplotlib.legend.Legend` background patch (or 'frame')
+can have its `edgecolor` and `facecolor` determined by the
+corresponding keyword arguments to its initializer, or to any of the
+methods or functions that call that initializer.  If left to
+their default values of `None`, their values will be taken from
+`rcParams`.  The previously-existing `framealpha` kwarg still
+controls the alpha transparency of the patch.

doc/conf.py

@@ -115,7 +115,7 @@
 # Plot directive configuration
 # ----------------------------
 
-plot_formats = [('svg', 72), ('png', 80)]
+plot_formats = [('svg', 72), ('png', 100)]
 
 # Subdirectories in 'examples/' directory of package and titles for gallery
 mpl_example_sections = [

doc/make.py

@@ -47,7 +47,7 @@ def html(buildername='html'):
     copy_if_out_of_date(rc, '_static/matplotlibrc')
 
     if small_docs:
-        options = "-D plot_formats=png:80"
+        options = "-D plot_formats=png:100"
     else:
         options = ''
     if warnings_as_errors:

lib/matplotlib/axes/_axes.py

@@ -410,7 +410,7 @@ def legend(self, *args, **kwargs):
             label
 
         frameon : None or bool
-            Control whether a frame should be drawn around the legend.
+            Control whether the legend should be drawn on a patch (frame).
             Default is ``None`` which will take the value from the
             ``legend.frameon`` :data:`rcParam<matplotlib.rcParams>`.
 
@@ -427,10 +427,24 @@ def legend(self, *args, **kwargs):
             ``legend.shadow`` :data:`rcParam<matplotlib.rcParams>`.
 
         framealpha : None or float
-            Control the alpha transparency of the legend's frame.
+            Control the alpha transparency of the legend's background.
             Default is ``None`` which will take the value from the
             ``legend.framealpha`` :data:`rcParam<matplotlib.rcParams>`.
 
+        facecolor : None or "inherit" or a color spec
+            Control the legend's background color.
+            Default is ``None`` which will take the value from the
+            ``legend.facecolor`` :data:`rcParam<matplotlib.rcParams>`.
+            If ``"inherit"``, it will take the ``axes.facecolor``
+            :data:`rcParam<matplotlib.rcParams>`.
+
+        edgecolor : None or "inherit" or a color spec
+            Control the legend's background patch edge color.
+            Default is ``None`` which will take the value from the
+            ``legend.edgecolor`` :data:`rcParam<matplotlib.rcParams>`.
+            If ``"inherit"``, it will take the ``axes.edgecolor``
+            :data:`rcParam<matplotlib.rcParams>`.
+
         mode : {"expand", None}
             If `mode` is set to ``"expand"`` the legend will be horizontally
             expanded to fill the axes area (or `bbox_to_anchor` if defines

lib/matplotlib/contour.py

@@ -1148,7 +1148,7 @@ def _autolev(self, N):
             if self.logscale:
                 self.locator = ticker.LogLocator()
             else:
-                self.locator = ticker.MaxNLocator(N + 1)
+                self.locator = ticker.MaxNLocator(N + 1, min_n_ticks=1)
         zmax = self.zmax
         zmin = self.zmin
         lev = self.locator.tick_values(zmin, zmax)

lib/matplotlib/figure.py

@@ -1339,12 +1339,36 @@ def legend(self, handles, labels, *args, **kwargs):
             if *False*, legend marker is placed to the right of the legend
             label
 
+          *frameon*: [ *None* | bool ]
+            Control whether the legend should be drawn on a patch (frame).
+            Default is *None* which will take the value from the
+            ``legend.frameon`` :data:`rcParam<matplotlib.rcParams>`.
+
           *fancybox*: [ *None* | *False* | *True* ]
             if *True*, draw a frame with a round fancybox.  If *None*, use rc
 
           *shadow*: [ *None* | *False* | *True* ]
             If *True*, draw a shadow behind legend. If *None*, use rc settings.
 
+          *framealpha*: [ *None* | float ]
+            Control the alpha transparency of the legend's background.
+            Default is *None* which will take the value from the
+            ``legend.framealpha`` :data:`rcParam<matplotlib.rcParams>`.
+
+          *facecolor*: [ *None* | "inherit" | a color spec ]
+            Control the legend's background color.
+            Default is *None* which will take the value from the
+            ``legend.facecolor`` :data:`rcParam<matplotlib.rcParams>`.
+            If ``"inherit"``, it will take the ``axes.facecolor``
+            :data:`rcParam<matplotlib.rcParams>`.
+
+          *edgecolor*: [ *None* | "inherit" | a color spec ]
+            Control the legend's background patch edge color.
+            Default is *None* which will take the value from the
+            ``legend.edgecolor`` :data:`rcParam<matplotlib.rcParams>`.
+            If ``"inherit"``, it will take the ``axes.edgecolor``
+            :data:`rcParam<matplotlib.rcParams>`.
+
           *ncol* : integer
             number of columns. default is 1
 

lib/matplotlib/legend.py

@@ -181,6 +181,8 @@ def __init__(self, parent, handles, labels,
                  title=None,  # set a title for the legend
 
                  framealpha=None,  # set frame alpha
+                 edgecolor=None,  # frame patch edgecolor
+                 facecolor=None,  # frame patch facecolor
 
                  bbox_to_anchor=None,  # bbox that the legend will be anchored.
                  bbox_transform=None,  # transform for the bbox
@@ -198,21 +200,20 @@ def __init__(self, parent, handles, labels,
         ================   ====================================================
         Keyword            Description
         ================   ====================================================
-        loc                a location code
+        loc                Location code string, or tuple (see below).
         prop               the font property
         fontsize           the font size (used only if prop is not specified)
         markerscale        the relative size of legend markers vs. original
-        markerfirst        If true, place legend marker to left of label
-                           If false, place legend marker to right of label
+        markerfirst        If True (default), marker is to left of the label.
         numpoints          the number of points in the legend for line
         scatterpoints      the number of points in the legend for scatter plot
         scatteryoffsets    a list of yoffsets for scatter symbols in legend
-        frameon            if True, draw a frame around the legend.
-                           If None, use rc
-        fancybox           if True, draw a frame with a round fancybox.
-                           If None, use rc
-        shadow             if True, draw a shadow behind legend
-        framealpha         If not None, alpha channel for the frame.
+        frameon            If True, draw the legend on a patch (frame).
+        fancybox           If True, draw the frame with a round fancybox.
+        shadow             If True, draw a shadow behind legend.
+        framealpha         Transparency of the frame.
+        edgecolor          Frame edgecolor.
+        facecolor          Frame facecolor.
         ncol               number of columns
         borderpad          the fractional whitespace inside the legend border
         labelspacing       the vertical space between the legend entries
@@ -346,15 +347,15 @@ def __init__(self, parent, handles, labels,
         # We use FancyBboxPatch to draw a legend frame. The location
         # and size of the box will be updated during the drawing time.
 
-        if rcParams["legend.facecolor"] == 'inherit':
-            facecolor = rcParams["axes.facecolor"]
-        else:
+        if facecolor is None:
             facecolor = rcParams["legend.facecolor"]
+        if facecolor == 'inherit':
+            facecolor = rcParams["axes.facecolor"]
 
-        if rcParams["legend.edgecolor"] == 'inherit':
-            edgecolor = rcParams["axes.edgecolor"]
-        else:
+        if edgecolor is None:
             edgecolor = rcParams["legend.edgecolor"]
+        if edgecolor == 'inherit':
+            edgecolor = rcParams["axes.edgecolor"]
 
         self.legendPatch = FancyBboxPatch(
             xy=(0.0, 0.0), width=1., height=1.,

lib/matplotlib/rcsetup.py

@@ -1161,7 +1161,7 @@ def validate_animation_writer_path(p):
     'legend.markerscale': [1.0, validate_float],
     'legend.shadow': [False, validate_bool],
     'legend.facecolor': ['inherit', validate_color_or_inherit],
-    'legend.edgecolor': ['none', validate_color_or_inherit],
+    'legend.edgecolor': ['0.8', validate_color_or_inherit],
 
     # tick properties
     'xtick.top':         [False, validate_bool],   # draw ticks on the top side

matplotlibrc.template

@@ -404,13 +404,13 @@ backend      : $TEMPLATE_BACKEND
 
 ### Legend
 #legend.loc           : best
-#legend.frameon       : True     # whether or not to draw a frame around legend
-#legend.framealpha    : 0.8      # legend frame transparency
+#legend.frameon       : True     # if True, draw the legend on a background patch
+#legend.framealpha    : 0.8      # legend patch transparency
 #legend.facecolor     : inherit  # inherit from axes.facecolor; or color spec
-#legend.edgecolor     : none
+#legend.edgecolor     : 0.8      # background patch boundary color
 #legend.fancybox      : True     # if True, use a rounded box for the
-                                 # legend, else a rectangle
-#legend.shadow        : False
+                                 # legend background, else a rectangle
+#legend.shadow        : False    # if True, give background a shadow effect
 #legend.numpoints     : 1        # the number of marker points in the legend line
 #legend.scatterpoints : 1        # number of scatter points
 #legend.markerscale   : 1.0      # the relative size of legend markers vs. original