Merge remote-tracking branch 'upstream/v1.4.x'

Conflicts:
	examples/api/scatter_piecharts.py
	examples/misc/rc_traits.py
	lib/matplotlib/__init__.py
	lib/matplotlib/tests/baseline_images/test_path/path_clipping.svg
	lib/matplotlib/tests/test_path.py
	src/_backend_agg.cpp
	src/_image.cpp
	src/ft2font.cpp
	src/path_converters.h

Author: mdboom

INSTALL

@@ -205,6 +205,8 @@ libpng 1.2 (or later)
 `pytz`
     Used to manipulate time-zone aware datetimes.
 
+:term:`freetype` 2.3 or later
+    library for reading true type font files.
 
 
 Optional GUI framework
@@ -246,10 +248,6 @@ Optional dependencies
     selection of image file formats.
 
 
-:term:`freetype` 2.3 or later
-    library for reading true type font files.
-
-
 Required libraries that ship with matplotlib
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 :term:`agg` 2.4

doc/README.txt

@@ -6,7 +6,7 @@ documentation.  All of the documentation is written using sphinx, a
 python documentation system built on top of ReST.  This directory contains
 
 
-* users - the user documentation, eg plotting tutorials, configuration
+* users - the user documentation, e.g., plotting tutorials, configuration
   tips, etc.
 
 * devel - documentation for matplotlib developers

doc/_templates/citing.html

@@ -28,6 +28,8 @@ <h1>Citing matplotlib</h1>
 
 <h2>DOIs</h2>
 <dl>
+  <dt>v1.4.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12400"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12400.png" alt="10.5281/zenodo.12400"></a></dd>
+  <dt>v1.4.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12287"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12287.png" alt="10.5281/zenodo.12287"></a></dd>
   <dt>v1.4.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.11451"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.11451.png" alt="10.5281/zenodo.11451"></a></dd>
 </dl>
 

doc/_templates/layout.html

@@ -245,7 +245,17 @@ <h3>{{ _('Navigation') }}</h3>
 href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
     {%- endif %}
     </div>
-{%- endblock %}
+ {%- endblock %}
+
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-55954603-1', 'auto');
+  ga('send', 'pageview');
 
+</script>
 </body>
 </html>

doc/api/api_changes.rst

@@ -1305,7 +1305,7 @@ Changes for 0.90.1
     units.ConversionInterface.tickers renamed to
     units.ConversionInterface.axisinfo and it now returns a
     units.AxisInfo object rather than a tuple.  This will make it
-    easier to add axis info functionality (eg I added a default label
+    easier to add axis info functionality (e.g., I added a default label
     on this iteration) w/o having to change the tuple length and hence
     the API of the client code every time new functionality is added.
     Also, units.ConversionInterface.convert_to_value is now simply
@@ -1790,7 +1790,7 @@ Changes for 0.71
    pylab still imports most of the symbols from Numerix, MLab, fft,
    etc, but is more cautious.  For names that clash with python names
    (min, max, sum), pylab keeps the builtins and provides the numeric
-   versions with an a* prefix, eg (amin, amax, asum)
+   versions with an a* prefix, e.g., (amin, amax, asum)
 
 Changes for 0.70
 ================
@@ -1810,7 +1810,7 @@ Changes for 0.65.1
   removed add_axes and add_subplot from backend_bases.  Use
   figure.add_axes and add_subplot instead.  The figure now manages the
   current axes with gca and sca for get and set current axes.  If you
-  have code you are porting which called, eg, figmanager.add_axes, you
+  have code you are porting which called, e.g., figmanager.add_axes, you
   can now simply do figmanager.canvas.figure.add_axes.
 
 Changes for 0.65
@@ -1937,7 +1937,7 @@ pcolor_classic and scatter_classic.
 
 The return value from pcolor is a PolyCollection.  Most of the
 propertes that are available on rectangles or other patches are also
-available on PolyCollections, eg you can say::
+available on PolyCollections, e.g., you can say::
 
   c = scatter(blah, blah)
   c.set_linewidth(1.0)
@@ -1955,7 +1955,7 @@ over the return value of scatter or pcolor to set properties for the
 entire list.
 
 If you want the different elements of a collection to vary on a
-property, eg to have different line widths, see matplotlib.collections
+property, e.g., to have different line widths, see matplotlib.collections
 for a discussion on how to set the properties as a sequence.
 
 For scatter, the size argument is now in points^2 (the area of the
@@ -2078,7 +2078,7 @@ Transformations
   implementations, matplotlib.transforms.SeparableTransformation and
   matplotlib.transforms.Affine.  The SeparableTransformation is
   constructed with the bounding box of the input (this determines the
-  rectangular coordinate system of the input, ie the x and y view
+  rectangular coordinate system of the input, i.e., the x and y view
   limits), the bounding box of the display, and possibly nonlinear
   transformations of x and y.  The 2 most frequently used
   transformations, data coordinates -> display and axes coordinates ->
@@ -2215,7 +2215,7 @@ Changes for 0.42
     needed with double buffered drawing.  Ditto with state change.
     Text instances have a get_prop_tup method that returns a hashable
     tuple of text properties which you can use to see if text props
-    have changed, eg by caching a font or layout instance in a dict
+    have changed, e.g., by caching a font or layout instance in a dict
     with the prop tup as a key -- see RendererGTK.get_pango_layout in
     backend_gtk for an example.
 
@@ -2236,7 +2236,7 @@ Changes for 0.42
 
   * matplotlib.matlab._get_current_fig_manager renamed to
     matplotlib.matlab.get_current_fig_manager to allow user access to
-    the GUI window attribute, eg figManager.window for GTK and
+    the GUI window attribute, e.g., figManager.window for GTK and
     figManager.frame for wx
 
 Changes for 0.40

doc/devel/documenting_mpl.rst

@@ -362,7 +362,7 @@ Referring to mpl documents
 In the documentation, you may want to include to a document in the
 matplotlib src, e.g., a license file or an image file from `mpl-data`,
 refer to it via a relative path from the document where the rst file
-resides, eg, in :file:`users/navigation_toolbar.rst`, we refer to the
+resides, e.g., in :file:`users/navigation_toolbar.rst`, we refer to the
 image icons with::
 
     .. image:: ../../lib/matplotlib/mpl-data/images/subplots.png
@@ -392,7 +392,7 @@ So we can include plots from the examples dir using the symlink::
 
 
 We used to use a symlink for :file:`mpl-data` too, but the distro
-becomes very large on platforms that do not support links (eg the font
+becomes very large on platforms that do not support links (e.g., the font
 files are duplicated and large)
 
 .. _internal-section-refs:
@@ -401,7 +401,7 @@ Internal section references
 ===========================
 
 To maximize internal consistency in section labeling and references,
-use hyphen separated, descriptive labels for section references, eg::
+use hyphen separated, descriptive labels for section references, e.g.,::
 
     .. _howto-webapp:
 
@@ -429,7 +429,7 @@ Section names, etc
 ==================
 
 For everything but top level chapters, please use ``Upper lower`` for
-section titles, eg ``Possible hangups`` rather than ``Possible
+section titles, e.g., ``Possible hangups`` rather than ``Possible
 Hangups``
 
 Inheritance diagrams

doc/devel/license.rst

@@ -14,7 +14,7 @@ distributing L/GPL code through an separate channel, possibly a
 toolkit.  If you include code, make sure you include a copy of that
 code's license in the license directory if the code's license requires
 you to distribute the license with it.  Non-BSD compatible licenses
-are acceptable in matplotlib toolkits (eg basemap), but make sure you
+are acceptable in matplotlib toolkits (e.g., basemap), but make sure you
 clearly state the licenses you are using.
 
 Why BSD compatible?

doc/devel/release_guide.rst

@@ -19,7 +19,7 @@ Testing
 * Run :file:`unit/memleak_hawaii3.py` and make sure there are no
   memory leaks
 
-* try some GUI examples, eg :file:`simple_plot.py` with GTKAgg, TkAgg, etc...
+* try some GUI examples, e.g., :file:`simple_plot.py` with GTKAgg, TkAgg, etc...
 
 * remove font cache and tex cache from :file:`.matplotlib` and test
   with and without cache on some example script

doc/faq/howto_faq.rst

@@ -22,7 +22,7 @@ Find all objects in a figure of a certain type
 Every matplotlib artist (see :ref:`artist-tutorial`) has a method
 called :meth:`~matplotlib.artist.Artist.findobj` that can be used to
 recursively search the artist for any artists it may contain that meet
-some criteria (eg match all :class:`~matplotlib.lines.Line2D`
+some criteria (e.g., match all :class:`~matplotlib.lines.Line2D`
 instances or match some arbitrary filter function).  For example, the
 following snippet finds every object in the figure which has a
 `set_color` property and makes the object blue::
@@ -63,7 +63,7 @@ The :meth:`~matplotlib.pyplot.savefig` command has a keyword argument
 backgrounds transparent when saving, but will not affect the displayed
 image on the screen.
 
-If you need finer grained control, eg you do not want full transparency
+If you need finer grained control, e.g., you do not want full transparency
 or you want to affect the screen displayed version as well, you can set
 the alpha properties directly.  The figure has a
 :class:`~matplotlib.patches.Rectangle` instance called *patch*
@@ -194,7 +194,7 @@ this chicken and egg problem is to wait until the figure is draw by
 connecting
 (:meth:`~matplotlib.backend_bases.FigureCanvasBase.mpl_connect`) to the
 "on_draw" signal (:class:`~matplotlib.backend_bases.DrawEvent`) and
-get the window extent there, and then do something with it, eg move
+get the window extent there, and then do something with it, e.g., move
 the left of the canvas over; see :ref:`event-handling-tutorial`.
 
 Here is an example that gets a bounding box in relative figure coordinates
@@ -252,10 +252,10 @@ setting in the right subplots.
 Skip dates where there is no data
 ---------------------------------
 
-When plotting time series, eg financial time series, one often wants
-to leave out days on which there is no data, eg weekends.  By passing
+When plotting time series, e.g., financial time series, one often wants
+to leave out days on which there is no data, e.g., weekends.  By passing
 in dates on the x-xaxis, you get large horizontal gaps on periods when
-there is not data. The solution is to pass in some proxy x-data, eg
+there is not data. The solution is to pass in some proxy x-data, e.g.,
 evenly sampled indices, and then use a custom formatter to format
 these as dates. The example below shows how to use an 'index formatter'
 to achieve the desired plot::
@@ -559,7 +559,7 @@ at the end of the page in the sidebar (or `here
 The sphinx website is a good resource for learning sphinx, but we have
 put together a cheat-sheet at :ref:`documenting-matplotlib` which
 shows you how to get started, and outlines the matplotlib conventions
-and extensions, eg for including plots directly from external code in
+and extensions, e.g., for including plots directly from external code in
 your documents.
 
 Once your documentation contributions are working (and hopefully

doc/faq/installing_faq.rst

@@ -391,7 +391,7 @@ Standalone binary installers for Windows
 If you have already installed Python and numpy, you can use one of the
 matplotlib binary installers for windows -- you can get these from the
 `download <http://matplotlib.org/downloads.html>`_ site.  Chose the files with
-an ``.exe`` extension that match your version of Python (eg ``py2.7`` if you
+an ``.exe`` extension that match your version of Python (e.g., ``py2.7`` if you
 installed Python 2.7).  If you haven't already installed Python, you can get
 the official version from the `Python web site
 <http://python.org/download/>`_.