From 4ac330011eb45d2e727bf2d2da92ee3cb8800b36 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 12 Sep 2016 12:53:01 +0300
Subject: [PATCH] TST: Restore broken `test_use14corefonts`

History:

 - c0fcab47260fc8909f52f6532ae430289a2b4493 - disabled on travis
 - f4adec7b569cfd0b30e0f8367ba8618b9e160f92 - commented out
 - ff227d3e366c4b2feeaa6f8389007827c0323ff1 - enabled, but chopped
---
 .../test_backend_pdf/pdf_use14corefonts.pdf        | Bin 2013 -> 3589 bytes
 lib/matplotlib/tests/test_backend_pdf.py           |  34 +++++++++++++--------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/pdf_use14corefonts.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/pdf_use14corefonts.pdf
index bbe66a67bcc22fd7cb3e3f33be32c6e58f8d53c2..5cdc2e34e25d21c805df535b9e1795de50917e4b 100644
GIT binary patch
literal 3589
zcmai1U5?u}5PsJw1_2gHkVfK<BuhaWVE>c0K{mF56e#*2%e1YnEjbdsyXjN!)1IJb
z=>>9&&QPQ*d%e2`43Wc``DTVg@zc@O*~M$_hu+aY|H0q?dK?&3lWXtoTL`YQxoSY5
zWC+3d+gd?zn(1s=&EefUPnA<rOnL_AclvUqGp!(OjV`KEgKWoFnbxW<A)=`lT-8-R
zQW}0koU;q`ukJJiA6AHYVxOn>`2l{1V6@1lMLCDKHUIU~<XYt#2FCd|9L`YS5;!i)
zN;e3B_NN$%Dsh&!4le6zvj$4@bOgbfx+!usyhLc6jq9vz)>*B}{F}?X)kmP<qnZ}k
zNp**Q2`n1K5K2K9S7f4H#fGY>Hg%3Aq#AW4q^kDnN8z}5e^KRJFM!h~3`wWawaQkw
zDcAU)qx2g8w<aM5Q{Zrk|G7tDtUL;Y!O}b_pe4%N=fd-5UT}=64QgC^1Az;^ARC_e
zVLL%XGm%N+CuodHZfNYkf-?)l7>#5Y`7zWAzCa1Vu^{IHe!_q-NI&X@N#SuAUV6PU
z=M4b}9(O^|c<Ff~?=yVe^><4__xGqZwkh=DMB`pUE<2Y6uDT4|l5t@`J1=gjXJwOP
zm>k1hIF#VL=bAtUSY7mcvaRB(9fqd1xL}=fxb;rP5L|HVlJU%ov9wrQ>4#Aa<Ei(8
z`RpZ(ui<>`OiXb-9&=wLZXeyO!?l7o3+$j)TP9E8^C<GE7X1Lk!2m>rfl%w4Msl+*
z04s0-bknB-5Mi{79v(!OGW8SNxhv1jI&>>==-u=wbSXos>Q4Ic!2m*$`n)?wZq@~0
z1ulSY`cwd+kW|&30Fr|N9O(3I+x3s~wxgc{kGP<s_Q3fA-M2kR=I!UYeJ`eP`)+x-
z<D=M5u#cH9vG9*|JYsST5Z`QgmSQ(Hr>w>8RwGWxc4`zJIBhL9XDJ>!2Y$HQ2|U4j
zGPL0BxDW1DEqG7iaqvNc8}7glH#>sc^J6l%;~sdo+Jg5L9t9WJF)>!ZE&Jg{M{vng
zRBJQ0;~sdo+Jg5L9tD>icb+-$!%a@$<~}lsx5GZPU9-sc=6b5vWD@zQZMI&6+t)A;
z={?Nxb`z1rx?_+64?30T81$l6>h-cH6=)(X>#8YqQI%>6*PBK|HmPnDWH4E76p)%b
zy1UL<<V);h5pqA_w*FZ;g&avrR+PkZnrfxsf+)xW@<mo>IkKk)NJ}pis7+l#^KCV$
zmTwMX2rhk|MtH^Ib)L3We)dt-c>(M1>+cx(riLYw6J$((J==4E+ii+~g&M?oGGr?8
z-l7tW6=q3<ZIb1GAO(cm0vSuSrXs+mQ9R76TFo$z=Erfp>GJ>V5n;4^#!^SabBOy0
zeCazriKX5WqLZvqhC>GL)$&H^BF`W=FZ0S!!Qe|#9+yqA6^u3$ZFnlNRqk2RYCLQy
zBJokjxbWIFfQD_^u!y_5b>vKjA|9j6dfSrR0HfhV)2Pj@8h===NBW2ZTZnC3#NO@+
ziQnE6_DghHZIE&z?9auNsIDQvLt>*XV{b|P7KQiIKSg>;J9kE${l(cE!FbG4j{P2S
z$zL(~oU!LGy};;IHN045dcCalvY3GIk(x|GACG_*ERz0I-LO~lFl5<uHv0h<TCd*(
z!PdgB>N)yC;y>NwYS-C%I&&TMvR9`&Y$ar|JoH%igE)$01T*MlNF2>7@=z-iX^MrT
zUr&}WOnqO5p7v#_#17cgOQQpN#J6|#7>n=eF?`+J(-ZjK+p`rhUcLLW0lQ}_S=7r-
x*IBVtwfSEAP|hka`->kN!>XdTFdrVH;!lM|Y`-Y7TAQ*;A(?k{bpGkW`yZE{NnQW|

delta 1229
zcmZpbxywI6#ww(;AXP!%Ik6-$CqG?5KOiwZwOGMO!9XEM!Oo5=H7_MUDT~Vj$Oq9j
zHVXO?{z+M>$t4Qr6H{E(Tq{c4gG&-iQWZ=<TDbIsGZIrW^U@W}z$WOs<>!?s7*9MX
zGx4VdAIS8gRG<LZ_{oNhGLxejWi0ibfr@~_#R`^a)`IvjYuz$)N>Ymy^xblRwz;Gx
z=clAj?q-y#ub9(1^=#f81A*i3ZH{Uz|0cj*pWw4pPH1aq$jTu52~}yGlT}j_xpOYx
z`?agKyYHacy=hG1=PNeUC;zrLYhB)PNcqSI9+7v8B-S#ktUR(!F8ZKk)W+QJ7oAH=
zdzGu+?CK6```a>8F+|YNa%<_1AeV*h_Li4<{<Gyx5xDe6O{iXJ;pGpkQag5~rRA}`
zS5V_rOBGu5A=AZB%l71r(l3_3UbG!a6D{+YF=J!U<j@k~pFVuSL5EaY|CVuaoxkYI
z7rtFY<O%=8BVP>c{aln3_xHygQK{qnDZJ<G-3b#V0zEl{`(D_%Z{4R{UEb_Bxn+iq
zvrY7o%`DL`Kb$MBcx}C>zTEtSkIM6$jVGSjD0^9K`z&+&SKr&ayk^gn?kp0}7ysCl
z+VX32*}TKi_aE-v-6-DEA1(6es*+v6UVTP({_Y14ypx#c2AI9O(6j9S#h3*J)nAOS
zsH@cYu2WDAToLB=qV3c~4@29$nb+p6w6iE|{-HH9=t}9Xbp_2~S3(}Q%zIPM@U}_J
z_W1RSnQj%^^a_gK`=}Z(T5G$ww!n$~W2lL6mr6<Oon^l=-ImO{aE))v(<Wi7j`fQy
zeLJ7LKE#*rRbH;s8Fl9SAGI*gN&mE8HI#hId2n}MKx}cr&zF|mXZZQc9{+wYDJf}B
zipWAHekWBGZ)3A(rM!ptUH-LcofL2Lzk0(18{e*8m?d4y@4vjRA?bSE^?(EG>@p4Z
z?<}2jwzkvzTu+pWR@AYqIWlj;O}+<gI~x$<d)3D2zMRROvR#_r1KxG7(_p{*^>O^+
zxMsUj-7oh1ySLSCJ+VkfRZ>hU+3@5O%U6%~zB|R$x4(aXq3UwJtls0ohu3%SU*`0*
zr}$x-@e-l(*7P|(!B3^a|2{mc`=;yD>SIghtxn{BdohP=PL;3g&9YyN*Dvosw|nya
z{uliJJujV^oW&*0Y-V9LxsyxFG`KXW1e^sy8PQNdACezI`G!m1H4m7~LAgmkJTuQR
zuQ(GXF!=?S#bkGG6-KVfa@=Z@v$>ZE85>v_8XFoInwpsF8kndX7^qLq=TR}@(swRO
zO)SYTQqagvEGfvzFUiSFQZUpr(W}r=$S5f(u+rB@Na*DkrB9y3<C0-$Vgk&;AfS+^
zzy)R)7#f)ZGcLNA1u)~Ii5XiMV~Cj;V5&1QGM#M4tHxw*JUNY5MaR(47*h?<KNx12
X8kkMq#_PguXl81{rK;-c@5TiH-yP`R

diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
index 2feee6fb123..dad45bd38ee 100644
--- a/lib/matplotlib/tests/test_backend_pdf.py
+++ b/lib/matplotlib/tests/test_backend_pdf.py
@@ -15,19 +15,27 @@
 from matplotlib.testing.decorators import (image_comparison, knownfailureif,
                                            cleanup)
 
-if 'TRAVIS' not in os.environ:
-    @image_comparison(baseline_images=['pdf_use14corefonts'],
-                      extensions=['pdf'])
-    def test_use14corefonts():
-        rcParams['pdf.use14corefonts'] = True
-        rcParams['font.family'] = 'sans-serif'
-        rcParams['font.size'] = 8
-        rcParams['font.sans-serif'] = ['Helvetica']
-        rcParams['pdf.compression'] = 0
-
-        text = '''A three-line text positioned just above a blue line
-    and containing some French characters and the euro symbol:
-    "Merci pépé pour les 10 €"'''
+
+@image_comparison(baseline_images=['pdf_use14corefonts'],
+                  extensions=['pdf'])
+def test_use14corefonts():
+    rcParams['pdf.use14corefonts'] = True
+    rcParams['font.family'] = 'sans-serif'
+    rcParams['font.size'] = 8
+    rcParams['font.sans-serif'] = ['Helvetica']
+    rcParams['pdf.compression'] = 0
+
+    text = '''A three-line text positioned just above a blue line
+and containing some French characters and the euro symbol:
+"Merci pépé pour les 10 €"'''
+
+    fig = plt.figure()
+    ax = fig.add_subplot(1, 1, 1)
+    ax.set_title('Test PDF backend with option use14corefonts=True')
+    ax.text(0.5, 0.5, text, horizontalalignment='center',
+            verticalalignment='bottom',
+            fontsize=14)
+    ax.axhline(0.5, linewidth=0.5)
 
 
 @cleanup