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

 Conflicts:
	examples/api/image_zcoord.py
	  - whitespace vs random seed, kept seed
	lib/matplotlib/axes/_base.py
	  - unclear what these conflicts are from, text was identical
	lib/matplotlib/testing/decorators.py
	  - conflict due to backporting changs that were super-sceded on master
	lib/matplotlib/tests/test_ticker.py
	  - just adust the cleanup decorator

Author: tacaswell

doc/users/dflt_style_changes.rst

@@ -597,17 +597,20 @@ To restore the previous behavior explicitly pass the keyword argument
 Hatching
 ========
 
-The width of the lines in a hatch pattern is now configurable by the
-rcParam `hatch.linewidth`, with a default of 1 point.  The old
-behavior was different depending on backend:
+The color and width of the lines in a hatch pattern are now configurable by the
+rcParams `hatch.color` and `hatch.linewidth`, with defaults of black and 1
+point, respectively.  The old behaviour for the color was to apply the edge
+color or use black, depending on the artist; the old behavior for the line
+width was different depending on backend:
 
     - PDF: 0.1 pt
     - SVG: 1.0 pt
     - PS:  1 px
     - Agg: 1 px
 
-The old behavior can not be restored across all backends simultaneously, but
-can be restored for a single backend by setting::
+The old color behavior can not be restored. The old line width behavior can not
+be restored across all backends simultaneously, but can be restored for a
+single backend by setting::
 
    mpl.rcParams['hatch.linewidth'] = 0.1  # previous pdf hatch linewidth
    mpl.rcParams['hatch.linewidth'] = 1.0  # previous svg hatch linewidth
@@ -620,7 +623,7 @@ The behavior of the PS and Agg backends was DPI dependent, thus::
    mpl.rcParams['hatch.linewidth'] = 1.0 / dpi  # previous ps and Agg hatch linewidth
 
 
-There is no API level control of the hatch linewidth.
+There is no API level control of the hatch color or linewidth.
 
 
 .. _default_changes_font:
@@ -1065,6 +1068,17 @@ Z-order
 
 
 
+``ScalarFormatter`` tick label formatting with offsets
+======================================================
+
+With the default of ``rcParams['axes.formatter.useoffset'] = True``,
+an offset will be used when it will save 4 or more digits.  This can
+be controlled with the new rcParam, ``axes.formatter.offset_threshold``.
+To restore the previous behavior of using an offset to save 2 or more
+digits, use ``rcParams['axes.formatter.offset_threshold'] = 2``.
+
+
+
 ``AutoDateFormatter`` format strings
 ====================================
 

doc/users/whats_new.rst

@@ -82,13 +82,16 @@ New rcparams added
 |`ytick.minor.right`,             |                                                  |
 |`ytick.major.right`              |                                                  |
 +---------------------------------+--------------------------------------------------+
-|`hist.bins`                      | the default number of bins to use in             |
+|`hist.bins`                      | The default number of bins to use in             |
 |                                 | `~matplotlib.axes.Axes.hist`.  This can be an    |
 |                                 | `int`, a list of floats, or ``'auto'`` if numpy  |
 |                                 | >= 1.11 is installed.                            |
 +---------------------------------+--------------------------------------------------+
-|`lines.scale_dashes`             | If the line dash patterns should scale with      |
-|                                 | linewidth                                        |
+|`lines.scale_dashes`             | Whether the line dash patterns should scale with |
+|                                 | linewidth.                                       |
++---------------------------------+--------------------------------------------------+
+|`axes.formatter.offset_threshold`| Minimum number of digits saved in tick labels    |
+|                                 | that triggers using an offset.                   |
 +---------------------------------+--------------------------------------------------+
 
 

examples/pylab_examples/log_demo.py

@@ -21,7 +21,7 @@
 plt.subplot(223)
 plt.loglog(t, 20*np.exp(-t/10.0), basex=2)
 plt.grid(True)
-plt.title('loglog base 4 on x')
+plt.title('loglog base 2 on x')
 
 # with errorbars: clip non-positive values
 ax = plt.subplot(224)

lib/matplotlib/backend_bases.py

@@ -789,6 +789,7 @@ def __init__(self):
         self._linewidth = 1
         self._rgb = (0.0, 0.0, 0.0, 1.0)
         self._hatch = None
+        self._hatch_color = colors.to_rgba(rcParams['hatch.color'])
         self._hatch_linewidth = rcParams['hatch.linewidth']
         self._url = None
         self._gid = None
@@ -1086,6 +1087,12 @@ def get_hatch_path(self, density=6.0):
             return None
         return Path.hatch(self._hatch, density)
 
+    def get_hatch_color(self):
+        """
+        Gets the color to use for hatching.
+        """
+        return self._hatch_color
+
     def get_hatch_linewidth(self):
         """
         Gets the linewidth to use for hatching.

lib/matplotlib/backends/backend_pdf.py

@@ -2227,7 +2227,7 @@ def hatch_cmd(self, hatch):
             else:
                 return [Name('DeviceRGB'), Op.setcolorspace_nonstroke]
         else:
-            hatch_style = (self._rgb, self._fillcolor, hatch)
+            hatch_style = (self._hatch_color, self._fillcolor, hatch)
             name = self.file.hatchPattern(hatch_style)
             return [Name('Pattern'), Op.setcolorspace_nonstroke,
                     name, Op.setcolor_nonstroke]

lib/matplotlib/backends/backend_ps.py

@@ -890,7 +890,7 @@ def _draw_ps(self, ps, gc, rgbFace, fill=True, stroke=True, command=None):
         if hatch:
             hatch_name = self.create_hatch(hatch)
             write("gsave\n")
-            write("[/Pattern [/DeviceRGB]] setcolorspace %f %f %f " % gc.get_rgb()[:3])
+            write("[/Pattern [/DeviceRGB]] setcolorspace %f %f %f " % gc.get_hatch_color()[:3])
             write("%s setcolor fill grestore\n" % hatch_name)
 
         if stroke:

lib/matplotlib/backends/backend_svg.py

@@ -349,7 +349,7 @@ def _get_hatch(self, gc, rgbFace):
         """
         if rgbFace is not None:
             rgbFace = tuple(rgbFace)
-        edge = gc.get_rgb()
+        edge = gc.get_hatch_color()
         if edge is not None:
             edge = tuple(edge)
         dictkey = (gc.get_hatch(), rgbFace, edge)

lib/matplotlib/image.py

@@ -524,7 +524,7 @@ def contains(self, mouseevent):
 
     def write_png(self, fname):
         """Write the image to png file with fname"""
-        im = self.to_rgba(self._A, bytes=True, norm=False)
+        im = self.to_rgba(self._A, bytes=True, norm=True)
         _png.write_png(im, fname)
 
     def set_data(self, A):

lib/matplotlib/mpl-data/stylelib/classic.mplstyle

@@ -34,6 +34,7 @@ patch.force_edgecolor  : True
 patch.edgecolor        : k
 patch.antialiased      : True    # render patches in antialiased (no jaggies)
 
+hatch.color            : k
 hatch.linewidth        : 1.0
 
 hist.bins              : 10
@@ -204,6 +205,10 @@ axes.formatter.useoffset      : True    # If True, the tick label formatter
                                         # to an offset when the data range is very
                                         # small compared to the minimum absolute
                                         # value of the data.
+axes.formatter.offset_threshold : 2      # When useoffset is True, the offset
+                                         # will be used when it can remove
+                                         # at least this number of significant
+                                         # digits from tick labels.
 
 axes.unicode_minus  : True    # use unicode for the minus symbol
                               # rather than hyphen.  See

lib/matplotlib/rcsetup.py

@@ -682,7 +682,7 @@ def validate_hatch(s):
         raise ValueError("Unknown hatch symbol(s): %s" % list(unknown))
     return s
 validate_hatchlist = _listify_validator(validate_hatch)
-
+validate_dashlist = _listify_validator(validate_nseq_float())
 
 _prop_validators = {
         'color': _listify_validator(validate_color_for_prop_cycle,
@@ -701,6 +701,7 @@ def validate_hatch(s):
         'alpha': validate_floatlist,
         'marker': validate_stringlist,
         'hatch': validate_hatchlist,
+        'dashes': validate_dashlist,
     }
 _prop_aliases = {
         'c': 'color',
@@ -930,6 +931,7 @@ def validate_animation_writer_path(p):
     'patch.antialiased': [True, validate_bool],     # antialiased (no jaggies)
 
     ## hatch props
+    'hatch.color': ['k', validate_color],
     'hatch.linewidth': [1.0, validate_float],
 
     ## Histogram properties
@@ -1085,6 +1087,7 @@ def validate_animation_writer_path(p):
                                # Use the current locale to format ticks
     'axes.formatter.use_mathtext': [False, validate_bool],
     'axes.formatter.useoffset': [True, validate_bool],
+    'axes.formatter.offset_threshold': [4, validate_int],
     'axes.unicode_minus': [True, validate_bool],
     'axes.color_cycle': [
         ['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728',