From f219056b4f5587a66c904387b39a47ec09b4fff2 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Mon, 4 May 2015 16:55:48 -0400 Subject: [PATCH 1/4] Fix #4335: mathtext whitespacing commands Conflicts: lib/matplotlib/tests/test_mathtext.py --- lib/matplotlib/_mathtext_data.py | 2 - lib/matplotlib/mathtext.py | 19 ++-- .../test_mathtext/mathtext_cm_70.pdf | Bin 0 -> 3601 bytes .../test_mathtext/mathtext_cm_70.png | Bin 0 -> 1242 bytes .../test_mathtext/mathtext_cm_70.svg | 97 ++++++++++++++++++ .../test_mathtext/mathtext_stix_70.pdf | Bin 0 -> 3377 bytes .../test_mathtext/mathtext_stix_70.png | Bin 0 -> 1241 bytes .../test_mathtext/mathtext_stix_70.svg | 74 +++++++++++++ .../test_mathtext/mathtext_stixsans_70.pdf | Bin 0 -> 3332 bytes .../test_mathtext/mathtext_stixsans_70.png | Bin 0 -> 1245 bytes .../test_mathtext/mathtext_stixsans_70.svg | 55 ++++++++++ 11 files changed, 238 insertions(+), 9 deletions(-) create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.pdf create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.png create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.svg create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.pdf create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.png create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.svg create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.pdf create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.png create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.svg diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py index 9354c71dc330..d564c7265526 100644 --- a/lib/matplotlib/_mathtext_data.py +++ b/lib/matplotlib/_mathtext_data.py @@ -1946,7 +1946,6 @@ 'boxminus' : 8863, 'equiv' : 8801, 'Lleftarrow' : 8666, - 'thinspace' : 8201, 'll' : 8810, 'Cup' : 8915, 'measeq' : 8798, @@ -2169,7 +2168,6 @@ 'cdots' : 8943, 'hat' : 770, 'eqgtr' : 8925, - 'enspace' : 8194, 'psi' : 968, 'frown' : 8994, 'acute' : 769, diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py index 6ff3b4445e6c..e3da2e4d24ee 100644 --- a/lib/matplotlib/mathtext.py +++ b/lib/matplotlib/mathtext.py @@ -2431,13 +2431,18 @@ def _make_space(self, percentage): self._em_width_cache[key] = width return Kern(width * percentage) - _space_widths = { r'\ ' : 0.3, - r'\,' : 0.4, - r'\;' : 0.8, - r'\quad' : 1.6, - r'\qquad' : 3.2, - r'\!' : -0.4, - r'\/' : 0.4 } + _space_widths = { r'\,' : 0.16667, # 3/18 em = 3 mu + r'\thinspace' : 0.16667, # 3/18 em = 3 mu + r'\/' : 0.16667, # 3/18 em = 3 mu + r'\>' : 0.22222, # 4/18 em = 4 mu + r'\:' : 0.22222, # 4/18 em = 4 mu + r'\;' : 0.27778, # 5/18 em = 5 mu + r'\ ' : 0.33333, # 6/18 em = 6 mu + r'\enspace' : 0.5, # 9/18 em = 9 mu + r'\quad' : 1, # 1 em = 18 mu + r'\qquad' : 2, # 2 em = 36 mu + r'\!' : -0.16667, # -3/18 em = -3 mu + } def space(self, s, loc, toks): assert(len(toks)==1) num = self._space_widths[toks[0]] diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.pdf new file mode 100644 index 0000000000000000000000000000000000000000..7bb1e1a9d19013121961d13a8a7f70536a23e45d GIT binary patch literal 3601 zcmc&%3s6+o88)RV-bgw&BUM|PgO;EUaNjQM!UScgH5$|SNZMNapS!#47Me+u=}a$k zx%d9({IBo)=R5x<TL}n_wQl*t6GG8fI zy@-Jc7L=Mws4hF6C`BkNUs_tJ+H@oub3j4YRgVkt_>&;>J(|s`>Zk}znap5b_34OQ z>;$umg3rw0b1^DLWR_3Qw(5$mA}(OSTA|n-u5u&<%$qfrj#%S891cx^Ae2D1N2_)t zoJyt@ktX#yhfTF)gEROl@F*^?Tk)ta+v-rNf%&PaI9C|Z1IZF(o@#d}i!>jEj?J^8 zgm?~znBj71x);RoZc)8jwZ{e!VMr_?n;12M%!F9Mpcl!;SU6t%9SYa%r~gukOo@`OW-ouT8F=d3{zd-+3{|5;Lh}1Ap-O-LIakH0M5kF#e$XL5ODrT$Us7 z@LMusXT?XG?yVs9u_?{ku(o%a zD0leY?wvK?+4%XJ{^Y0Wr2WeNn5L5b&d&a-^SgR>-uYDGr8D>baJ6G|Gj^&yHEGOez)7&TJ)DAc`=DUD{R;n+x+T3j@1@2$y)1_*PeCOs8<`#PI%?ggc+u~ zm9cT$nWBel_hnCC)&0r(F8=d`>!03!bg0v}>qvav9`lE0zkkEkzkjrUZsWw0mpX>q zTehdAYYV%YE}t6Twe7&&UdLNn{f?>UkoAmqqDbCW`aN#^Lk+U_=D8EnOFc6u4WI1y zFYqNkG}LJQ$MBMA-_N7+&|~JuDtTQj@HUY zmhaNr+{fYunxcQaqPy;wJx@{xuGP2S``hWtk1ZEJsC%24GS$52s8D0i`Z>|g4ex#Z z`u2BCHqY>e^NHUv9iDgi{MlMLXWIRE|KjZN?VU##c9adK$JJ!SoGNJ=occ+@PfAw| zaPc4TZRxSKTfz@7y`uSNqn&!PGOS_Z^z?=i*guj^>R^ zw``tp<9X9X{?4?aaZB05TQhDFD}DOM%QnrqbNb1&EB>0x6Mri{^}_Kzdz<1~O4|A+ z#sAgRZ8>oEW@cReW4RBK8kTXH_j``?4m_y%;e`YLq0}&^jFc7ZPLt}jc^qzC^B_7v zD&!N26Z47Xfs#B`IV=pKhb11S`RcO?9cya5L+QoO1`OF=C}KIO3M6<$Oev`LWG z>QdccRm`m{7_U$~m=|G&!IB}?2pBOtJYF47K|%kE0wk2o@+g_%DMVA8ghY5LCde!o z5C*14%y%Y7S(%Et4d|!{i6SENFh>O#ePkwPx+O}`1;g_Zv~FM!!Uto6=`fjrC=DRK zI1nILU3D%4WH67FdlAbJq@U)0n zfk6TsB{;*;{}@;`eDg5$B{vZ{9?}zox}hh}h7f>~p*e^_L?SC80oFv61SGLE;#isB zAs&g7kswh>7AYiAFplHo7$nNr28=;@@Dc}e75`5!mMFFv3iGy&Fi!+j zVN8U|vaURwV>lmouZw|g? z9_kQoKoHl-h@UUs9bYNKFR}N3wN*UQQDCMGQCl7|8jQ$}7PEh7*i0kXD*xW`Mw}dB zs)?`}7Dlu#VIgjggXY6Rd_07FW@^>IwKO7g9d^v#MoVi6(|4c`59`7jM<_#cs5>;5 z3HQyjP4gIv<|&?nt;e&xm`rhr6qPu~XvXc;Ht05II~CnsrRi0UQslOmp;E=R6527C zl8H^haTqy+PT^DR>T`4ws?c@!JdzA+r)Zw?IT7UR^QdJ6u$n{wxdksMJO~4op%EEI zA7987k})zA=V+M(T4Q7aB#y5LT?q(hv`nU;$sRRN1~MEaqbS&9qh**vM#~s#j1N$S zs=-${7Fy)T#7FbO7{4?Fn|zcmgGqOkj1t5#GM2(EGrq82-J>|FRFCo7ZLzCNLq=u5 kFA1R^FU{r`Pyhe` literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.png new file mode 100644 index 0000000000000000000000000000000000000000..55986a5130611e17c8c5f9ec8d7539b0090e9f4c GIT binary patch literal 1242 zcmeAS@N?(olHy`uVBq!ia0y~yVB!U`y*b!`1clV1ID?g5%LwN?c;Bvpp9^6bMXo5_e~v z&gWz<{$IURn0?{uyt)7-ix&zn0`{|6A79U5RdMH#bj{V-?eo5{tjqSE|H1nEUYR<@ zh1Fh~stgSO7H+@I%)qeO5olA;6gCD0*MVT9=51$RpzA;1u2)0xT7N?Hnz8J|Nh68YtLPI)wlIiR;r)z{;QjJzq0y#>C&Y$Z@rwk{v7}I zt?cHF8yfEYa=Od?=Kgy8``z8$;e9feLF;062C+3e{`~PVdFq_7^sLh3QI%Vbme0KZ z>Sk=|+@FWr`Hi=0zy0u)MYvDaTI~1t_x)eLey#Zb@9+P8&p$su{}E`81YdjM+gn>L z>i^ZqSe2~s@>^}ZbyxD*JyA0+pUMCFX5FrHdp2w^DBgXEZ)xLw9=7I)`1t@xw*Lmy*j5(o%#xkA9UV%Nl#&``~3Fyc8l6yC10xcR(yVT_Q+;+|9MAt z7C%oaE;gPveR^_T-M%VJi*34hUt(L@$hr8U#D%+~_pJ_Jf9(4D_{Tp#Kd;{#P^Pu~>ddIS8^hw(p2>W+y{arcHhtdF*v$4z z2U-p$80-u9_4nV8;1fVikDi>IyfOd&zKTCT3SExa*IRE8#_nzFDQs#zZi{d1F3)%I ziPPYhvyrHORq^FT;2g_hH9k3;2wR+1-pDYSwL|6C-?}|@f34o#+bf-&o&9)!dL2%? zqNlJOdv|}oeERu$visv=VtO7HNbHT%=aaXS5fqHySJMfU`1{rA=1R;oQYlux)NuD_ z`=uEtuU!j^jE>f3=abR!_V#{yZEf_@DM5C%ze4n4cZGOqK7D?E{?lJyU#F&~E(OM8 z(a%p$i-2*dh35U`wx4^Y&C~M2Z*5sVC8%uo4hDv|pTDv&Oju;Xz@X{HJSZ6Z8MHUO WtLR(Y`4w0=F?hQAxvX + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.pdf new file mode 100644 index 0000000000000000000000000000000000000000..0cef8edf4c977702fa696d846934d97175004381 GIT binary patch literal 3377 zcmb_f3v3ic7)GiB3knvD&yqn>p~`h1w|jfXqe$=Ca?(QW@u&fW?cKILxZa+7TPSZ- z9`X_)5GW83#1Q1s2nvE2BZOc;gcNy5R7_Mz#2^NtfEfJ$*_*qgMPj1YOlIbvf4=$O z`!~DPSLhIPWiET`w`9v+P9y>`D#mer`x1WWq?k^4uV!fxql)mQT9qCr5-^mJygW{i zhLF*ncAr8+9N$!aG$rQDhWxKs0JtaUjFG zOphD2W)Mt-CMjc>Xf=-af~)`-Cmwp1k{9<(+`@1K>_zy(2q^8-gGLCc`Fy( z^v^wbX4fcwZ;#0tdz!|!!Z1o`ln5xQDVjv|cvz5$=<ZH$`kwEc@3MUHl3UN0?B6tX(S?#3xvO&;Hl2FC ze%b6!thVzkIFM(amvk zHs|R$HP2tXVB5;uUu1+je{is<-KD2j>^wPbPp|D+4;{=LFwQZf!^4>uF25Tp@9*}H zad?jZa^lNSo6XknHWl3(H!gZe0UQ#mKy0Dy_7wJ*m)FKW)lz?!M<1yt* zG|LRrRLB(sj7s=Rt{@NcwYW}G^R5UZ!Xc|VPDHzm@PXP2i&hz|HBQLWYR$wt0UWey zuq?6x3&UpILKY&}vgF%I>F}rmaX1Bqh_d7%q98fRXpS$4LJDEQzzX0CS61qn?U0}& ziK-I51hdwzaY;_h{bDWgh@>cKg^pT>Sq`m+1;QZ%4>ilZL;+)3dd+aK6y|mnQ~?*q zmk-p#Rn-;}Z6Q#{G;dJUe|ANQR!40Kl|ck$yjm=UXS-`av?>C%)9DdBP^oNrMd41J z&<&{5NFpi1|1r4#g5z{Li7W|3fw)oxfm1;KqZ(!3AVwPDeTprl=x0sZeed3h%h#Zeoo>(FgI7 z1O}e52ic5*Cf?*!7YYtW1R2nIh>0|uQ5i}@`4Tcx3j-{MF2Vkmq6H{c+C0D zW|SReO$JBe9N$a~j>-YfV8MWnNgpUz`kt*(Z^Wf?(x4Z?Ubs(?19%{Imz zNstVBeE%-zG$4?Uc%zdaTdcgS(3KGS?M?6a@GHTN3q>fouunfv`@*F9oHWc7G3~3K zB4YEHfKL%woua**Q45tbRo2x~cQ`N~qo-0o9TccDBc5qU2(PgdB7`mnF;>FX^C zq9Q=KVNg7%oefdNIk_CR>D4o7W6{)BGqbQJH4d}P zMgJJ9gKymK+^-NZGj8K1j)+bLP2C({!TpOo4k(=X@i9leZyV0_Q&xI(ppn^7?*Fezv;CHD+`Cs+P;l}|m2dCv-ah%$ zE`9rk`stRt&IG;Qx9|CtbEb3slE1&Zd-VMO_1_YXsf2v_^YgP!`MVfCw&t22A0E!P zOV7;IWN&uV)75?Y>{(j+^WSss2DOEit*ni|U!3*4>d%kD$<+qYQ`lBT$Hbg@STI9d zTYJAv+53BY@9eLy=W9QF=f;f}e`@A$jy`qal-}0&udDsu#;kpJ@Xd#hETOeOKdHJc z4(vJp_{N<(e_n3nm$y4|cX#>Y8yk~1Zr&{H-Y@s|3#QhbkFFl8sy;pOoMT&U#wTkf zq94BxsQLBv^~Zaq%^%&|oL>0wQ0uw#-z|496iYRwz+`PRmyt}(Z z7hlwnv#k5as(t5g>ZWF-PQUg2tL^f#bz$EVzG?7=Y~Hp_?D_fm{T&^L z+xd?JS&z@nwJv;eVxmRqtB^evAC=6^%>I2^`?J0pMSs}3*4EZ#-xJur{taW_zg|0h z-ILko`9{W{f&R6W;Q93Bsce#XYdsi~^%hZF5;e{I3$1^3JaUH%~0x_N`l|fF6F9Vs!HA)vIUD)cpNb zs;94?p7v~a`TI}L&d#=!>Mc4y&vxgoU9+sMt>?}GMgjNl@|lZI>uh}oPB+{0@1Hw* z^yss131z%S#=rk{urOrI*LPx~ZQddyD}Q3YzV7Mi$&)Ld1Is1`Pgg&ebxsLQ08tb^ Ah5!Hn literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.svg new file mode 100644 index 000000000000..7c4e65dc5827 --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.pdf new file mode 100644 index 0000000000000000000000000000000000000000..40eed4df1063bff35b1b1e193323bec977f8c066 GIT binary patch literal 3332 zcmb_feQXp(6o>i|Tp-b48i^niNJGKi?d<2>Rnka%TwB}P(pG37pxe8>>z3>7xwqF8 zA&?j%e-Ma*8a_-aF+{K!L<2-HQG%ipcdepM(t_#GKIE=YtDyR%zZw1|l9YttqXYYf*&+6f}I7zr~&WMF6| zRaJtSiXmgL=s-tvXSW%3Nr3Ud0oOI16wz=gh%JsCZ8Kf65}?8nfH(VGBG&f+Y;|s~ z$<6g-6%m*8xwUPs;hIGC0NT2Yn3YNp-Gh(VDVHehyC9B4fxs20b?j`Kpei+OL=2m~ zR@7{*h09>o?ii^|+HlNNbS+oa7Cp0 z$ATwkZz_G_RL$*m+x7O|#|IBQb7AoBh3%!2I)3@!OmljYH2lW(jRP0`^6DA=lOLIU ze#^Nn=cb;&w)1*Nd}oOvRvbBDU6}QK@AD__+crP&;}<6z+7JI0y882m6;%~S4_&(X z`-WSGFMpVf_p3L)I&)|GvgQ66U!UE!skCn1>lH5_nYW|z*C}-?vUYjJ3vx;KtD7Tq z;N}A_M)t+`HopDol+X6>ZYY2MOv{?f-S6DpxqQwK;dU*X5gy(%_s}<=yt1=;bKRRy zN1ttt%o(WHYA+qU8XfL`ujJ2rXI~%Mi@}$(LoN)NebA7yrtr{|Fi<8mZdo2c93m2x6>vRxGw&2_>&fXKk!g1g@0vUB{#lJ3 z`^DqK$Cj3h{p+{;rnbC$?a>{3n~u?znWdGp>bI@ly634s2Ca(EzkO@hl_|D%^q!BK z&mJgE3|(AzeDKyJ?WKpl97j{khP+k~S79>~b*!{&J4Eu*L44BafzWAdukWZeQ>J4i zef5yUR#Xr%X_^ezu~;zsDaE*gzx)?OaN5R-(&Aq9+7uSL6qV`tMF? zGWwVmA*-bTR@ig_&vVq`R3Zs=PYKZwR2ffRiH_6>9e_HmB(g^Tj{&*!-*FU0A*xJ? z1`(xEDg;2-02E4DQVH(i06NhF8j}^*>^>}}K%Za;e2?QG1|PT=f_rtS0Bq<15|HKm z8ozPiSyfd99riU%CqY=_H|OOuy9@UDn(+ZPp2496LqrCdVHQ-tMSf2=rZ?WfXgDJu zmmR-xa601iJ&meNN5tm%xQDzbBhEN*PX)RR`s1vr60;%lqAi(@0a;-B0WZf#Itw)< z;39;=!2x9CPDeTpuBav}OsF6Vg=d0rHusG}u?z8%90u<33;B$K=I#^%ItmU(1R2nI zh>0|uQ5i-<`EoKc3=NE(Q;gB!c?UWK7bSc!JnsBaGs=##=7S@*k9X#Vz~lgD@L)j4 z6c3cEc+J02Z^UJCvY?m1UbrrdV&`!u;>?4A&mP8zB*+In-apPh3kakm-m3hQhc!1> z=n72+z6!khMI?B;U|rn96}>2hL*pV9y{H9FZ1*^P(VOE{GGA5->u@7`jEgVj<%_jv zb`}bJqtHN)ht|D1O1R|*{LwLisj)-nMxXkl#+A}D!h-X z^C_Lbfc2lTY!n)-@*cxYCv7)rb&_-}PCAX~8fYVcg+akPTFfE&HGj!vG3 zv2faNJBbBF&rF|V#sx~Gpg{9KqHCI>kvPfI&=U9~DNd7hXgNmHG>FkLG#$KxzoN5R za2z}e1{%eu%g~pOq)|E+k19b3hf#bo9eXx_9l%IFN!7>5BFWGykK&^tbqt@ZK`xEv z3n*jmkOOKF&2Ne+e-p{#64 Hb42(DsW)#Y literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.png new file mode 100644 index 0000000000000000000000000000000000000000..2c86c67da7693c5f88c26e0c2a19b56720844cfe GIT binary patch literal 1245 zcmeAS@N?(olHy`uVBq!ia0y~yVB!U`y*b!`f(LVWV7a6zPhLWv-&`zv zKR>yy&TiJS&h+#1zP_r_wZ3Ape0Am4J6E6P<=#Fv*SdUFE%)E&*M&=xfL3n%dp>^s z)~#EC8n3PnKYi_5Smvx{bL{K)g+I@}x$u}}?Ag^%*Xfo2ULSSe>3=7im7!e!=~iy> zQ+MvfRQ~?<)_z~z_jh+U?b{cp7q=(EZ;nMETeIW(bJsUH_ZIJ(6@EH4_WieKXJ=>K zKO}PFwS4IX|K@`VdH46po<4oL@YR)-`)hNPlaxNRjN&o---MDqDsGy*I{lA{e%l(f})ee7jdwc%HZMim; zpOzpyeqH(Q%Fk(A^AoK)*vjty{rx>TFHf)T?=MkcX!mZ*O}3G9cR7+_0!&=3KYo49 zwyFPTb8B0#e*C^K$YJ+2Z+qU|Ro`@d+GpC~-T zQJoz{@9*vX^yp}}kp$1F6eG>!eX`o@{Bm!u{){SHQRo-`Icw+Y*LTg#%z!Zv{OJ5w z&dZN3EOg!oOaz~w1Fhdt@-j%qw#sB({QiBPe_py26tlZ*Z8=grtSevrQ`d(b7#hER zd`vd+6$ZNU&d)cWo}RvF;wxicXH)m*hoGR~{r&a*GiT1M`0^qUEh-)yYz9Wfmk;rJ zH$&IQ?bTxElhJs7Ztm@$ITkY0YJY#5dc0qL`p%s@gS<3XuU?&6UA(N}IK&DWl4BK7yJ{O+q)uNFNyF>%w59XD2g-ufos@tk$f zt`>z)-z{rbv%^Pia?!IhGqr$@$WT)HR>jG%psw!HfaO4ptUhHw!^`YLbzY~x@&L;x N22WQ%mvv4FO#n}~JIVk6 literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.svg new file mode 100644 index 000000000000..603294c36659 --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bbdd35ddc71d0222a342fee56bec80bbf1198f17 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Mon, 4 May 2015 17:24:35 -0400 Subject: [PATCH 2/4] Add CHANGES entry --- doc/api/api_changes.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst index be878d0a7dc7..3727aa434925 100644 --- a/doc/api/api_changes.rst +++ b/doc/api/api_changes.rst @@ -11,6 +11,12 @@ help figure out possible sources of the changes you are experiencing. For new features that were added to matplotlib, please see :ref:`whats-new`. +Changes in 2.0.x +================ + +* The spacing commands in mathtext have been changed to more closely + match vanilla TeX. + Changes in 1.4.x ================ From 0cf729ffa135e1bbecc02fd6514759e614134b1e Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Tue, 5 May 2015 08:27:29 -0400 Subject: [PATCH 3/4] Fix up after rebase --- .../{mathtext_cm_70.pdf => mathtext_cm_68.pdf} | Bin .../{mathtext_cm_70.png => mathtext_cm_68.png} | Bin .../{mathtext_cm_70.svg => mathtext_cm_68.svg} | 0 .../{mathtext_stix_70.pdf => mathtext_stix_68.pdf} | Bin .../{mathtext_stix_70.png => mathtext_stix_68.png} | Bin .../{mathtext_stix_70.svg => mathtext_stix_68.svg} | 0 ...ext_stixsans_70.pdf => mathtext_stixsans_68.pdf} | Bin ...ext_stixsans_70.png => mathtext_stixsans_68.png} | Bin ...ext_stixsans_70.svg => mathtext_stixsans_68.svg} | 0 lib/matplotlib/tests/test_mathtext.py | 3 ++- 10 files changed, 2 insertions(+), 1 deletion(-) rename lib/matplotlib/tests/baseline_images/test_mathtext/{mathtext_cm_70.pdf => mathtext_cm_68.pdf} (100%) rename lib/matplotlib/tests/baseline_images/test_mathtext/{mathtext_cm_70.png => mathtext_cm_68.png} (100%) rename lib/matplotlib/tests/baseline_images/test_mathtext/{mathtext_cm_70.svg => mathtext_cm_68.svg} (100%) rename lib/matplotlib/tests/baseline_images/test_mathtext/{mathtext_stix_70.pdf => mathtext_stix_68.pdf} (100%) rename lib/matplotlib/tests/baseline_images/test_mathtext/{mathtext_stix_70.png => mathtext_stix_68.png} (100%) rename lib/matplotlib/tests/baseline_images/test_mathtext/{mathtext_stix_70.svg => mathtext_stix_68.svg} (100%) rename lib/matplotlib/tests/baseline_images/test_mathtext/{mathtext_stixsans_70.pdf => mathtext_stixsans_68.pdf} (100%) rename lib/matplotlib/tests/baseline_images/test_mathtext/{mathtext_stixsans_70.png => mathtext_stixsans_68.png} (100%) rename lib/matplotlib/tests/baseline_images/test_mathtext/{mathtext_stixsans_70.svg => mathtext_stixsans_68.svg} (100%) diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.pdf similarity index 100% rename from lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.pdf rename to lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.pdf diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.png similarity index 100% rename from lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.png rename to lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.png diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.svg similarity index 100% rename from lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.svg rename to lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.svg diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.pdf similarity index 100% rename from lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.pdf rename to lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.pdf diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.png similarity index 100% rename from lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.png rename to lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.png diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.svg similarity index 100% rename from lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.svg rename to lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_68.svg diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.pdf similarity index 100% rename from lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.pdf rename to lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.pdf diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.png similarity index 100% rename from lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.png rename to lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.png diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.svg similarity index 100% rename from lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.svg rename to lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.svg diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py index 744da15a1377..d315ad03aef4 100644 --- a/lib/matplotlib/tests/test_mathtext.py +++ b/lib/matplotlib/tests/test_mathtext.py @@ -90,7 +90,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 M \: M \; M \ M \enspace M \quad M \qquad M \! M$' ] digits = "0123456789" From 36c3cd60945ece049e1b82627fe91d13bb05d90e Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Tue, 5 May 2015 11:55:42 -0400 Subject: [PATCH 4/4] Fix test --- lib/matplotlib/tests/test_mathtext.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py index d315ad03aef4..45a8db074ed3 100644 --- a/lib/matplotlib/tests/test_mathtext.py +++ b/lib/matplotlib/tests/test_mathtext.py @@ -91,7 +91,7 @@ r"$? ! &$", # github issue #466 r'$\operatorname{cos} x$', # github issue #553 r'$\sum _{\genfrac{}{}{0}{}{0\leq i\leq m}{0 M \: M \; M \ M \enspace M \quad M \qquad M \! M$' + r'$M \, M \thinspace M \/ M \> M \: M \; M \ M \enspace M \quad M \qquad M \! M$' ] digits = "0123456789"