diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
index 9993cd5f1f73..126fef3e27a4 100644
--- a/lib/matplotlib/mathtext.py
+++ b/lib/matplotlib/mathtext.py
@@ -890,7 +890,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',
@@ -932,6 +931,7 @@ class DejaVuSerifFonts(DejaVuFonts):
'sf' : 'DejaVu Sans',
'tt' : 'DejaVu Sans Mono',
'ex' : 'DejaVu Serif Display',
+ 0 : 'DejaVu Serif',
}
class DejaVuSansFonts(DejaVuFonts):
@@ -946,6 +946,7 @@ class DejaVuSansFonts(DejaVuFonts):
'sf' : 'DejaVu Sans',
'tt' : 'DejaVu Sans Mono',
'ex' : 'DejaVu Sans Display',
+ 0 : 'DejaVu Sans',
}
class StixFonts(UnicodeFonts):
@@ -1996,20 +1997,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/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"/>
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+