diff --git a/.travis.yml b/.travis.yml
index cdea1adc3c15..849da0a61ddd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,7 @@ env:
- PANDAS=
- NPROC=2
- TEST_ARGS=--no-pep8
+ - DELETE_FONT_CACHE=
language: python
@@ -50,7 +51,7 @@ matrix:
env: MOCK=mock NUMPY=numpy==1.6
- python: 3.4
- python: 3.5
- env: PANDAS=pandas
+ env: PANDAS=pandas DELETE_FONT_CACHE=1
- python: 2.7
env: TEST_ARGS=--pep8
- python: 2.7
@@ -123,6 +124,9 @@ script:
echo Testing using $NPROC processes
echo The following args are passed to nose $NOSE_ARGS
if [[ $BUILD_DOCS == false ]]; then
+ if [[ $DELETE_FONT_CACHE == 1 ]]; then
+ rm -rf ~/.cache/matplotlib
+ fi
export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples
gdb -return-child-result -batch -ex r -ex bt --args python tests.py -s --processes=$NPROC --process-timeout=300 $TEST_ARGS
else
diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
index ee666f07cfb6..0e33c11d3f2f 100644
--- a/doc/faq/howto_faq.rst
+++ b/doc/faq/howto_faq.rst
@@ -14,6 +14,35 @@ How-To
Plotting: howto
===============
+.. _howto-datetime64:
+
+Plot `numpy.datetime64` values
+------------------------------
+
+For matplotlib to plot dates (or any scalar with units) a converter
+to float needs to be registered with the `matplolib.units` module. The
+current best converters for `datetime64` values are in `pandas`. Simply
+importing `pandas` ::
+
+ import pandas as pd
+
+should be sufficient as `pandas` will try to install the converters
+on import. If that does not work, or you need to reset `munits.registry`
+you can explicitly install the `pandas` converters by ::
+
+ from pandas.tseries import converter as pdtc
+ pdtc.register()
+
+If you only want to use the `pandas` converter for `datetime64` values ::
+
+ from pandas.tseries import converter as pdtc
+ import matplotlib.units as munits
+ import numpy as np
+
+ munits.registry[np.datetime64] = pdtc.DatetimeConverter()
+
+
+
.. _howto-findobj:
Find all objects in a figure of a certain type
diff --git a/doc/mpl_toolkits/axes_grid/api/anchored_artists_api.rst b/doc/mpl_toolkits/axes_grid/api/anchored_artists_api.rst
new file mode 100644
index 000000000000..4aeba4e3aaf6
--- /dev/null
+++ b/doc/mpl_toolkits/axes_grid/api/anchored_artists_api.rst
@@ -0,0 +1,7 @@
+:mod:`mpl_toolkits.axes_grid1.anchored_artists`
+===============================================
+
+.. automodule:: mpl_toolkits.axes_grid1.anchored_artists
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/mpl_toolkits/axes_grid/api/index.rst b/doc/mpl_toolkits/axes_grid/api/index.rst
index 0e5975592c4b..672336ee2dbf 100644
--- a/doc/mpl_toolkits/axes_grid/api/index.rst
+++ b/doc/mpl_toolkits/axes_grid/api/index.rst
@@ -24,4 +24,5 @@
.. toctree::
+ anchored_artists_api.rst
inset_locator_api.rst
diff --git a/doc/users/customizing.rst b/doc/users/customizing.rst
index 22cc62b57d12..2357ff613c8d 100644
--- a/doc/users/customizing.rst
+++ b/doc/users/customizing.rst
@@ -8,7 +8,8 @@ Using style sheets
==================
The ``style`` package adds support for easy-to-switch plotting "styles" with
-the same parameters as a matplotlibrc_ file.
+the same parameters as a matplotlibrc_ file (which is read at startup to
+configure matplotlib).
There are a number of pre-defined styles provided by matplotlib. For
example, there's a pre-defined style called "ggplot", which emulates the
diff --git a/doc/users/navigation_toolbar.rst b/doc/users/navigation_toolbar.rst
index 4f8888fc3e14..85a64e303367 100644
--- a/doc/users/navigation_toolbar.rst
+++ b/doc/users/navigation_toolbar.rst
@@ -15,16 +15,16 @@ the buttons at the bottom of the toolbar
.. image:: ../../lib/matplotlib/mpl-data/images/forward_large.png
-The ``Forward`` and ``Back`` buttons
- These are akin to the web browser forward and back buttons. They
- are used to navigate back and forth between previously defined
- views. They have no meaning unless you have already navigated
- somewhere else using the pan and zoom buttons. This is analogous
+The ``Home``, ``Forward`` and ``Back`` buttons
+ These are akin to a web browser's home, forward and back controls.
+ ``Forward`` and ``Back`` are used to navigate back and forth between
+ previously defined views. They have no meaning unless you have already
+ navigated somewhere else using the pan and zoom buttons. This is analogous
to trying to click ``Back`` on your web browser before visiting a
- new page --nothing happens. ``Home`` always takes you to the
- first, default view of your data. For ``Home``, ``Forward`` and
- ``Back``, think web browser where data views are web pages. Use
- the pan and zoom to rectangle to define new views.
+ new page or ``Forward`` before you have gone back to a page --
+ nothing happens. ``Home`` always takes you to the
+ first, default view of your data. Again, all of these buttons should
+ feel very familiar to any user of a web browser.
.. image:: ../../lib/matplotlib/mpl-data/images/move_large.png
@@ -37,11 +37,11 @@ The ``Pan/Zoom`` button
where you released. If you press 'x' or 'y' while panning the
motion will be constrained to the x or y axis, respectively. Press
the right mouse button to zoom, dragging it to a new position.
- The x axis will be zoomed in proportionate to the rightward
- movement and zoomed out proportionate to the leftward movement.
- Ditto for the y axis and up/down motions. The point under your
+ The x axis will be zoomed in proportionately to the rightward
+ movement and zoomed out proportionately to the leftward movement.
+ The same is true for the y axis and up/down motions. The point under your
mouse when you begin the zoom remains stationary, allowing you to
- zoom to an arbitrary point in the figure. You can use the
+ zoom in or out around that point as much as you wish. You can use the
modifier keys 'x', 'y' or 'CONTROL' to constrain the zoom to the x
axis, the y axis, or aspect ratio preserve, respectively.
@@ -54,7 +54,7 @@ The ``Pan/Zoom`` button
The ``Zoom-to-rectangle`` button
Click this toolbar button to activate this mode. Put your mouse
- somewhere over and axes and press the left mouse button. Drag the
+ somewhere over an axes and press the left mouse button. Drag the
mouse while holding the button to a new location and release. The
axes view limits will be zoomed to the rectangle you have defined.
There is also an experimental 'zoom out to rectangle' in this mode
diff --git a/doc/users/text_intro.rst b/doc/users/text_intro.rst
index 67d504dcbd5c..824cc8d2af8f 100644
--- a/doc/users/text_intro.rst
+++ b/doc/users/text_intro.rst
@@ -3,22 +3,25 @@
Text introduction
=================
-matplotlib has excellent text support, including mathematical
-expressions, truetype support for raster and vector outputs, newline
-separated text with arbitrary rotations, and unicode support. Because
-we embed the fonts directly in the output documents, e.g., for postscript
+matplotlib has extensive text support, including support for
+mathematical expressions, truetype support for raster and
+vector outputs, newline separated text with arbitrary
+rotations, and unicode support. Because it embeds
+fonts directly in output documents, e.g., for postscript
or PDF, what you see on the screen is what you get in the hardcopy.
`FreeType `_ support
produces very nice, antialiased fonts, that look good even at small
raster sizes. matplotlib includes its own
-:mod:`matplotlib.font_manager`, thanks to Paul Barrett, which
-implements a cross platform, W3C compliant font finding algorithm.
-
-You have total control over every text property (font size, font
-weight, text location and color, etc) with sensible defaults set in
-the rc file. And significantly for those interested in mathematical
+:mod:`matplotlib.font_manager` (thanks to Paul Barrett), which
+implements a cross platform, `W3C `
+compliant font finding algorithm.
+
+The user has a great deal of control over text properties (font size, font
+weight, text location and color, etc.) with sensible defaults set in
+the `rc file `.
+And significantly, for those interested in mathematical
or scientific figures, matplotlib implements a large number of TeX
-math symbols and commands, to support :ref:`mathematical expressions
+math symbols and commands, supporting :ref:`mathematical expressions
` anywhere in your figure.
@@ -31,10 +34,10 @@ interface
* :func:`~matplotlib.pyplot.text` - add text at an arbitrary location to the ``Axes``;
:meth:`matplotlib.axes.Axes.text` in the API.
-* :func:`~matplotlib.pyplot.xlabel` - add an axis label to the x-axis;
+* :func:`~matplotlib.pyplot.xlabel` - add a label to the x-axis;
:meth:`matplotlib.axes.Axes.set_xlabel` in the API.
-* :func:`~matplotlib.pyplot.ylabel` - add an axis label to the y-axis;
+* :func:`~matplotlib.pyplot.ylabel` - add a label to the y-axis;
:meth:`matplotlib.axes.Axes.set_ylabel` in the API.
* :func:`~matplotlib.pyplot.title` - add a title to the ``Axes``;
diff --git a/doc/users/whats_new/2015-11-05_hidpi.rst b/doc/users/whats_new/2015-11-05_hidpi.rst
deleted file mode 100644
index 6a0ed6ea9fe7..000000000000
--- a/doc/users/whats_new/2015-11-05_hidpi.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Support for HiDPI (Retina) displays in the NbAgg and WebAgg backends
---------------------------------------------------------------------
-
-The NbAgg and WebAgg backends will now use the full resolution of your
-high-pixel-density display.
diff --git a/examples/axes_grid/simple_anchored_artists.py b/examples/axes_grid/simple_anchored_artists.py
index 466f1a1730cb..26ef0f6a26a8 100644
--- a/examples/axes_grid/simple_anchored_artists.py
+++ b/examples/axes_grid/simple_anchored_artists.py
@@ -2,7 +2,7 @@
def draw_text(ax):
- from mpl_toolkits.axes_grid1.anchored_artists import AnchoredText
+ from matplotlib.offsetbox import AnchoredText
at = AnchoredText("Figure 1a",
loc=2, prop=dict(size=8), frameon=True,
)
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
index a8ea40572ee9..3c4ff72f32aa 100644
--- a/lib/matplotlib/backends/backend_tkagg.py
+++ b/lib/matplotlib/backends/backend_tkagg.py
@@ -609,6 +609,9 @@ def destroy(*args):
self.window.update()
else:
self.canvas.draw_idle()
+ # Raise the new window.
+ self.canvas.manager.window.attributes('-topmost', 1)
+ self.canvas.manager.window.attributes('-topmost', 0)
self._shown = True
def destroy(self, *args):
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
index 0a84030162aa..96c33311ef7d 100644
--- a/lib/matplotlib/mathtext.py
+++ b/lib/matplotlib/mathtext.py
@@ -896,7 +896,6 @@ def __init__(self, *args, **kwargs):
self.fontmap = {}
# Include Stix sized alternatives for glyphs
self._fontmap.update({
- 0 : 'STIXGeneral',
1 : 'STIXSizeOneSym',
2 : 'STIXSizeTwoSym',
3 : 'STIXSizeThreeSym',
@@ -938,6 +937,7 @@ class DejaVuSerifFonts(DejaVuFonts):
'sf' : 'DejaVu Sans',
'tt' : 'DejaVu Sans Mono',
'ex' : 'DejaVu Serif Display',
+ 0 : 'DejaVu Serif',
}
class DejaVuSansFonts(DejaVuFonts):
@@ -952,6 +952,7 @@ class DejaVuSansFonts(DejaVuFonts):
'sf' : 'DejaVu Sans',
'tt' : 'DejaVu Sans Mono',
'ex' : 'DejaVu Sans Display',
+ 0 : 'DejaVu Sans',
}
class StixFonts(UnicodeFonts):
@@ -2003,20 +2004,28 @@ def __init__(self, c, height, depth, state, always=False, factor=None):
alternatives = state.font_output.get_sized_alternatives_for_symbol(
state.font, c)
+ xHeight = state.font_output.get_xheight(
+ state.font, state.fontsize, state.dpi)
+
state = state.copy()
target_total = height + depth
for fontname, sym in alternatives:
state.font = fontname
char = Char(sym, state)
- if char.height + char.depth >= target_total:
+ # Ensure that size 0 is chosen when the text is regular sized but
+ # with descender glyphs by subtracting 0.2 * xHeight
+ if char.height + char.depth >= target_total - 0.2 * xHeight:
break
- if factor is None:
- factor = target_total / (char.height + char.depth)
- state.fontsize *= factor
- char = Char(sym, state)
+ shift = 0
+ if state.font != 0:
+ if factor is None:
+ factor = (target_total) / (char.height + char.depth)
+ state.fontsize *= factor
+ char = Char(sym, state)
+
+ shift = (depth - char.depth)
- shift = (depth - char.depth)
Hlist.__init__(self, [char])
self.shift_amount = shift
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
index e212552465dc..97ffb5dbf5d4 100644
--- a/lib/matplotlib/patches.py
+++ b/lib/matplotlib/patches.py
@@ -1195,7 +1195,7 @@ def __init__(self, x, y, dx, dy, width=0.001, length_includes_head=False,
"""
if head_width is None:
- head_width = 20 * width
+ head_width = 3 * width
if head_length is None:
head_length = 1.5 * head_width
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.pdf
index 0d4ab3d2d2a2..86fe09d709ee 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.png
index 34e6b74a021a..cedd132b7b45 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.svg
index 4b16733d5a13..4afb573565bd 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.svg
@@ -20,51 +20,6 @@ z
-
+
-
+
-
-
+
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.pdf
index 0fa74c51c17f..05756701b4e3 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.png
index bca25094dc2b..b1f264a8432a 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.svg
index 3c14fc09b27b..1fde587ceb85 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_49.svg
@@ -20,6 +20,79 @@ z
+
+
-
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.pdf
index 4d887745bbd0..f5cd93efcfc4 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.png
index fca117d64542..7dede8e5a8fd 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.svg
index 055302fd8458..65dd40269b2d 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.svg
@@ -20,72 +20,143 @@ z
-
+
-
+M 24.90625 1.515625
+Q 28.375 1.515625 31.34375 4.375
+Q 34.328125 7.234375 36.1875 10.796875
+Q 37.546875 13.484375 38.734375 17.359375
+Q 39.9375 21.234375 40.8125 25.625
+Q 41.703125 30.03125 41.703125 32.625
+Q 41.703125 34.90625 41.09375 36.90625
+Q 40.484375 38.921875 39.09375 40.265625
+Q 37.703125 41.609375 35.40625 41.609375
+Q 31.734375 41.609375 28.484375 38.984375
+Q 25.25 36.375 22.609375 32.515625
+L 22.609375 32.171875
+L 17.09375 10.109375
+Q 17.78125 6.546875 19.734375 4.03125
+Q 21.6875 1.515625 24.90625 1.515625
+" id="Cmmi10-70"/>
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.pdf
index b6c63e8885ea..29dcaa13ee7a 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.png
index be513275352c..f454d9fd69ee 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.svg
index f8e40e14e66c..c61faa883261 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.svg
@@ -20,6 +20,79 @@ z
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.pdf
index 48eea1b5902e..e1699fe51023 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.png
index dc35689004f1..50c2340c2bcc 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.svg
index 8a382c658649..cb103ab01b1e 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_11.svg
@@ -20,61 +20,60 @@ z
-
-
-
+
+
-
+" id="DejaVuSans-35"/>
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.pdf
index 33526e14fee6..4aafb1427003 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.png
index d67faa8736ac..9f1f884bd558 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.svg
index afd60050f0e2..6f513d5ead3d 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_12.svg
@@ -20,17 +20,18 @@ z
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.pdf
index e13cc10669b8..20fe0b366018 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.png
index dcc7a9faad57..ec55f8770950 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.svg
index 8564e8be5011..92c2cc9f945a 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_35.svg
@@ -20,6 +20,50 @@ z
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.pdf
index 5c48712dd3cf..7246b36e03ce 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.png
index 04a9a628e901..689b6113f446 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.svg
index ddc16066144e..24db824fd37c 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_49.svg
@@ -20,23 +20,16 @@ z
-
-
+
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.pdf
index 7ca075b848c5..430c41f50d2e 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.png
index 4716cd518acb..32ec8a5e3adb 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.svg
index e519ff37bfeb..2356007d7be9 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_50.svg
@@ -20,47 +20,16 @@ z
-
-
-
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.pdf
index e06129d0ae34..26aa8358c743 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.png
index d0bca49e82e6..c032ff5fd771 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.svg
index 7aace7112df2..bdc49456e43c 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_53.svg
@@ -35,20 +35,6 @@ L 57.40625 -9.90625
L 104.296875 256.5
z
" id="STIXSizeThreeSym-Regular-221a"/>
-
-
+" id="DejaVuSans-2b"/>
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.pdf
index 0791eccce88b..994bca3b1574 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.png
index 0da8911238db..a0aa9554c8ed 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.svg
index 8500ff026abe..b150251461d3 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_54.svg
@@ -20,31 +20,17 @@ z
-
-
+
-
-
-
+
+
+
-
-
+
+" id="DejaVuSans-7c"/>
+
-
-
+
-
+" id="DejaVuSans-3d"/>
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.pdf
index 69356e3d4501..57659ea04543 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.png
index fb6da52e4dda..0060975a67b7 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.svg
index 1076984aad69..37d50ef23c96 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_64.svg
@@ -20,28 +20,41 @@ z
-
-
+" id="DejaVuSans-28"/>
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.pdf
index 9c8367f57e84..9c1d4de19fc5 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.png
index 80398a01d521..8e2528770bc9 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.svg
index 3855c7849e37..60e60f585109 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.svg
@@ -20,16 +20,39 @@ z
-
+
+
-
-
-
-
+" id="DejaVuSans-Oblique-69"/>
-
-
-
+
+
-
+L 14.109375 54.6875
+L 23.09375 54.6875
+L 21.296875 46.09375
+Q 25.046875 50.828125 30.3125 53.40625
+Q 35.59375 56 41.40625 56
+Q 48.640625 56 52.609375 52.09375
+Q 56.59375 48.1875 56.59375 41.109375
+Q 56.59375 39.359375 56.375 37.359375
+Q 56.15625 35.359375 55.71875 33.015625
+" id="DejaVuSans-Oblique-6e"/>
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.pdf
index b705ce52caf0..3a95452967ac 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.png
index e645388fcadd..d655592d81c5 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.svg
index 11181cad7666..bdb560153175 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_68.svg
@@ -20,29 +20,17 @@ z
-
-
+" id="DejaVuSans-2016"/>
+" id="DejaVuSans-7c"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.pdf
index ec400d4b0e95..9d7a3f1ec797 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.png
index fa0d6ce46680..89fbbaf90126 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.svg
index 247850f199d2..15b63cb56dc4 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_11.svg
@@ -20,6 +20,24 @@ z
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.pdf
index d6efe317f681..d8b06339bb06 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.png
index db519381af5d..9bd433f3b179 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.svg
index ca0ec56dd714..3f13f31357f7 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_12.svg
@@ -20,17 +20,18 @@ z
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.pdf
index 6088192201cb..0301874f639e 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.png
index 27aafc14e906..8a5bbdbda3a7 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.svg
index 01e15370d02b..5645a79e3ea8 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_35.svg
@@ -20,32 +20,6 @@ z
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.pdf
index 18763c3beb7d..d58d9badba4c 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.png
index 1419c072cfce..71ec832f3db2 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.svg
index a93c5fdd36d1..e1c87eddeb22 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_50.svg
@@ -20,65 +20,16 @@ z
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.pdf
index 4d7c27ee9112..23899ccccc63 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.png
index 5bfd695a8bfe..30c6712213cb 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.svg
index 353a2ee25abd..1fdbec59115a 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_53.svg
@@ -20,6 +20,21 @@ z
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.pdf
index 6698c10b22dc..8275564b9950 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.png
index 935ad4db0767..8f12ba3b8671 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.svg
index cf9840c75458..2709ae43354d 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_54.svg
@@ -20,90 +20,6 @@ z
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
-
+" id="DejaVuSerif-Italic-69"/>
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+" id="DejaVuSerif-28"/>
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.pdf
index b751bf898f26..e702375a0ad3 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.png
index 73581da301e0..ffc3b9efec98 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.svg
index 1ac3faef11d5..3445ca2dd710 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_64.svg
@@ -20,47 +20,18 @@ z
-
-
+" id="DejaVuSerif-28"/>
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.pdf
index cf4f15c108e4..fbdd07c1f359 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.png
index f61dd990d849..bc105950d01b 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.svg
index 5e0af6552a21..e90ba97f7d2c 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.svg
@@ -20,6 +20,62 @@ z
+
+
+
-
-
-
-
-
-
+
+" id="DejaVuSerif-Italic-6a"/>
-
-
+
+" id="DejaVuSerif-2c"/>
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.pdf
index 92e0c3c49758..dc4c1802c743 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.png
index 804ec80dd7fd..35caf2d2b6ad 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.svg
index a8833a5d5de6..0284835785a3 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_68.svg
@@ -20,42 +20,17 @@ z
-
-
+" id="DejaVuSerif-2016"/>
-
-
+" id="DejaVuSerif-Italic-62"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.pdf
index 500fe66af1c1..f37c32fee257 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.png
index 8d2315f57a42..c75fe1448fc8 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.svg
index 4ceeda12dbd2..90b80110001d 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_11.svg
@@ -20,28 +20,63 @@ z
-
-
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.pdf
index ed7777567b8f..92308f8cda53 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.png
index 18dd456d2afe..ca765c856b98 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.svg
index 8da57d0e31cf..3dcb6434e2cd 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_12.svg
@@ -20,17 +20,17 @@ z
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.pdf
index ee75fd767670..ffc25c3e97b2 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.png
index 07d62d1cfe49..adf82c32694f 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.svg
index 935c23a25e18..c75b672bcad5 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.svg
@@ -20,34 +20,48 @@ z
-
+
+" id="STIXGeneral-Regular-221a"/>
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.pdf
index 70ada597f416..97115f4130bb 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.png
index 6cd9e6ef4744..7d1656d759af 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.svg
index c1eb522c218b..63f9d5b6beb7 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.svg
@@ -20,66 +20,21 @@ z
-
-
+" id="STIXSizeThreeSym-Regular-221a"/>
-
+" id="STIXGeneral-Regular-2b"/>
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.pdf
index 59736a5af0d9..1c7345b41e07 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.png
index 63b73ea382e6..4cd85e3d72c5 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.svg
index 5be83651eb39..406804be6ae5 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.svg
@@ -20,58 +20,45 @@ z
-
-
-
+
+
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.pdf
index 1dee961a0094..10a5f9bda9d7 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.png
index ac092946ddad..1f60b3a4d5c9 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.svg
index 541d483775ef..c3afd90cd485 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.svg
@@ -20,6 +20,17 @@ z
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.pdf
index 68ef4ccee62a..bb5f89e414dc 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.png
index 8cc4959b5013..1c7481589126 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.svg
index e378c43163d6..e060ff31fca0 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.svg
@@ -20,6 +20,89 @@ z
+
+
+
+
-
-
-
-
-
+" id="STIXGeneral-Regular-3c"/>
-
-
-
-
+M 32 59.203125
+L 25.09375 34.703125
+Q 28 34.203125 30.296875 34.203125
+Q 39 34.203125 43.09375 36.59375
+Q 50.203125 40.59375 50.203125 50
+Q 50.203125 62.296875 37.203125 62.296875
+Q 32.796875 62.296875 32 59.203125
+" id="STIXGeneral-Italic-50"/>
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.pdf
index c647dc9ec534..2aca1bfd4a52 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.png
index c037ffadb2b7..f51fc6032d83 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.svg
index 269efc70b9dc..be7cdc9f2da8 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.svg
@@ -31,6 +31,39 @@ L 12.90625 69
L 19.5 69
z
" id="STIXGeneral-Regular-2016"/>
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.pdf
index 70adc66349e5..cce9b2603e92 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.png
index 7d606dc56913..1599dca2b2ae 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.svg
index 6910c9bb8dec..7fae93821427 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_11.svg
@@ -20,6 +20,54 @@ z
+
+
+
+
-
-
-
-
-
-
-
+
+
+" id="STIXSizeTwoSym-Regular-5d"/>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.pdf
index beda4a4c73e3..211c695e3d49 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.png
index d74c4626a115..43cbf71a784d 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.svg
index e3f54f2e5cf3..3d78405724f2 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.svg
@@ -20,17 +20,17 @@ z
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.pdf
index 22ee9b8f3a23..33de7a49be96 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.png
index f0a73c270862..accb168fd70f 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.svg
index b7a1841f3595..ab6f0cd284a2 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.svg
@@ -48,25 +48,6 @@ Q 27.796875 60.5 24 60.5
Q 20 60.5 16.546875 57.640625
Q 13.09375 54.796875 11.296875 49.203125
" id="STIXGeneral-Regular-1d7e5"/>
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.pdf
index 2c728dba796d..bce5949a9485 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.png
index 3c7416c57932..e270469bb21e 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.svg
index 8d97a589bd52..d67268e320a7 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.svg
@@ -20,20 +20,6 @@ z
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.pdf
index 12a24a24f817..dc3d00843436 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.png
index e76e0895ea6d..0e52993cf2a2 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.svg
index a134f3dccd4f..ee31759d9be7 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.svg
@@ -20,43 +20,6 @@ z
-
-
-
-
+
+
+
+
+
+
-
+
+M 26.59375 45.90625
+L 15.203125 0
+L 6.90625 0
+L 17.796875 44
+L 25.796875 46.40625
+z
+" id="STIXGeneral-Italic-1d62a"/>
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.pdf
index 0a4f17155212..04cbc790c20b 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.png
index 67e20dae7037..fe79a4d9b2cb 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.svg
index b3c3cd9998ec..4b5041064a6b 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.svg
@@ -20,27 +20,17 @@ z
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.pdf
index 1b18196e3014..e802f9a7b744 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.png
index 9f91f69295f0..a261a4225691 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.svg
index 2ddfc60d8ce4..a6b94371b8f7 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.svg
@@ -20,64 +20,24 @@ z
-
-
-
-
+" id="STIXGeneral-Regular-2211"/>
-
-
+M 62.90625 -10.296875
+L 6.40625 -10.296875
+L 6.40625 -3.703125
+L 62.90625 -3.703125
+z
+" id="STIXGeneral-Regular-2264"/>
-
+
+M 29.40625 45.90625
+L 17.296875 -2.59375
+Q 14.90625 -11.90625 9.90625 -16.75
+Q 4.90625 -21.59375 -1.796875 -21.59375
+Q -6.796875 -21.59375 -11.796875 -18
+L -7.5 -11.59375
+L -5.90625 -11.59375
+Q -2.296875 -14.40625 -0.09375 -14.40625
+Q 6.203125 -14.40625 8.703125 -4.203125
+L 20.703125 43.90625
+L 28.59375 46.40625
+z
+" id="STIXGeneral-Italic-1d62b"/>
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.pdf
index 7c282bc1868b..323afa6acf0d 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.png
index 14c69bebcf4b..a8ea567f675e 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.svg
index cb9acb49de71..7fdb080a70a9 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.svg
@@ -31,33 +31,6 @@ L 12.90625 69
L 19.5 69
z
" id="STIXGeneral-Regular-2016"/>
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/mpl_toolkits/axes_grid1/anchored_artists.py b/lib/mpl_toolkits/axes_grid1/anchored_artists.py
index cd3844264f06..ec700257ea92 100644
--- a/lib/mpl_toolkits/axes_grid1/anchored_artists.py
+++ b/lib/mpl_toolkits/axes_grid1/anchored_artists.py
@@ -3,41 +3,153 @@
import six
+from matplotlib import docstring
+from matplotlib.offsetbox import (AnchoredOffsetbox, AnchoredText,
+ AnnotationBbox, AuxTransformBox, DrawingArea,
+ TextArea, VPacker)
from matplotlib.patches import Rectangle, Ellipse
-import numpy as np
-
-from matplotlib.offsetbox import AnchoredOffsetbox, AuxTransformBox, VPacker,\
- TextArea, AnchoredText, DrawingArea, AnnotationBbox
-
class AnchoredDrawingArea(AnchoredOffsetbox):
- """
- AnchoredOffsetbox with DrawingArea
- """
-
+ @docstring.dedent
def __init__(self, width, height, xdescent, ydescent,
loc, pad=0.4, borderpad=0.5, prop=None, frameon=True,
**kwargs):
"""
- *width*, *height*, *xdescent*, *ydescent* : the dimensions of the DrawingArea.
- *prop* : font property. This is only used for scaling the paddings.
- """
+ An anchored container with a fixed size and fillable DrawingArea.
+
+ Artists added to the *drawing_area* will have their coordinates
+ interpreted as pixels. Any transformations set on the artists will be
+ overridden.
+
+ Parameters
+ ----------
+ width, height : int or float
+ width and height of the container, in pixels.
+
+ xdescent, ydescent : int or float
+ descent of the container in the x- and y- direction, in pixels.
+
+ loc : int
+ Location of this artist. Valid location codes are::
+
+ 'upper right' : 1,
+ 'upper left' : 2,
+ 'lower left' : 3,
+ 'lower right' : 4,
+ 'right' : 5,
+ 'center left' : 6,
+ 'center right' : 7,
+ 'lower center' : 8,
+ 'upper center' : 9,
+ 'center' : 10
+
+ pad : int or float, optional
+ Padding around the child objects, in fraction of the font
+ size. Defaults to 0.4.
+ borderpad : int or float, optional
+ Border padding, in fraction of the font size.
+ Defaults to 0.5.
+
+ prop : `matplotlib.font_manager.FontProperties`, optional
+ Font property used as a reference for paddings.
+
+ frameon : bool, optional
+ If True, draw a box around this artists. Defaults to True.
+
+ **kwargs :
+ Keyworded arguments to pass to
+ :class:`matplotlib.offsetbox.AnchoredOffsetbox`.
+
+ Attributes
+ ----------
+ drawing_area : `matplotlib.offsetbox.DrawingArea`
+ A container for artists to display.
+
+ Examples
+ --------
+ To display blue and red circles of different sizes in the upper right
+ of an axes *ax*:
+
+ >>> ada = AnchoredDrawingArea(20, 20, 0, 0, loc=1, frameon=False)
+ >>> ada.drawing_area.add_artist(Circle((10, 10), 10, fc="b"))
+ >>> ada.drawing_area.add_artist(Circle((30, 10), 5, fc="r"))
+ >>> ax.add_artist(ada)
+ """
self.da = DrawingArea(width, height, xdescent, ydescent)
self.drawing_area = self.da
- super(AnchoredDrawingArea, self).__init__(loc, pad=pad, borderpad=borderpad,
- child=self.da,
- prop=None,
- frameon=frameon,
- **kwargs)
+ super(AnchoredDrawingArea, self).__init__(
+ loc, pad=pad, borderpad=borderpad, child=self.da, prop=None,
+ frameon=frameon, **kwargs
+ )
class AnchoredAuxTransformBox(AnchoredOffsetbox):
+ @docstring.dedent
def __init__(self, transform, loc,
pad=0.4, borderpad=0.5, prop=None, frameon=True, **kwargs):
+ """
+ An anchored container with transformed coordinates.
+ Artists added to the *drawing_area* are scaled according to the
+ coordinates of the transformation used. The dimensions of this artist
+ will scale to contain the artists added.
+
+ Parameters
+ ----------
+ transform : `matplotlib.transforms.Transform`
+ The transformation object for the coordinate system in use, i.e.,
+ :attr:`matplotlib.axes.Axes.transData`.
+
+ loc : int
+ Location of this artist. Valid location codes are::
+
+ 'upper right' : 1,
+ 'upper left' : 2,
+ 'lower left' : 3,
+ 'lower right' : 4,
+ 'right' : 5,
+ 'center left' : 6,
+ 'center right' : 7,
+ 'lower center' : 8,
+ 'upper center' : 9,
+ 'center' : 10
+
+ pad : int or float, optional
+ Padding around the child objects, in fraction of the font
+ size. Defaults to 0.4.
+
+ borderpad : int or float, optional
+ Border padding, in fraction of the font size.
+ Defaults to 0.5.
+
+ prop : `matplotlib.font_manager.FontProperties`, optional
+ Font property used as a reference for paddings.
+
+ frameon : bool, optional
+ If True, draw a box around this artists. Defaults to True.
+
+ **kwargs :
+ Keyworded arguments to pass to
+ :class:`matplotlib.offsetbox.AnchoredOffsetbox`.
+
+ Attributes
+ ----------
+ drawing_area : `matplotlib.offsetbox.AuxTransformBox`
+ A container for artists to display.
+
+ Examples
+ --------
+ To display an ellipse in the upper left, with a width of 0.1 and
+ height of 0.4 in data coordinates:
+
+ >>> box = AnchoredAuxTransformBox(ax.transData, loc=2)
+ >>> el = Ellipse((0,0), width=0.1, height=0.4, angle=30)
+ >>> box.drawing_area.add_artist(el)
+ >>> ax.add_artist(box)
+ """
self.drawing_area = AuxTransformBox(transform)
AnchoredOffsetbox.__init__(self, loc, pad=pad, borderpad=borderpad,
@@ -47,17 +159,64 @@ def __init__(self, transform, loc,
**kwargs)
-
class AnchoredEllipse(AnchoredOffsetbox):
+ @docstring.dedent
def __init__(self, transform, width, height, angle, loc,
pad=0.1, borderpad=0.1, prop=None, frameon=True, **kwargs):
"""
- Draw an ellipse the size in data coordinate of the give axes.
+ Draw an anchored ellipse of a given size.
+
+ Parameters
+ ----------
+ transform : `matplotlib.transforms.Transform`
+ The transformation object for the coordinate system in use, i.e.,
+ :attr:`matplotlib.axes.Axes.transData`.
+
+ width, height : int or float
+ Width and height of the ellipse, given in coordinates of
+ *transform*.
+
+ angle : int or float
+ Rotation of the ellipse, in degrees, anti-clockwise.
+
+ loc : int
+ Location of this size bar. Valid location codes are::
+
+ 'upper right' : 1,
+ 'upper left' : 2,
+ 'lower left' : 3,
+ 'lower right' : 4,
+ 'right' : 5,
+ 'center left' : 6,
+ 'center right' : 7,
+ 'lower center' : 8,
+ 'upper center' : 9,
+ 'center' : 10
+
+ pad : int or float, optional
+ Padding around the ellipse, in fraction of the font size. Defaults
+ to 0.1.
- pad, borderpad in fraction of the legend font size (or prop)
+ borderpad : int or float, optional
+ Border padding, in fraction of the font size. Defaults to 0.1.
+
+ frameon : bool, optional
+ If True, draw a box around the ellipse. Defaults to True.
+
+ prop : `matplotlib.font_manager.FontProperties`, optional
+ Font property used as a reference for paddings.
+
+ **kwargs :
+ Keyworded arguments to pass to
+ :class:`matplotlib.offsetbox.AnchoredOffsetbox`.
+
+ Attributes
+ ----------
+ ellipse : `matplotlib.patches.Ellipse`
+ Ellipse patch drawn.
"""
self._box = AuxTransformBox(transform)
- self.ellipse = Ellipse((0,0), width, height, angle)
+ self.ellipse = Ellipse((0, 0), width, height, angle)
self._box.add_artist(self.ellipse)
AnchoredOffsetbox.__init__(self, loc, pad=pad, borderpad=borderpad,
@@ -67,51 +226,100 @@ def __init__(self, transform, width, height, angle, loc,
class AnchoredSizeBar(AnchoredOffsetbox):
+ @docstring.dedent
def __init__(self, transform, size, label, loc,
pad=0.1, borderpad=0.1, sep=2,
frameon=True, size_vertical=0, color='black',
label_top=False, fontproperties=None,
**kwargs):
"""
- Draw a horizontal bar with the size in data coordinate of the given axes.
- A label will be drawn underneath (center-aligned).
+ Draw a horizontal scale bar with a center-aligned label underneath.
+
+ Parameters
+ ----------
+ transform : `matplotlib.transforms.Transform`
+ The transformation object for the coordinate system in use, i.e.,
+ :attr:`matplotlib.axes.Axes.transData`.
- Parameters:
- -----------
- transform : matplotlib transformation object
size : int or float
- horizontal length of the size bar, given in data coordinates
+ Horizontal length of the size bar, given in coordinates of
+ *transform*.
+
label : str
+ Label to display.
+
loc : int
+ Location of this size bar. Valid location codes are::
+
+ 'upper right' : 1,
+ 'upper left' : 2,
+ 'lower left' : 3,
+ 'lower right' : 4,
+ 'right' : 5,
+ 'center left' : 6,
+ 'center right' : 7,
+ 'lower center' : 8,
+ 'upper center' : 9,
+ 'center' : 10
+
pad : int or float, optional
- in fraction of the legend font size (or prop)
+ Padding around the label and size bar, in fraction of the font
+ size. Defaults to 0.1.
+
borderpad : int or float, optional
- in fraction of the legend font size (or prop)
+ Border padding, in fraction of the font size.
+ Defaults to 0.1.
+
sep : int or float, optional
- in points
+ Seperation between the label and the size bar, in points.
+ Defaults to 2.
+
frameon : bool, optional
- if True, will draw a box around the horizontal bar and label
+ If True, draw a box around the horizontal bar and label.
+ Defaults to True.
+
size_vertical : int or float, optional
- vertical length of the size bar, given in data coordinates
+ Vertical length of the size bar, given in coordinates of
+ *transform*. Defaults to 0.
+
color : str, optional
- color for the size bar and label
+ Color for the size bar and label.
+ Defaults to black.
+
label_top : bool, optional
- if True, the label will be over the rectangle
- fontproperties: a matplotlib.font_manager.FontProperties instance, optional
- sets the font properties for the label text
+ If True, the label will be over the size bar.
+ Defaults to False.
- Returns:
- --------
- AnchoredSizeBar object
+ fontproperties : `matplotlib.font_manager.FontProperties`, optional
+ Font properties for the label text.
+
+ **kwargs :
+ Keyworded arguments to pass to
+ :class:`matplotlib.offsetbox.AnchoredOffsetbox`.
+
+ Attributes
+ ----------
+ size_bar : `matplotlib.offsetbox.AuxTransformBox`
+ Container for the size bar.
- Example:
+ txt_label : `matplotlib.offsetbox.TextArea`
+ Container for the label of the size bar.
+
+ Notes
+ -----
+ If *prop* is passed as a keyworded argument, but *fontproperties* is
+ not, then *prop* is be assumed to be the intended *fontproperties*.
+ Using both *prop* and *fontproperties* is not supported.
+
+ Examples
--------
>>> import matplotlib.pyplot as plt
>>> import numpy as np
- >>> from mpl_toolkits.axes_grid1.anchored_artists import AnchoredSizeBar
+ >>> from mpl_toolkits.axes_grid1.anchored_artists import \
+AnchoredSizeBar
>>> fig, ax = plt.subplots()
>>> ax.imshow(np.random.random((10,10)))
- >>> bar = AnchoredSizeBar(ax.transData, 3, '3 units', 4)
+ >>> bar = AnchoredSizeBar(ax.transData, 3, '3 data units', 4)
>>> ax.add_artist(bar)
>>> fig.show()
@@ -119,18 +327,16 @@ def __init__(self, transform, size, label, loc,
>>> import matplotlib.font_manager as fm
>>> fontprops = fm.FontProperties(size=14, family='monospace')
- >>> bar = AnchoredSizeBar(ax.transData, 3, '3 units', 4, pad=0.5, sep=5, borderpad=0.5, frameon=False, size_vertical=0.5, color='white', fontproperties=fontprops)
-
+ >>> bar = AnchoredSizeBar(ax.transData, 3, '3 units', 4, pad=0.5, \
+sep=5, borderpad=0.5, frameon=False, \
+size_vertical=0.5, color='white', \
+fontproperties=fontprops)
"""
-
self.size_bar = AuxTransformBox(transform)
self.size_bar.add_artist(Rectangle((0, 0), size, size_vertical,
fill=False, facecolor=color,
edgecolor=color))
- # if fontproperties is None, but `prop` is not, assume that
- # prop should be used to set the font properties. This is
- # questionable behavior
if fontproperties is None and 'prop' in kwargs:
fontproperties = kwargs.pop('prop')
@@ -157,73 +363,3 @@ def __init__(self, transform, size, label, loc,
child=self._box,
prop=fontproperties,
frameon=frameon, **kwargs)
-
-
-if __name__ == "__main__":
-
- import matplotlib.pyplot as plt
-
- fig = plt.gcf()
- fig.clf()
- ax = plt.subplot(111)
-
- offsetbox = AnchoredText("Test", loc=6, pad=0.3,
- borderpad=0.3, prop=None)
- xy = (0.5, 0.5)
- ax.plot([0.5], [0.5], "xk")
- ab = AnnotationBbox(offsetbox, xy,
- xybox=(1., .5),
- xycoords='data',
- boxcoords=("axes fraction", "data"),
- arrowprops=dict(arrowstyle="->"))
- #arrowprops=None)
-
- ax.add_artist(ab)
-
-
- from matplotlib.patches import Circle
- ada = AnchoredDrawingArea(20, 20, 0, 0,
- loc=6, pad=0.1, borderpad=0.3, frameon=True)
- p = Circle((10, 10), 10)
- ada.da.add_artist(p)
-
- ab = AnnotationBbox(ada, (0.3, 0.4),
- xybox=(1., 0.4),
- xycoords='data',
- boxcoords=("axes fraction", "data"),
- arrowprops=dict(arrowstyle="->"))
- #arrowprops=None)
-
- ax.add_artist(ab)
-
-
- arr = np.arange(100).reshape((10,10))
- im = AnchoredImage(arr,
- loc=4,
- pad=0.5, borderpad=0.2, prop=None, frameon=True,
- zoom=1,
- cmap = None,
- norm = None,
- interpolation=None,
- origin=None,
- extent=None,
- filternorm=1,
- filterrad=4.0,
- resample = False,
- )
-
- ab = AnnotationBbox(im, (0.5, 0.5),
- xybox=(-10., 10.),
- xycoords='data',
- boxcoords="offset points",
- arrowprops=dict(arrowstyle="->"))
- #arrowprops=None)
-
- ax.add_artist(ab)
-
- ax.set_xlim(0, 1)
- ax.set_ylim(0, 1)
-
-
- plt.draw()
- plt.show()