Nov 5, 2015 · Nov 5, 2015 · Nov 5, 2015 · Nov 5, 2015 · Nov 5, 2015 · Nov 5, 2015
diff --git a/.travis.yml b/.travis.yml
        # Fall back to pypi for non suported python versions
        pip install $PRE $NUMPY $PANDAS;
    fi

    # Always install from pypi
    pip install $PRE pep8 cycler coveralls coverage python-dateutil pyparsing!=2.0.4
    pip install pillow sphinx!=1.3.0 $MOCK numpydoc ipython colorspacious
    # Install nose from a build which has partial
    # support for python36 and suport for coverage output suppressing
    pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose

    # Install freetypy from git
    FREETYPY_LOCAL_FREETYPE=1 pip install git+https://github.com/matplotlib/freetypy@master
    # Install fcpy from git
    pip install git+https://github.com/matplotlib/fcpy@master

    # We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
    # availible in the Ubuntu version used by Travis but we can manually install the deb from a later
    # version since is it basically just a .ttf file
diff --git a/INSTALL b/INSTALL
    easy_install or installing from source, the installer will attempt
    to download and install `python_dateutil` from PyPI.

 `freetypy` 1.0 or later
    Python wrappers to freetype.

 `fcpy` 1.0 or later
    Python wrappers to fontconfig.

 `pyparsing <https://pyparsing.wikispaces.com/>`__
    Required for matplotlib's mathtext math rendering support.  If
    using pip, easy_install or installing from source, the installer
 `pytz <http://pytz.sourceforge.net/>`__
    Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz

 :term:`FreeType` 2.3 or later
    Library for reading true type font files. If using pip, easy_install or
    installing from source, the installer will attempt to locate FreeType in
    expected locations. If it cannot, try installing `pkg-config
    <http://matplotlib.org/users/installing.html#optional-dependencies>`__,
    a tool used to find required non-python libraries.

 `cycler <http://matplotlib.org/cycler/>`__ 0.9 or later
   Composable cycle class used for constructing style-cycles

 `qhull` 2012.1
    A library for computing Delaunay triangulations.

 `ttconv`
   truetype font utility

 six 1.9.0
    Python 2/3 compatibility library.  Do not use this in third-party
    code.
diff --git a/doc/api/font_manager_api.rst b/doc/api/font_manager_api.rst
   :members:
   :undoc-members:
   :show-inheritance:

 :mod:`matplotlib.fontconfig_pattern`
 ====================================

 .. automodule:: matplotlib.fontconfig_pattern
   :members:
   :undoc-members:
   :show-inheritance:


diff --git a/doc/users/mathtext.rst b/doc/users/mathtext.rst
 font can be selected with the customization variable ``mathtext.fontset`` (see
 :ref:`customizing-matplotlib`)

 .. note::
   On `"narrow" <http://wordaligned.org/articles/narrow-python>`_ builds
   of Python, if you use the STIX fonts you should also set
   ``ps.fonttype`` and ``pdf.fonttype`` to 3 (the default), not 42.
   Otherwise `some characters will not be visible
   <http://thread.gmane.org/gmane.comp.python.matplotlib.general/19963/focus=19978>`_.

 Here is a simple example::

    # plain text

 .. plot:: pyplots/pyplot_mathtext.py
   :include-source:






diff --git a/examples/misc/font_indexing.py b/examples/misc/font_indexing.py
diff --git a/examples/misc/ftface_props.py b/examples/misc/ftface_props.py
diff --git a/examples/pylab_examples/font_table_ttf.py b/examples/pylab_examples/font_table_ttf.py
diff --git a/extern/ttconv/global_defines.h b/extern/ttconv/global_defines.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,13 +85,19 @@ install:
		# Fall back to pypi for non suported python versions
		pip install $PRE $NUMPY $PANDAS;
		fi

		# Always install from pypi
		pip install $PRE pep8 cycler coveralls coverage python-dateutil pyparsing!=2.0.4
		pip install pillow sphinx!=1.3.0 $MOCK numpydoc ipython colorspacious
		# Install nose from a build which has partial
		# support for python36 and suport for coverage output suppressing
		pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose

		# Install freetypy from git
		FREETYPY_LOCAL_FREETYPE=1 pip install git+https://github.com/matplotlib/freetypy@master
		# Install fcpy from git
		pip install git+https://github.com/matplotlib/fcpy@master

		# We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
		# availible in the Ubuntu version used by Travis but we can manually install the deb from a later
		# version since is it basically just a .ttf file
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -198,6 +198,12 @@ Required Dependencies
		easy_install or installing from source, the installer will attempt
		to download and install `python_dateutil` from PyPI.

		`freetypy` 1.0 or later
		Python wrappers to freetype.

		`fcpy` 1.0 or later
		Python wrappers to fontconfig.

		`pyparsing <https://pyparsing.wikispaces.com/>`__
		Required for matplotlib's mathtext math rendering support. If
		using pip, easy_install or installing from source, the installer
Expand All		@@ -211,13 +217,6 @@ Required Dependencies
		`pytz <http://pytz.sourceforge.net/>`__
		Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz

		:term:`FreeType` 2.3 or later
		Library for reading true type font files. If using pip, easy_install or
		installing from source, the installer will attempt to locate FreeType in
		expected locations. If it cannot, try installing `pkg-config
		<http://matplotlib.org/users/installing.html#optional-dependencies>`__,
		a tool used to find required non-python libraries.

		`cycler <http://matplotlib.org/cycler/>`__ 0.9 or later
		Composable cycle class used for constructing style-cycles

Expand DownExpand Up		@@ -279,9 +278,6 @@ Required libraries that ship with matplotlib
		`qhull` 2012.1
		A library for computing Delaunay triangulations.

		`ttconv`
		truetype font utility

		six 1.9.0
		Python 2/3 compatibility library. Do not use this in third-party
		code.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,13 +9,3 @@ font_manager
		:members:
		:undoc-members:
		:show-inheritance:

		:mod:`matplotlib.fontconfig_pattern`
		====================================

		.. automodule:: matplotlib.fontconfig_pattern
		:members:
		:undoc-members:
		:show-inheritance:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,13 +22,6 @@ to blend well with Times), or a Unicode font that you provide. The mathtext
		font can be selected with the customization variable ``mathtext.fontset`` (see
		:ref:`customizing-matplotlib`)

		.. note::
		On `"narrow" <http://wordaligned.org/articles/narrow-python>`_ builds
		of Python, if you use the STIX fonts you should also set
		``ps.fonttype`` and ``pdf.fonttype`` to 3 (the default), not 42.
		Otherwise `some characters will not be visible
		<http://thread.gmane.org/gmane.comp.python.matplotlib.general/19963/focus=19978>`_.

		Here is a simple example::

		# plain text
Expand DownExpand Up		@@ -342,9 +335,3 @@ Here is an example illustrating many of these features in context.

		.. plot:: pyplots/pyplot_mathtext.py
		:include-source: