From 0993b997cdeb13170b4590335651c8f52d1e8b2e Mon Sep 17 00:00:00 2001
From: Michael Droettboom <mdboom@gmail.com>
Date: Tue, 3 Mar 2015 13:21:03 -0500
Subject: [PATCH 1/3] Fix calculation of height of minus sign

---
 lib/matplotlib/mathtext.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
index 9f975bda9312..bbc3ebd551da 100644
--- a/lib/matplotlib/mathtext.py
+++ b/lib/matplotlib/mathtext.py
@@ -188,7 +188,7 @@ def render_glyph(self, ox, oy, info):
                               oy - info.metrics.ymin)
         else:
             info.font.draw_glyph_to_bitmap(
-                self.image, ox, oy - info.metrics.iceberg, info.glyph,
+                self.image, ox, oy - info.metrics.ymax, info.glyph,
                 antialiased=rcParams['text.antialiased'])
 
     def render_rect_filled(self, x1, y1, x2, y2):
@@ -621,6 +621,8 @@ def _get_info(self, fontname, font_class, sym, fontsize, dpi):
             ymax    = ymax+offset,
             # iceberg is the equivalent of TeX's "height"
             iceberg = glyph.horiBearingY/64.0 + offset,
+            vbearing = (glyph.horiBearingY/64.0 +
+                        glyph.vertBearingY/64.0 + offset),
             slanted = slanted
             )
 
@@ -1307,8 +1309,11 @@ def _update_metrics(self):
             self.width = metrics.advance
         else:
             self.width = metrics.width
-        self.height = metrics.iceberg
-        self.depth = -(metrics.iceberg - metrics.height)
+        if self.c in ('-', '\minus'):
+            self.height = metrics.vbearing
+        else:
+            self.height = metrics.iceberg
+        self.depth = max(-metrics.ymin, 0)
 
     def is_slanted(self):
         return self._metrics.slanted

From 2a5923a435ae2d6cf7beb33d3154367e34d6bd30 Mon Sep 17 00:00:00 2001
From: Michael Droettboom <mdboom@gmail.com>
Date: Tue, 3 Mar 2015 13:26:36 -0500
Subject: [PATCH 2/3] Add test

---
 .../test_mathtext/mathtext_cm_68.pdf          | Bin 0 -> 7085 bytes
 .../test_mathtext/mathtext_cm_68.png          | Bin 0 -> 719 bytes
 .../test_mathtext/mathtext_cm_68.svg          |  67 ++++++++++++++++++
 .../test_mathtext/mathtext_stix_68.pdf        | Bin 0 -> 3626 bytes
 .../test_mathtext/mathtext_stix_68.png        | Bin 0 -> 740 bytes
 .../test_mathtext/mathtext_stix_68.svg        |  56 +++++++++++++++
 .../test_mathtext/mathtext_stixsans_68.pdf    | Bin 0 -> 3626 bytes
 .../test_mathtext/mathtext_stixsans_68.png    | Bin 0 -> 740 bytes
 .../test_mathtext/mathtext_stixsans_68.svg    |  56 +++++++++++++++
 lib/matplotlib/tests/test_mathtext.py         |   3 +-
 10 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.pdf
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.png
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.svg
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.pdf
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.png
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.svg
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.pdf
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.png
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.svg

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..61a62e8bdf03b7856fd87d3335d46b59751b554b
GIT binary patch
literal 7085
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
F{{ji>;9~#)

literal 0
HcmV?d00001

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7802075e756e2e74d850a2965aa6224744ac56e
GIT binary patch
literal 719
zcmeAS@N?(olHy`uVBq!ia0y~yVB!U`y*b!`<ma|6XMhw-v6E*A2N2Y7q;vrJoCO|{
z#S9Gmi6G3l!hU%sP*<U+i(^Q|oVRxj{j>rZS|3^;>5~vn%FWDl&V9|Kks!bB$RXE^
z#D`)zH(FYIw>GwTa$KyOy1x1&&qQ;dXTP<CcAV6#PfJ*}EOQnU!-wX;>&y%dbppH$
z4lX7P41yOK7+hSK83Y9BAi#6s^l9(RS<9}@JewAL@BV%MEgUbHFETK1iP1Zqw>`Tw
z%|>o|dwV;xF4HdulLHK)p<A!-Jed+?XJ=Pe$$LS35hL4*w`)7|KmWXQl}*CnBEykm
zj|*?+ZGZat^XAu@4(u+>7f$7vY5V*8$DU`fQjls0)6>&Cb^CVob>jxUIVH9XFRqnX
z>AwE@YySK2(9n19-=98v_H2C&tBf+x4dvzK-yh%CU%zhMzkPMJwYt-%Pj8>cDx(OJ
zs;#~I>ht;Y=bwK2_RS%?A^Dj(uYtpFyXA>nqo!`&ym{|==D%uE2@T(B{SH5VoE)hm
zwto-X3vQrJ6RF;)c-<ererc7)PQQHlGV@xdzSyg8eotk7vG)CKp4=;?v9EUNJ%9e3
zJ&IMv8Wa_G<}olREn;No=wM?|P?BP3=*XbEz$f-Xwm8xKEoo}N6v^P}>gTe~DWM4f
D>W2B2

literal 0
HcmV?d00001

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.svg
new file mode 100644
index 000000000000..0134edaaf7ce
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Created with matplotlib (http://matplotlib.org/) -->
+<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <style type="text/css">
+*{stroke-linecap:butt;stroke-linejoin:round;}
+  </style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="
+M0 54
+L378 54
+L378 0
+L0 0
+z
+" style="fill:#ffffff;"/>
+  </g>
+  <g id="text_1">
+   <!-- $\left|\minus\right\rangle$ -->
+   <defs>
+    <path d="
+M11.9219 -23.1875
+L11.9219 73.1875
+Q11.9219 73.9688 12.5 74.4844
+Q13.0938 75 13.9219 75
+Q14.6562 75 15.2812 74.4844
+Q15.9219 73.9688 15.9219 73.1875
+L15.9219 -23.1875
+Q15.9219 -23.9688 15.2812 -24.4844
+Q14.6562 -25 13.9219 -25
+Q13.0938 -25 12.5 -24.4844
+Q11.9219 -23.9688 11.9219 -23.1875" id="Cmsy10-6a"/>
+    <path d="
+M7.8125 -114.016
+Q7.8125 -113.484 8.01562 -113.281
+L33.1094 -56
+L8.01562 1.3125
+Q7.8125 1.51562 7.8125 2
+Q7.8125 2.73438 8.39062 3.35938
+Q8.98438 4 9.8125 4
+Q10.9844 4 11.7188 2.78125
+L37.2031 -55.3281
+Q37.3125 -55.5156 37.3125 -56
+Q37.3125 -56.5 37.2031 -56.7812
+L11.7188 -114.797
+Q10.9375 -116.016 9.8125 -116.016
+Q8.98438 -116.016 8.39062 -115.375
+Q7.8125 -114.75 7.8125 -114.016" id="Cmex10-ae"/>
+    <path d="
+M62.0938 22
+L6.40625 22
+L6.40625 28.5938
+L62.0938 28.5938
+z
+" id="STIXGeneral-Regular-2212"/>
+   </defs>
+   <g transform="translate(181.86 30.31125)scale(0.12 -0.12)">
+    <use transform="translate(0.0 19.53125)scale(0.75296875)" xlink:href="#Cmsy10-6a"/>
+    <use transform="translate(20.8463439941 0.703125)" xlink:href="#STIXGeneral-Regular-2212"/>
+    <use transform="translate(89.3463287354 73.484375)scale(0.627392266632)" xlink:href="#Cmex10-ae"/>
+   </g>
+  </g>
+ </g>
+</svg>
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
new file mode 100644
index 0000000000000000000000000000000000000000..0227e41390c7d6b78200cefef5624fe53cf1694b
GIT binary patch
literal 3626
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

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..99a88a0b687f3217373efece460351d4bf64dfce
GIT binary patch
literal 740
zcmeAS@N?(olHy`uVBq!ia0y~yVB!U`y*b!`<ma|6XMhw-v6E*A2N2Y7q;vrJoCO|{
z#S9Gmi6G3l!hU%sP*<C$i(^Q|oVT|Y`Y9($v_8zAB_*?o=^$@|qM`&36K96Z!D8K(
z1qu(D0wi>}nw=Lp6fm<eHnl}=KiPHHcJs}$TVE<;tpCrK`I&ZWS?=v^3=IF0E_`QT
zNU-Z*V^C0%Vrb~dU|>*M#K_P=4*{_Yr%!wD-MhDR-}k?NW7*l+g(FzbFkfWge(~YM
zhIQ-LTi=)FVcWWGTiEyS--RPs&sbe#C@HF`iAhgSuRYIDr6ASd7Zx7=`tjq%aq;oL
z=P~)r%wVvxwzB%PjZtg@ka_$5{q?tR-~RRI&zov41J^~2FLEqou04B}cK7bxuePi+
zlz`@$$@RZ}_;6uaS=le30T(yCXLQ(aW@h&4@87@M&(B`A^7H4<x9;Bk`}6MEv%YWN
zzP)<s(j^l$CSxa)15MVpwrkg~UvEDzGCuzQ)6ZA0hQ`Lk_!Nm5G`leC>;NkEdp>{u
z{Orogonc{NYFjvFg#Nn>^gv~0q`JB~!~+S8roNy3zaM*CXlrYG_1d*-^>Hj`nn6+X
zUhqJPt)1Pq43kwCGp>9WN$3N`$fM_+0}xMWsllFM|FMXuSsIO+z+}qc>FVdQ&MBb@
E07F3!LI3~&

literal 0
HcmV?d00001

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
new file mode 100644
index 000000000000..996f130e4aa0
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Created with matplotlib (http://matplotlib.org/) -->
+<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <style type="text/css">
+*{stroke-linecap:butt;stroke-linejoin:round;}
+  </style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="
+M0 54
+L378 54
+L378 0
+L0 0
+z
+" style="fill:#ffffff;"/>
+  </g>
+  <g id="text_1">
+   <!-- $\left|\minus\right\rangle$ -->
+   <defs>
+    <path d="
+M32.2969 24
+L11.7031 -21.2969
+L6.5 -21.2969
+L25.7031 25
+L6.59375 71.2969
+L11.7969 71.2969
+L32.2969 26
+z
+" id="STIXGeneral-Regular-27e9"/>
+    <path d="
+M13.2969 -1.40625
+L6.70312 -1.40625
+L6.70312 67.5938
+L13.2969 67.5938
+z
+" id="STIXGeneral-Regular-7c"/>
+    <path d="
+M62.0938 22
+L6.40625 22
+L6.40625 28.5938
+L62.0938 28.5938
+z
+" id="STIXGeneral-Regular-2212"/>
+   </defs>
+   <g transform="translate(181.62 30.31125)scale(0.12 -0.12)">
+    <use transform="translate(0.0 2.234375)scale(1.09125905797)" xlink:href="#STIXGeneral-Regular-7c"/>
+    <use transform="translate(21.8249969482 0.703125)" xlink:href="#STIXGeneral-Regular-2212"/>
+    <use transform="translate(90.3249816895 17.953125)scale(0.813196085049)" xlink:href="#STIXGeneral-Regular-27e9"/>
+   </g>
+  </g>
+ </g>
+</svg>
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
new file mode 100644
index 0000000000000000000000000000000000000000..26bf2f8a30b0be5916af07d0298c0d7fa00e5344
GIT binary patch
literal 3626
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

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..99a88a0b687f3217373efece460351d4bf64dfce
GIT binary patch
literal 740
zcmeAS@N?(olHy`uVBq!ia0y~yVB!U`y*b!`<ma|6XMhw-v6E*A2N2Y7q;vrJoCO|{
z#S9Gmi6G3l!hU%sP*<C$i(^Q|oVT|Y`Y9($v_8zAB_*?o=^$@|qM`&36K96Z!D8K(
z1qu(D0wi>}nw=Lp6fm<eHnl}=KiPHHcJs}$TVE<;tpCrK`I&ZWS?=v^3=IF0E_`QT
zNU-Z*V^C0%Vrb~dU|>*M#K_P=4*{_Yr%!wD-MhDR-}k?NW7*l+g(FzbFkfWge(~YM
zhIQ-LTi=)FVcWWGTiEyS--RPs&sbe#C@HF`iAhgSuRYIDr6ASd7Zx7=`tjq%aq;oL
z=P~)r%wVvxwzB%PjZtg@ka_$5{q?tR-~RRI&zov41J^~2FLEqou04B}cK7bxuePi+
zlz`@$$@RZ}_;6uaS=le30T(yCXLQ(aW@h&4@87@M&(B`A^7H4<x9;Bk`}6MEv%YWN
zzP)<s(j^l$CSxa)15MVpwrkg~UvEDzGCuzQ)6ZA0hQ`Lk_!Nm5G`leC>;NkEdp>{u
z{Orogonc{NYFjvFg#Nn>^gv~0q`JB~!~+S8roNy3zaM*CXlrYG_1d*-^>Hj`nn6+X
zUhqJPt)1Pq43kwCGp>9WN$3N`$fM_+0}xMWsllFM|FMXuSsIO+z+}qc>FVdQ&MBb@
E07F3!LI3~&

literal 0
HcmV?d00001

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
new file mode 100644
index 000000000000..996f130e4aa0
--- /dev/null
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Created with matplotlib (http://matplotlib.org/) -->
+<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <style type="text/css">
+*{stroke-linecap:butt;stroke-linejoin:round;}
+  </style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="
+M0 54
+L378 54
+L378 0
+L0 0
+z
+" style="fill:#ffffff;"/>
+  </g>
+  <g id="text_1">
+   <!-- $\left|\minus\right\rangle$ -->
+   <defs>
+    <path d="
+M32.2969 24
+L11.7031 -21.2969
+L6.5 -21.2969
+L25.7031 25
+L6.59375 71.2969
+L11.7969 71.2969
+L32.2969 26
+z
+" id="STIXGeneral-Regular-27e9"/>
+    <path d="
+M13.2969 -1.40625
+L6.70312 -1.40625
+L6.70312 67.5938
+L13.2969 67.5938
+z
+" id="STIXGeneral-Regular-7c"/>
+    <path d="
+M62.0938 22
+L6.40625 22
+L6.40625 28.5938
+L62.0938 28.5938
+z
+" id="STIXGeneral-Regular-2212"/>
+   </defs>
+   <g transform="translate(181.62 30.31125)scale(0.12 -0.12)">
+    <use transform="translate(0.0 2.234375)scale(1.09125905797)" xlink:href="#STIXGeneral-Regular-7c"/>
+    <use transform="translate(21.8249969482 0.703125)" xlink:href="#STIXGeneral-Regular-2212"/>
+    <use transform="translate(90.3249816895 17.953125)scale(0.813196085049)" xlink:href="#STIXGeneral-Regular-27e9"/>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
index 365f1a3d456c..f635b0779166 100644
--- a/lib/matplotlib/tests/test_mathtext.py
+++ b/lib/matplotlib/tests/test_mathtext.py
@@ -92,7 +92,8 @@
     r"$\left(2 \, a=b\right)$", # Sage bug #8125
     r"$? ! &$", # github issue #466
     r'$\operatorname{cos} x$', # github issue #553
-    r'$\sum _{\genfrac{}{}{0}{}{0\leq i\leq m}{0<j<n}}P\left(i,j\right)$'
+    r'$\sum _{\genfrac{}{}{0}{}{0\leq i\leq m}{0<j<n}}P\left(i,j\right)$',
+    r'$\left|\minus\right\rangle$' # github issue #3374
 ]
 
 digits = "0123456789"

From 325c7786e9499996ae1c5b92eb765ed27d5ff03d Mon Sep 17 00:00:00 2001
From: Michael Droettboom <mdboom@gmail.com>
Date: Tue, 3 Mar 2015 13:26:40 -0500
Subject: [PATCH 3/3] Update broken test images

---
 .../test_mathtext/mathtext_cm_07.pdf          | Bin 7041 -> 7046 bytes
 .../test_mathtext/mathtext_cm_21.pdf          | Bin 17755 -> 17766 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_07.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_07.pdf
index 0313d072518d962482f25adccc71d5316536dad3..86695643ed12e3c252e67402f4eed9d32d47ed13 100644
GIT binary patch
delta 658
zcmZoPZ!_Ou$H?KBmzQ5stPnlficy}CYjPB0c)cy(Ap;(_^7)69d03AB%-p2pn7-r=
z!<9uHd_Jv@3&ix=M1wTAg`2-d&Yw4bjbZaKInK>zI;5f%ZnBy9POzC?5++u4l+#MF
zN^$cUjZ$v$LV<N2TyIT`9w#>VYAq{i`RZ47?8?DMyN*mzT=8Ph_9r)eS^SSI7MK;9
zEd4(1$n8Q;ZI_Ug-olF}Q&;4zZ|a?A_xFsf)<fIZ`j7bERqr)9^XK*Z+$P%t!oF&L
ztz4;jDa9p4sfoEDR(?_zm!YA8fdZIeZnC+7$yAKf*udD(*wE6%eDXet<*8;01|Xo2
zr@#ef7?>FvSYnEq8exi=8)J%DnqY_-8JbQ$C8@?_VKVuXq*}c(hAtyhV+<ROj7>0X
zG%_$XKsVjk)WQ^9%)rbP!wy4ZBZwXKNM1Fuw7~GbiMb^(#8898#Ka84fo2BA=IH8-
n&5SU`EG#UL)yaU2HZicoaG{xzrP*X7X?G5DE>%@me>W}w3XQa<

delta 670
zcmZoOZ#3Uv$2i%GQJPU<avEcJy&>Nr10L7%`G=HwT8?<mNpWpD=dqJ<g{!FS46fr3
zbz*pgnWnUM9{hFf{O4evZwVWmd-tB{V3WSEi8sS}ip{hyeqw)nn725UIDIo(e1&(;
zk%ff|mm1ttu)M>&;S~SmM+r$EW_;gp=Y(-$USiq2<adgzp3Iz^_Nge2qe^hQlSEL|
zLDp}=kKXPOQPO<7=IhBeuMqRqFN9wE+ZP`9GMM~R>EDBW*Sx)5_W#>^ZUgHM=3FiR
z?_8;QDa9p4sfoEDR(?_zm!YA8fdZIeVF(v9o7~8#zIhuHix{V&k-4FXfw7^%<iirn
zQ-O*>Kp{_o3(PPuGc+*46f-f$6f?8H6tl3z5HkYWbY4=8$=qo2cS*H+BMe<erp6dH
z8W|g7*l1*6Vv26Mv8jatx|o5P35Fep#zqi3>XE!^VrhZleG_vFGjsz@Ow2GGXl7t+
rgs#rm%m`D=!onC?oeU_HO$;nBTxe!wX*k(j+MUCQOI6j?-;E0Z#-zTa

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf
index 3657cd1d0f61705396c2fea07a3abddcb1df5748..e813a33c599066f3b7b564f60b3d2c5c20beec6d 100644
GIT binary patch
delta 1513
zcmZXTeN0bb6vuaC(amf5)o&<wqvUNp&wZZz+~-meOSAYzvm(oHRN9Xem5q!a<t2G{
zN3~KCu{D*qd8uhxTQ4&+8Pn@V+Ndxginu=-{qA%AI`{0H^F7b!oZFnqb!Kwq0o>@o
zgoMPDWMQ2;pPR<<Y9tq74Kcj|6Iuo)t#>^B^mA>`c$X<NJiAWch^c)Po#8ma;YjZ`
z&a@9l<nBG8y6+U+&Ye%XS5h*+BRF`lsc70(|J|S5$MvLidBryWdLEVTv8`$F?lo9?
zTxm)r-yZs}8T;9P@}ipjm*&>{H#bB$h1J)*J8XWxGx|mM;cHzac(2hKbs%kS;F+c^
z(^L8kCSiZrk?-q%TzbWUkCVR|-0CK!HJChR?#cgRo>R0hCuEIz_NDAi;fGdQqA!0L
z>6F~?Zor|iuA{iZ^2(*CG-_&M%&d<^(uvu|aF4KF-|TYYbBaEO^(~#2%M%^ESL}jM
z{mI*!waZ?owd2<hA8kL_Zk6sCbIQAWA9P0+Ud`EFu)4M}J-wwZvM|2d(Bd3Fr}R{o
zPbzop*7CvVVlFe|d3b<J?z6_JWrC@#YOWHRHnKNP%JTC)8PHd8=4Wf(txCgai+rbn
zKiU!Eym;+xi{}_~uJJ=qXUP@f)5Y!RhpCQyp4&XqlNT{)Oe)N9Z>$_&m;9!&?_z6J
z|DJ%m1&@D@D(iU?r*f{Y1}Fd_apPtl1IouH#MoR&)KwE_-aI>^Z-JL6K&)ki3BF6Q
zAj(576p%RNA^`*S`od}_1Q0|}k&wE3QLz<D0<f8oAn<=2NJK)I7($x9E)PjsZ+%Qg
zY)sK6v&+*y$X{LcLf}{jiq*0}Z$F|<ZJ#D#M46a~^`ihxRc?u^6;oD-Ql={u0h0#_
zQS?fpC^NO9On^QQiSnN*t-~k+M5vx3Kng32G1gNAGSWKfP{<JIHw6fV!)rBt%_x!>
zK7;_~B?_?}jLrV79w<m*C}=b5V-OH_R}@)U)Ko(HdjOO$Hv*`_V1<&Vq8kumD(lHW
zEP=litp8sE350rKsBzU(fDm9k1+5Y@wUFBWDLY!)86mq`8-FNDLzg{l7?H9K5oFc`
ok<4I)7>afxHVuO1VYiTyw80V|o5cI6o<Z12B)pebQ0P+rH&V)|EC2ui

delta 1477
zcmZXTYe-a45XW7$*M{^WDNOeEP%Hw^`<~lVqjgD3Ez4U8E!&64w%U}a%<39em=u+_
z0!@OTtgxc8RuCWgC6nyAAWBb)l**Kh3S)a*%L>oApN6?J^Pl<6oQ`7KlVaP|c{VfI
z7G+b+bvE6&oBA|ibnOGZ<xyO2;K<uNB`0yM=IT8b)jal6$O7f#++c{i;J7=bXGa&E
zSyV{3ZCbKI|6JmT?(-hmbEC7}Y}m5iSG{JL|C4VnZ5x@|<fx{%Z$el8>4^F*qbl~+
zyTXdvstUeUW^HF(Hxg1}Gv^0$o1&&(b@;D5nbc=^wvMr14_~z5>*0sbbiOw{Ii|z+
z(JUTz>z21oU#VmapD}xTc`)ybarsbaWW1;D;?cEbt0pcuclbo>xM?lZD|<%no03u1
zT~V5Hs3tY1_L%dfD{9gTa4GieNjLCBrz<(--jckQK=Rb^#bv!?&*pDzJy=z8dq_ie
z<NngucB8?&4I)qb*WK;(%!SgN7t5Oh`wO2xFH85ovUf-L$Ln`e#@B@;t!6*31wxz)
z-^V!)-g}pQMIU{>%bk4xl+qY1?Rebz=22&!?r+E{X{`>O{NYRHD$liD+0M91_Mq^M
z7r(A+4hAx^j^8Vo^&RdUYA=tBXFcV5--O&V6N&=$qwZAozReGGyT8wKJWcET5r%vZ
zo6V(R(KfBh7Zx`shA2o?fU-=9Pr?cT113@+88D%Oky$&xaRfvvBmhHd9!RJ#fc3xs
zQ#LF1-v(reQptyrRZ@t<1j;^!WFN<Z&nm?JXqc6W5uqwFYZ7A(%ET~A`iB}M3n;>3
zD}ZoWf)Q1g<*K9sq4p=v_|E`9M!6`A5R;OTN;EMJBPKPCnJO{`m=6dK=o<ZV5`smj
zKt)^<QGq5d4loX+T#oy1VK6~PHE9ry0Yk#2VJ=b7tiFYU&|0QckYgD&r%1dGz}er6
zG5(z(;F^RLQXrot;Z!683DHCfkU<~{LksKRrY-&u0xVL15MwDBayU5I%0&Q4xz<w>
n*8~xl>tX9f&JnR<Rl*91)s7g)2qR{s(=`H8drXWoEy?~1-?W`=