From a5df6bd03e0219581facda2e45e2d2638537e9c7 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Mon, 13 Jan 2020 19:27:21 +0100 Subject: [PATCH] Expire deprecation of \stackrel. --- doc/api/next_api_changes/removals.rst | 5 + lib/matplotlib/mathtext.py | 10 -- .../test_mathtext/mathtext_cm_69.pdf | Bin 7608 -> 7451 bytes .../test_mathtext/mathtext_cm_69.png | Bin 1493 -> 1215 bytes .../test_mathtext/mathtext_cm_69.svg | 74 +++++++------- .../test_mathtext/mathtext_dejavusans_69.pdf | Bin 5726 -> 5553 bytes .../test_mathtext/mathtext_dejavusans_69.png | Bin 1408 -> 1176 bytes .../test_mathtext/mathtext_dejavusans_69.svg | 23 +++-- .../test_mathtext/mathtext_dejavuserif_69.pdf | Bin 5754 -> 5574 bytes .../test_mathtext/mathtext_dejavuserif_69.png | Bin 1614 -> 1387 bytes .../test_mathtext/mathtext_dejavuserif_69.svg | 96 +++++++++--------- .../test_mathtext/mathtext_stix_69.pdf | Bin 5920 -> 5744 bytes .../test_mathtext/mathtext_stix_69.png | Bin 1278 -> 1091 bytes .../test_mathtext/mathtext_stix_69.svg | 60 +++++------ .../test_mathtext/mathtext_stixsans_69.pdf | Bin 5892 -> 5726 bytes .../test_mathtext/mathtext_stixsans_69.png | Bin 1470 -> 1259 bytes .../test_mathtext/mathtext_stixsans_69.svg | 48 ++++----- lib/matplotlib/tests/test_mathtext.py | 2 +- 18 files changed, 160 insertions(+), 158 deletions(-) diff --git a/doc/api/next_api_changes/removals.rst b/doc/api/next_api_changes/removals.rst index 3d36e452625e..512b7428feb7 100644 --- a/doc/api/next_api_changes/removals.rst +++ b/doc/api/next_api_changes/removals.rst @@ -135,3 +135,8 @@ rcParams Environment variables ~~~~~~~~~~~~~~~~~~~~~ - ``MATPLOTLIBDATA`` (no replacement). + +mathtext +~~~~~~~~ +- The ``\stackrel`` command (which behaved differently from its LaTeX version) + has been removed. Use ``\genfrac`` instead. diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py index 59ea2bd9f0bb..6770d1113303 100644 --- a/lib/matplotlib/mathtext.py +++ b/lib/matplotlib/mathtext.py @@ -3170,16 +3170,6 @@ def dfrac(self, s, loc, toks): return self._genfrac('', '', thickness, self._math_style_dict['displaystyle'], num, den) - @cbook.deprecated("3.1", obj_type="mathtext command", - alternative=r"\genfrac") - def stackrel(self, s, loc, toks): - assert len(toks) == 1 - assert len(toks[0]) == 2 - num, den = toks[0] - - return self._genfrac('', '', 0.0, - self._math_style_dict['textstyle'], num, den) - def binom(self, s, loc, toks): assert len(toks) == 1 assert len(toks[0]) == 2 diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_69.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_69.pdf index 19064b48cd0ee58362b45f8042ee25c8b223e860..f3b3655654af98c26d641a80cb774d7755099634 100644 GIT binary patch delta 1846 zcma)+OKclO7{_swAhCAZ#)%UW$I+xF^iYL;d3U`@sc;-S3Bpa3ln{{wv5vR)277IJ zH&S{i0f~o71td(7Qt=QH7Y;O`GKV4#sF45>Rfr04;Hjt}@wo6P(2C~3H@mUp2SxQB zy!*{JGym`R{bw%pztXqdIXtE$RReK|LF0%%b|R-DI;@yVI-5jCj!>$e$j0ZXAPkfL z!-o+aSu}?xOvO}Dz@8M%>L%h>CL?!Fq?ClFCy_`7D0*r%KCjN1NLsnr=?&?6)-=#G znuQHuhN{DtY$dLIBOj#bn3~X(f$SorF!1nF5D5X2J*MO#*_Mch9X`C^h%QB*KfiZ_ zaSdL(@tjvlz0*AKdDC5wMmL{Xee2L9iKSUR5$hfGi6o5rV7`#4CHa!nLNe4kt?p+FbE(&0TIFlTz|y`Rts5SOLby zaoW{|S6dJcx!UpHEv=ZY_uxy;yO$nN43i`yP7n}%RLMZ!CXS6v4XL`CSJJ&B&_ZpF zq9+#Orqxu^TE5s}t7Y^&$JY5HE4Iw?52CwikBO^MdELyuFmSrVSY^s?_>}~AmnzGkL z3{|Fs2qSo=@p;c+;djr+b#4objSRHq!EN{u)nC}yqd4$uPS=3}#Zc|)!kLW5g34W_ z9Pt%F>cjgQIxVDI_3k#14t^xXh@Y7 zN-FUCP5p)Al<2_A&5igEr+a@HvZ4#aR8-6FSPp;Z@_VY7al|wK$ILjvg3ep8BUf!l zYw42OA~SGL$&J7aK6jbP5-_m+NSJN8x&%@?79EJyY9L`I|3zfv9+7ytkO delta 1948 zcmaKsdu&rx9LKF?BwpHubZxO)Sq|#PFl_gp`)s#4tzC-@H!4%963K4cySAgR-JY6F zVisQ^sBxAP<*^|y5&tpHkcOxvqNvFdF(D!R?ITnFz(4#$gW(U9>5$*WBj7-~ZZ6*8(diKS*9Z`|<^+ zZazD5ZqxqvF8gQLBU6VSF}EGNvU=-@>r1G6>4)FOMh-6sVCU-6P59NyU-;l<@!F5! ze_q@2{wv`#&ysKW%&qBC@2d}<3q`+qY4OwFJrnrn&kLs_z;WYau`e{Fo*!oxZNIj@ zu`+Q?pP%af=-p`B6)6ZaD?zSNa&H*Y#7>lO6M8X#8QS8%#_@)mXGSm9Lnkd3T2>U zYMPEKolZgye`)E)_gQQM`;#%0$OC9_B{L{QkTF#{TY-2dR6V3;qr^ihXDJVzmcWNC zz4&6=R;*gw@NqSds59Utsb=~{?Mh#?CpyDko+QIZE!#TBk(Pd%Xg zv}8PifG7$$cajM%Msx97o2k=5B{5oDA6AM2*R)FB4B`G_kK-lKxfI zB*ZT|-YgwyJ!-}YrWL=y43wU+$tDg`UxcyxpN zA*Mo&FE5ZgD3Sj^C3fKNTI_^cCqB6WSZm2K_!IjU>l!DK=o5d@(nQKDuW65x!auci z_E*_JNMKZzMuuFgGg0tz-Zia3PLlAn!-*ps{iUUiD`tG$Wo_~4WVhjE*EWZtGNPoQ z0C;2dkw+f?;#!_#{p7}@WHvKQ*J96bKhHslQ=r0mpai8}PTbCM+jlT5xstI$RMSCE zT1B~37NwFAkc&-%h#EaaRtIr0QjyzV>jC?uzL@qr+zAp0<@#B+8r_%G{z8>S%= j$2FZqmOM>xiE!(JX{_vl9{jyKz<6aZ)72H&8)W_i2+uxl diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_69.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_69.png index ab07dbd94badf63a33a3f9d85f962b72e2db7f5c..8bc7adc29c28ccff74ac5a6a28d69c0d41a1107c 100644 GIT binary patch literal 1215 zcmeAS@N?(olHy`uVBq!ia0y~yVB!U`y*b!`2PG*uqS!z*nW`3Tro{^qGQL>RZSeV_F<)ipD*9&~F z7F=_>EzvIiDd@fd6~ZgURac#cft|{nQy4X5YB>o|U2DKl?=n1`$DC z1_wd9F$^Bm{rfXBZ1vRH=J{!mgiH~4ONxiItW*j@g9S=j2- ztSqhacXw`<{5vz#xboMROuxBSQ@_8z|2@GuVYL9S!GpH;_RZV2O)J|ycjCl}zR#ym zn^yGZ#zqTI7z@X#i z=5AtSo3LBXV^Yokf41s=b57jeo^L*9_UzfGcNRad+9JAPD$n<7#)Rw)6RDd!i_^u# z#s6Du-m_=U&6_uSdV9YX7$>YQxWw?}>+9>1va)9nHnW@ew54sH`S+_xIJF?w7Z(o4vc>p;KB~+NSdN_f$@Hi|beI)w+`8ar%y$4HWd@9 z_Rdq8Ib(*$r2Br-^K7f9Wo?}WM7Gu6QZh0;Ob#%7Qc&U9@cH@q^qLx*>+9qFC)w2h zvpH#B@9N{{SN0rea?y(m3r(bYRXmplojg5Vzj~kkg?OO(SAfyBY0H)=FJHcVw^i1< zOeM1Zl7YSb{HV3lqSjv9TlV`~t~#$l12BSDxGkOtbl9?>l_l%n-rH+^a{t8*z=&KO zzJA%&tkmD%-rn6=`}^C|TU)a;x8Hufj=A3aJkVXUfPvh|%zlm4c~Vb*e|k#F5^3JE zX~tix{%$vzF=x)1Q>VHvvq=~LU2mdKI;Vst0J&EWH2?qr literal 1493 zcmcgsZB!Cg7`|93+Cj)Zwqr(RR8}*s(2|;{VM;Y6zgsiSZDAT|0n=2B)ciOt$&`{P zEk8nQLUuH@BsG`hLZbvTB~6{-aDWJtq?x<*fB$xN&;5GOx%YjZ_rC9a@+bj*C>whl z004^YPYMFS0tNT`kd|;ZWYF4$XL~C`VzKR+m|_f8GvZsUefuO>R*gi*X&wNstL*_`Tfczz{#+PRw9kKk z^aklTjkW>HnP|(j>hJ4IWZoa$akaQuHZoFnhmJ^I_yQE=*4A!0=d+s0V2pPbt`~M| zCnkF2@}kX=4=P-u9yJn{vy(6=ue`~bw0@;B#GTI_(j_r}+Q@x5V^A@NA1@H6&-N=` zgXVJSNe6+944TceVHK zm3ggt8}~DqTsHW|%R0q4UXYTS8p&7f$UjP@T3g>c$6^+HEMO-br1T{ z=coT*d@B}f`Qr0!uwL&mJL?=UrLPwp+xJCgZPE1S?7~>al)s>aL z;iAJ_oU@BdJdO5^B!9&K^IaEzJ9F$et`c?qmO!A8$?l3o^Sp)=UxFewjOz=R!%hyi z`!2=B$FJR>t7}sks#{u!CPimSNl7I25$i)(TQmjs^#Ru?2M_X~3zN7Yont{RZUY86-kyWjo^W6b zU?~*v`TXFG+#o8IdO}mW&u%9x^KlG=5pt8_f0N?WF#TTtJ%n)d!vo*Vc6sByHHU2G zTQt?1%_-zF%TVz0gH)4nMBiwO-Bo;uczUWLJ3G6m>!_g@u>|ee1D4dn#0Coj#ujAa zAjM9dY3=}?RDR%G`!MYYB|Kbk;Q}gPIooj$^dEcbR1l3uBcx9MqE$8(CYdDE=OxwU z<-1||ty!~1tyaHmnVsMDFiAIsMWayFB2nNj@>mVG@1@E za-J;)Mzvy7{r&rKF)@w}%QzA@B2fh2jK||yXl>cylNxI%CXdPglf?Y1aJ7J^l?7cD Ss;4ZdaDeO^Koa^yXZ!=v;EXK* diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_69.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_69.svg index b2b31d9f253b..7a63312d15d4 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_69.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_69.svg @@ -1,7 +1,7 @@ - + 20maRO|pWmwOaKPmbonWI@*q^RISVkWzq=%7n2rIKfWw}O z8LE~AHl!rLzNv8K$UVx`(6`Nim~7VuS&osbW{K-YVPllZ#7rKhE!6AyRp5w|E8Op4 zCC?(SOcYblP-pQw!7#@SJ#7NcHZDfZZ@Y&XJ?(m+fpPh*5ypvH#(*AE3iwr3HK@Af z{}3-frNKd@xI58W+x=UD=Q;F@i-7O!2eshw>-|sg{!Q>zY+3oemXNcVV-fKB(6#Mt z9u}~~gjkL^2RH`Z+CJrob78dK>+7?XsF9|M>#$zL4q=h*?QvI$$J><;`yQU>Dcyc!b&`HX>mg)x|`yp*_p-4P`l* zc(V3eMv@wOFtS+gQL37em!b{x@WK``j%g?;M8pPWoGdlOglM!XW*I2b<=>subu33& e%9Q#P1e`#GH!a1m77RE`i3}@JJ9myG;?%z+AJtR< delta 1914 zcma)+ZA@EL7{_HWCYNVPG#uzuj7$=&k(adS~MQ5VRriqDTiF(d0(3Z})_RHyW zo<1+X=l`6As-^0w;Pf*dj_;5$R&*6e(;sb(w&+?U3~Flu-wF7=x~v*uSyxowDBv5Z z#jOm7e2TZFfnJV=6~M>*>*@esuc{h0zyZ+9@m|HyBDzm8fD=IA1$>+056KPM2)%~% zD>|G&vVmS2R8z5{(*Lby!X$nQGVyl;Ri~eF1+#G z-?oyfecqDpa}5Puk2j`g4R08jlP6lm%)(p6duB@}?%6++eL}K*nI)fp`D%xuPmfRj zbp4^vgyx!0->lO|PtE6S{^Dfx)cc3Vtj8{%e8ufMKc3Tb>CCHvuY1nPbCZ>$$KF~0 z`=JjOCOp6RX1@CCth?x+vbmP`PCRMdw1b2 z&*dJY`XV~}L)))cXXj5}`VbY(ZnON+F~TXTf4NV3()tEClYy2=Pl5o+)VjR;J0pGA z97MCG4*`Cel>nWjCL3&u&8XYcH=y`1N1ja2Bd=xuMiw(HdCe5OTQPikD2z27Akm~N zTXL*)C_!28&^4a{kYvt*ZQuy_ICGFDBn?%;#d&ndW;lQAH=s0O%)eb8qB?ae19DfSQ_(~HE7DCSF!yby zJ)@K=YZ}mua-WoA)?uL0jxtWnw{9oK1EDrHxmQmvFf;epu?-Du58O!$4|3y!uY*+6H-DSTk z=&OCk%ScdPLP4x(hV1~kndv^dA!F|2O^fMe49N=2dSK3mzAE*4NDTmU5?*qAOW}P2 zKsMGiRRjXaMJ{aFPe4v?5we@sc$)a|NO#V*D1C+^R5U1ojKCIRC1oRhY;Z_Z-7;3d zE_aOpk%SPmLx>!Ly$YfV2rDY-Q>ttJh)>bMt|1wR2Q@qx>H}eaKj@QvPf=k}7c&%H zxI_;TStTp9hBX6=&}Q{3!>}qKi6ZP5UDY6nakz%(;}NZz9;hTQdw%! j3J`37_i7rG5tASln}KB=kLXH2Cn1-_?by-eY3BX~i4Q!~ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_69.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_69.png index 968c78b2b18e219e45df8cb330d6be898e532492..07484920330f40e19e285463c4c6802a44904738 100644 GIT binary patch literal 1387 zcmeAS@N?(olHy`uVBq!ia0y~yVB!U`y*b!`2PG*uqS!z*nW`3Tro{^qGQL>RS!vpbu=J&Z782py>dd_4Z#_N`k}i;9fg`{jJY!^7olt4!FVnYfQW`WeSC!#?}knv=J-W^b_vxESN>>+9y`R`mAP zR-5{NHj^h$zPT~^c>X=U2oG@RocS(v;Lpzb|8@8F*U$g^`}_Z*Zyz2W-dXZ8NJ>iT z6OgGBzpsYRj75wK>Q-s9oD)~Bgd975JUBY~_u-r8=i4vexY6+N;lq*J^J3%nR2a6; zX5wyao)BgwuAOM+JZDfo7Gclpk$uUS@BR+nzvm@#waOddYIa~GE#a8i_7;I(!8_UC72 z8sFSinmuX0yE8CQf$BCT9qlqPHT_#8_rtidnrYRAxz^=D!NHTSUAwlY_P5!|e&vLO z1cm12=AA`Py(TT$xbfri&j;q8cJx?b1oWb3aB%Rt`2F+F&Nf%~eD&(pr?0QCzyEje z^19gFm#$u&3UrRT=dokQHf3F1m2-ceZEbCB@h)qF{Wh5mTE!n99es0WXR(>Yr2X^d z?(8nl|8};c{?49CWB>VfXPepiKRr0ueDn3`X}YH$AMZD|wVgX_)-21r@-yt`nK+0_ zN=u*q_4Re}iwg^{T)lcWZh!6XvR}V{7r(x?_RZbh=AK5Trc-sJw>>#AQ8{u~$xHL^ zJ8OOx{rdIm)02~vb8cueu=C<71pRUK( zpOwq|^W|l5RaMoc`}hCft^O-4JJm~-onP+H+G=L*_Hez0UUO_Jjh6e*{}*nca&npP z?4amqkSWE_&!s*-)+;F~>6xAVdViY#9E*uSPpkj@U2~+7nZ54!y90+F_%Q!@IM1$j zmTmR7Cs$X8uUx1H@FU(F* t6yjxY5VZGaU~qL|W(aUG8A!&H|3MeLgm}3w#{i2s22WQ%mvv4FO#n>JRO|o% literal 1614 zcmc&!dpOf;9DkA9G^x2{ZCY|lcp}2n=CU-g9G6@sg^^nel?WkLCr;yu9;K4aCAUJ! znpr4RCyba&X=a>GEw`9tvlY(y)!*m;-sgGW@ArM4_xpK1-}m#rADWkk3mk@o0RZ4c zSAsVHif|}*Q&WM~uUV{KD6ETjBKoR9BTX&*3ba>0;~EeTz=qHtQ{kRtH3b0W1tMX; zZ!&#u%+1v|7S;KsB=?ZEx{f#I<6Ygd0-K0iS3}=F*LAu^Fl1$W8S1gUD3?l&H}&F` z)U$VMId6VL-6TA*r-PnZeLr&0m}l8wOnbRG?vC!FCNa`8A;tc6nqyCV-^zu^ZRz$+ ztYkX_JpkIxEBd91P;9$+0%CRW3Pd^N@-Im-nJgA-YWTiSZXXJb_Ve+%&gF84$H(WV zV!*u9Ua;$Ua`F-JMBB*hNWJ9!3)Rj~BofI4d9{YkCOMRNdKTNo#n^zP?%Q+9K$c+^ z+Orl^hnK|@ws)Fh_?CYD z{iv6h+ zef@z&QIB6x&;vT1{!&_Gdz#BM6LR7XKw`C7$ET$QM!&5)?CyT`Q*WVF#6+Q0l=gZR z$!ETmXmS#_hz1;uC?wVBoNOUu0RDHCSgAlMY7@}M*=l1rlQ1)JS+SbTsbH&R$ z*$lh$-ln8F9*=j8+tZUF`#mU#Ar()UQx+Yv8Mq|uk~`q2FYg6JBa~*efE_y{7W)SW z7h`cakt7B2y`{O?*T<*a_Vl>1Zq6=qb5DDF`=gIS_WyG`s3oy`R#Ma0X#M5N4&X{q zqKaj!>5}E;S`O#P7MmDeOOm*1jG&Hbj61JLt>{j|(s4;1smt?kxCN#K#l;Uh^S1U& znSi4<0Py+40|RC5MK;s&uahZ~nS!(N@iZ0Sv#_)dT==#`6bgl-t>+&%x3v7`{%l|V zh?A1c0IKTDMGp;>yEH--FWC(Zdmu`&y8g=Tu^c;v3eF#@8)gP8-C%#dpvB&dnC@fX xpihHMUy+$T)T9>ufCd)N3xA!v{hzHqQ{Z(y;tr;&>O - +