Merge remote branch 'original/master'

Conflicts:
	src/ft2font.cpp

Author: Daniel Hyams

.gitignore

@@ -35,6 +35,7 @@ dist
 
 # OS generated files #
 ######################
+.directory
 .gdb_history
 .DS_Store?
 ehthumbs.db

.travis.yml

@@ -6,16 +6,21 @@ python:
   - 3.2
 
 install:
-  - pip install --use-mirrors nose
+  - pip install --use-mirrors nose python-dateutil
+  # This is a workaround to install the latest versions of pyparsing,
+  # which are not yet available on PyPI
+  - 'if [ $TRAVIS_PYTHON_VERSION == "3.2" ]; then pip install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-2.0.0/pyparsing-2.0.0.tar.gz; fi'
+  - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-1.5.7/pyparsing-1.5.7.tar.gz; fi'
   # This is a workaround to install numpy with the version of
   # virtualenv in Travis.  If that is updated in the future, this can
   # be simplified to 'pip install numpy'
   - 'if [ $TRAVIS_PYTHON_VERSION == "3.2" ]; then pip install https://github.com/y-p/numpy/archive/1.6.2_with_travis_fix.tar.gz; fi'
   - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install numpy; fi' # should be nop if pre-installed
   - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install --use-mirrors PIL; fi
+  - sudo apt-get update && sudo apt-get install inkscape
   - python setup.py install
 
 script:
-  - mkdir ../foo
-  - cd ../foo
-  - python ../matplotlib/tests.py
+  - mkdir ../tmp_test_dir
+  - cd ../tmp_test_dir
+  - python ../matplotlib/tests.py -sv

CHANGELOG

@@ -1,5 +1,26 @@
+2013-04-15 Added 'axes.xmargin' and 'axes.ymargin' to rpParams to set default
+	   margins on auto-scaleing. - TAC
+
+2013-03-19 Added support for passing `linestyle` kwarg to `step` so all `plot`
+	   kwargs are passed to the underlying `plot` call.  -TAC
+
+2013-02-25 Added classes CubicTriInterpolator, UniformTriRefiner, TriAnalyzer
+           to matplotlib.tri module. - GBy
+
+2013-01-23 Add 'savefig.directory' to rcParams to remember and fill in the last
+           directory saved to for figure save dialogs - Martin Spacek
+
+2013-01-13 Add eventplot method to axes and pyplot and EventCollection class
+           to collections.
+
+2013-01-08 Added two extra titles to axes which are flush with the left and
+           right edges of the plot respectively.
+           Andrew Dawson
+
 2013-01-07 Add framealpha keyword argument to legend - PO
 
+2013-01-16 Till Stensitzki added a baseline feature to stackplot
+
 2012-12-22 Added classes for interpolation within triangular grids
            (LinearTriInterpolator) and to find the triangles in which points
            lie (TrapezoidMapTriFinder) to matplotlib.tri module. - IMT
@@ -32,7 +53,7 @@
            _get_rbg_face except it return a (r,g,b,a) tuble, to line2D.
            Modified Line2D.draw to use _get_rbga_face to get the markerface
            color so that any alpha set by  markerfacecolor will respected.
-	   - Thomas Caswell
+           - Thomas Caswell
 
 2012-11-13 Add a symmetric log normalization class to colors.py.
            Also added some tests for the normalization class.
@@ -1018,7 +1039,7 @@
 2009-02-02 Change default resolution on polar plot to 1 - MGD
 
 2009-02-02 Avoid malloc errors in ttconv for fonts that don't have
-           e.g. PostName (a version of Tahoma triggered this) - JKS
+           e.g., PostName (a version of Tahoma triggered this) - JKS
 
 2009-01-30 Remove support for pyExcelerator in exceltools -- use xlwt
            instead - JDH
@@ -1092,7 +1113,7 @@
            (slanting and extending). - JKS
 
 2008-12-29 Fix a bug in pdf usetex support, which occurred if the same
-           Type-1 font was used with different encodings, e.g. with
+           Type-1 font was used with different encodings, e.g., with
            Minion Pro and MnSymbol. - JKS
 
 2008-12-20 fix the dpi-dependent offset of Shadow. - JJL
@@ -1191,7 +1212,7 @@
 
 2008-12-08 Some of the changes Michael made to improve the output of
            the property tables in the rest docs broke of made
-           difficult to use some of the interactive doc helpers, eg
+           difficult to use some of the interactive doc helpers, e.g.,
            setp and getp.  Having all the rest markup in the ipython
            shell also confused the docstrings.  I added a new rc param
            docstring.harcopy, to format the docstrings differently for
@@ -1215,7 +1236,7 @@
 2008-12-05 Fixed a bug that the handlelength of the new legend class
            set too short when numpoints=1 -JJL
 
-2008-12-04 Added support for data with units (e.g. dates) to
+2008-12-04 Added support for data with units (e.g., dates) to
            Axes.fill_between. -RM
 
 2008-12-04 Added fancybox keyword to legend. Also applied some changes
@@ -1296,7 +1317,7 @@
            Tollerud and Jae-Joon Lee. - MM
 
 2008-10-11 Fixed bug in pdf backend: if you pass a file object for
-           output instead of a filename, e.g. in a wep app, we now
+           output instead of a filename, e.g., in a wep app, we now
            flush the object at the end. - JKS
 
 2008-10-08 Add path simplification support to paths with gaps. - EF
@@ -1509,7 +1530,7 @@
 2008-06-20 Added set/get_closed method to Polygon; fixes error
            in hist - MM
 
-2008-06-19 Use relative font sizes (e.g. 'medium' and 'large') in
+2008-06-19 Use relative font sizes (e.g., 'medium' and 'large') in
            rcsetup.py and matplotlibrc.template so that text will
            be scaled by default when changing rcParams['font.size'] -
            EF
@@ -2141,8 +2162,8 @@
 
 2007-07-31 Refactoring of distutils scripts.
            - Will not fail on the entire build if an optional Python
-             package (e.g. Tkinter) is installed but its development
-             headers are not (e.g. tk-devel).  Instead, it will
+             package (e.g., Tkinter) is installed but its development
+             headers are not (e.g., tk-devel).  Instead, it will
              continue to build all other extensions.
            - Provide an overview at the top of the output to display
              what dependencies and their versions were found, and (by
@@ -2174,7 +2195,7 @@
            should be changed to ${\cal R}$.  Alternatively, you may
            use the new LaTeX-style font commands (\mathcal, \mathrm,
            \mathit, \mathtt) which do affect the following group,
-           eg. $\mathcal{R}$.
+           e.g., $\mathcal{R}$.
 
            Other new features include:
 
@@ -2184,10 +2205,10 @@
 
            - Sub/superscripts are less likely to accidentally overlap.
 
-           - Support for sub/superscripts in either order, eg. $x^i_j$
+           - Support for sub/superscripts in either order, e.g., $x^i_j$
              and $x_j^i$ are equivalent.
 
-           - Double sub/superscripts (eg. $x_i_j$) are considered
+           - Double sub/superscripts (e.g., $x_i_j$) are considered
              ambiguous and raise an exception.  Use braces to disambiguate.
 
            - $\frac{x}{y}$ can be used for displaying fractions.
@@ -2450,7 +2471,7 @@
            color-setting operations in the pdf backend. The idea is
            that you include the resulting file in another program and
            set the colors (both stroke and fill color) there, so you
-           can use the same pdf file for e.g. a paper and a
+           can use the same pdf file for e.g., a paper and a
            presentation and have them in the surrounding color. You
            will probably not want to draw figure and axis frames in
            that case, since they would be filled in the same color. - JKS
@@ -2539,7 +2560,7 @@
            frameowrk.  Artists will define their own pick method with
            a configurable epsilon tolerance and return pick attrs.
            All artists that meet the tolerance threshold will fire a
-           PickEvent with artist dependent attrs; eg, a Line2D can set
+           PickEvent with artist dependent attrs; e.g., a Line2D can set
            the indices attribute that shows the indices into the line
            that are within epsilon of the pick point.  See
            examples/pick_event_demo.py.  The implementation of pick
@@ -2649,7 +2670,7 @@
 
 2006-11-19 Added semi-automatic docstring generation detailing all the
            kwargs that functions take using the artist introspection
-           tools; eg 'help text now details the scatter kwargs
+           tools; e.g., 'help text now details the scatter kwargs
            that control the Text properties  - JDH
 
 2006-11-17 Removed obsolete scatter_classic, leaving a stub to
@@ -2939,7 +2960,7 @@
 
 2006-06-16 Added a pointer to parent in figure canvas so you can
            access the container with fig.canvas.manager.  Useful if
-           you want to set the window title, eg in gtk
+           you want to set the window title, e.g., in gtk
            fig.canvas.manager.window.set_title, though a GUI neutral
            method would be preferable JDH
 
@@ -3408,7 +3429,7 @@
 
 2005-12-03 Modified scipy patch to support Numeric, scipy and numarray
            Some work remains to be done because some of the scipy
-           imports are broken if only the core is installed.  Eg
+           imports are broken if only the core is installed.  e.g.,
            apparently we need from scipy.basic.fftpack import * rather
            than from scipy.fftpack import *
 
@@ -3657,7 +3678,7 @@
 2005-07-06 Made HOME/.matplotlib the new config dir where the
            matplotlibrc file, the ttf.cache, and the tex.cache live.
            The new default filenames in .matplotlib have no leading
-           dot and are not hidden.  Eg, the new names are matplotlibrc
+           dot and are not hidden.  e.g., the new names are matplotlibrc
            tex.cache ttffont.cache.  This is how ipython does it so it
            must be right.  If old files are found, a warning is issued
            and they are moved to the new location.  Also fixed
@@ -3931,7 +3952,7 @@
 
 2005-04-11 Applied a variant of rick's xlim/ylim/axis patch.  These
            functions now take kwargs to let you selectively alter only
-           the min or max if desired.  Eg xlim(xmin=2) or
+           the min or max if desired.  e.g., xlim(xmin=2) or
            axis(ymax=3).  They always return the new lim. - JDH
 
 
@@ -4060,7 +4081,7 @@
 2005-02-23 Added rc param ps.useafm so backend ps can use native afm
            fonts or truetype.  afme breaks mathtext but causes much
            smaller font sizes and may result in images that display
-           better in some contexts (eg pdfs incorporated into latex
+           better in some contexts (e.g., pdfs incorporated into latex
            docs viewed in acrobat reader).  I would like to extend
            this approach to allow the user to use truetype only for
            mathtext, which should be easy.
@@ -4188,9 +4209,9 @@
 
 2005-01-18 Added accents to mathtext: \hat, \breve, \grave, \bar,
            \acute, \tilde, \vec, \dot, \ddot.  All of them have the
-           same syntax, eg to make an overbar you do \bar{o} or to
+           same syntax, e.g., to make an overbar you do \bar{o} or to
            make an o umlaut you do \ddot{o}. The shortcuts are also
-           provided, eg: \"o \'e \`e \~n \.x \^y - JDH
+           provided, e.g., \"o \'e \`e \~n \.x \^y - JDH
 
 2005-01-18 Plugged image resize memory leaks - JDH
 
@@ -4357,7 +4378,7 @@
 
 2004-12-04 Fixed some legend bugs JDH
 
-2004-11-30 Added over command for oneoff over plots.  Eg over(plot, x,
+2004-11-30 Added over command for oneoff over plots.  e.g., over(plot, x,
            y, lw=2).  Works with any plot function.
 
 2004-11-30 Added bbox property to text - JDH
@@ -4533,7 +4554,7 @@
 2004-09-17 Added coords formatter attributes.  These must be callable,
            and return a string for the x or y data. These will be used
            to format the x and y data for the coords box.  Default is
-           the axis major formatter.  Eg
+           the axis major formatter.  e.g.:
 
          # format the coords message box
          def price(x): return '$%1.2f'%x