From 2158fd6705651bfc5077279f9d796ee5290992d5 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 8 May 2015 11:01:44 +0200 Subject: [PATCH] Merge pull request #4403 from mdboom/whitespace-symbols-mathtext Fix #4335: mathtext whitespacing commands --- doc/api/api_changes.rst | 6 ++ lib/matplotlib/_mathtext_data.py | 2 - lib/matplotlib/mathtext.py | 19 ++-- .../test_mathtext/mathtext_cm_68.pdf | Bin 6294 -> 6299 bytes .../test_mathtext/mathtext_cm_69.pdf | Bin 7604 -> 7608 bytes .../test_mathtext/mathtext_cm_70.pdf | Bin 0 -> 3606 bytes .../test_mathtext/mathtext_cm_70.png | Bin 0 -> 1242 bytes .../test_mathtext/mathtext_cm_70.svg | 97 ++++++++++++++++++ .../test_mathtext/mathtext_stix_68.pdf | Bin 6097 -> 6102 bytes .../test_mathtext/mathtext_stix_69.pdf | Bin 5907 -> 5911 bytes .../test_mathtext/mathtext_stix_70.pdf | Bin 0 -> 3381 bytes .../test_mathtext/mathtext_stix_70.png | Bin 0 -> 1241 bytes .../test_mathtext/mathtext_stix_70.svg | 74 +++++++++++++ .../test_mathtext/mathtext_stixsans_68.pdf | Bin 6113 -> 6118 bytes .../test_mathtext/mathtext_stixsans_69.pdf | Bin 5879 -> 5883 bytes .../test_mathtext/mathtext_stixsans_70.pdf | Bin 0 -> 3335 bytes .../test_mathtext/mathtext_stixsans_70.png | Bin 0 -> 1245 bytes .../test_mathtext/mathtext_stixsans_70.svg | 55 ++++++++++ lib/matplotlib/tests/test_mathtext.py | 3 +- 19 files changed, 246 insertions(+), 10 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/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 ================ diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py index eb741d913278..cb87d445cd48 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 cbe8bfd6bdd4..69c110ba9a04 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_68.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_68.pdf index a3c7ab5ee242abbff1e38c43a8f6fd90b9063cef..94cdddaf6dcfbdb2fcbf71f6e63d4e6d79b1a9c2 100644 GIT binary patch delta 721 zcmbPcINNZ;UdDRcyu$`OZsqfulC4`*T?40GXUKfcw9lb_f{34S$*Zs4-g#2ijh7YK zSR%e${;hGS$(G~YgpJ?7_BQ$ND`W79k+az+<1o7>?61w*s6X1Dmp)=YAa>*P5g@$r zxrRUf9_!<-y&7sM5=#4I6Yg5-il~^k-L{`kYT|tlGzf8h z30mN?>ejQOFZ-RAsYPM~Vi=j4ZobIGE6izbXl`I( zXliIW`MK!wdP@ZZ5Kzcd-~uxYOpPs!FvLuZOfkhw%rM2w%rV6*EYQUa49uYBP39Fh zsW&u1S72mhV2mLK)P*i)Xl{t%Fk>SV3{M%D8)MjEXk-F$Y(0|iO^h&oZ(?A9;VWZv vOkbHA8)G=y*vJwX0jMEtY-(YEEXDznHZ?V~oa`>)#%W~0rK;-c@5TiHS&G*U delta 691 zcmbPjIL&awUdH;}e^wIE*TB;+Z z8T4q5<@Ie!77Y)ijrgAab34e+pter@oqSn>rhKS9|7y8^r)pOH;M>5e7a6o^NlM|# zUs^AFr1e+}72SD%Y-+x}Z-SGSrRBHv1;zR=L~?3wAG&(n^c%BA{nB5x#>}Fw+FwEz zdZb-@TJ>eW(=rj;S8``WlIERARMKtHh%J(Qtp4BT|ISH%k8))DcUe|k+nw`x!F{*s zwHw)|X(Ua*aftKvEv;LZm{x`!PW`q)Z)$wz;iRAC=Xy_Pt1q9}>l1o=f%oIW-`>f^ zcfNk$_`v+jY3&rQ)V!49lA_efE7`awpJw9XHUNp_CuMONnoVwGRNu_bd`F1W*x1m} z$iTwbX!0A;<*6nL1|Xo2r@#ef7?>KHn`4NX7#U!SnHXY9 zr1Ove2EJNYqPFnfGe58D*~SVwj~D(lJaGKWiY-k+tmdRnq@+NFuR zCPw$qseBbtA8@|#o9a66xneUUUA-S4**A6K?`EW6IQgICAx?8ca{~)QQ$y3qC#9ALS|}KRfI^-E7nosS zW@co7DP|5d1znw`DTbK2q1ohv(!z}9ldnqq+hWKYnwl7+>oGJoF~bluFtwPRC?i~N zi7o?l9)_tv12Dym%rSgnWNB`MZk~y$A%^WnW=4h(b$p0mF*P-|oXjXIY-^5ggsFi6 iW+0kcU<8{B-@W#xi(t#=$&2E92n_4y}(d#4p|NnCJp z`cbhb{GcGq`4bkeb}oJ(*U)*o{i|Uk@5l7L+g6v~pZUL6yn!(ydXer$vFz8&N{{uG zPPj1HJ^8DZ--eS3nv$Id7aQC>viIW*{|&b|tGWa~Gjtyp`pgllx;xNi;rFQ~8p{e^ zA6j{w^}C~P>#Oc3QFBdZNJU0HKC^FXoHtnWNKlGt{UV#bTMNSEMi7x7``yFG_ye0Yhr2$bw3{>2#m}O%_o19 x5w^v!-qhI07~Kd{0|N}Fo0(b|Om>tN7R69)W?^VDIaAi1!<0)^)z#mP3jhLHz$*X% 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..2b83c3c73f5c995c248383fa692c225aeab6246b GIT binary patch literal 3606 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 WtLR(Y`4w0=F?hQAxvX + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 d429f2bdb4ba8eca2377f4fcc3717611df29e596..c647dc9ec534eba5fe72faf5962e853ced695faa 100644 GIT binary patch delta 783 zcmcbpe@%bGUdDQBe`Z6Tdw;c!4qdq7Cu1Ea7+|QBm!R9v6dE0(a^z6|aoY#K7C4-C zTH>+u{l0KNJFesf1>y!hwfkAPnD3V}NNkKYc8*=)kTyH&(4m^^X@W{T8mf+2wO+rXe zVz4?bGB7~rR9aHZZ3(TpX^;0k(m$zVY_)m2-`$&at{?s9uW)lUIoler|7-pJjnPY1 zEpt2Ro|w5O%uL_vNmh_un5O-Wd#H~m?gPak~y z=3A!4OWX5uLX%n^yIcIfnx32WeM8Rf$HzPWs;|_z*`i%;e{!DM(j!WtF{}10K52PC z`rVD^J16rn%P^UkY}R6C7UVZlFfvduPzX}ccQaHlG?{E8a+lNG(A>bn(A30ivXbbs zG(#f=0}xQiQ{VzK3``A8%`wD`fGW_{85tR3ikV=VXJlqPSx?Nj-on5bUA>W^i5a?> zp{212hM1WlhMSBHEivpjurR`~!_deW?Dl$OPnsB*V_0l#VTNgmsfh);V@!c2qKg?D h8DokWn932|U+ZOOnU&o1><|6;UbY}%ITt39{Yw7>fy?2$uO-;|( zalJpbcT?)!g(1Rqi)(Hdtqwe0C>-{-g4^qB>bd5A1~uJ~J*&>YJQ!JAWj9Ah{rlse z4-zY9GpfqnZN1oUw|C{=*3{dwaph0?mo$k8uexG8DSnoL`ZO)Q&|4Q%L=G8WO?bvN zS&&(V$=GtUJ~Oi*zoCMmiGqPbkb=IOk%E!IWJi&^oW{n6hDHV!rk0b{MVHkZm@627 zfI^-E7nosSYG`VNDQ0PkA!cM~hAC!@X`Yd(1-d!|12c$ulYPWY>dh@N6c`zr7@})3 zv^28B5HmBxaICSR1%|^6EDSO1Ff=j(JE9)h_a+AB7#15_m|9!~?c#2nh8A3^s;>TSTmUd_{Qv*} diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_69.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_69.pdf index be7f1724d154563669d15b1d04362798b3b177d8..a5754449e49358fb138636af10dd672b7620ef14 100644 GIT binary patch delta 684 zcmbQNH(hVTUdH;fUe1m@t=}uVbV>`CPfjtK9I2I67&)gk`r^NeOl{F4>RrPgN&nL7VUB#(6uk!ev^#`kNKQQV5sqF|s9q@eF+q+nz)d6Mv5PIE(Z0}De_6SK(`BFpMc3>6GOKp{_o3(PPu zv9vHl7c(_5vcwcKHNX@z$1u;-z|sg^oq>UwDOhasTv5|{OAK=iEzL0OGc-3fM>ogN z#2CYDV*`+%QT=3KZir!rfu#k+t@TKrH?}myu*4V`Ug!oI8(U(CnOK@(SZr)yhGDU( ZkpWU5l@v|BAZEpBYQ&|g>gw;t1pw6*%*y}( delta 655 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 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_68.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_68.pdf index 4a5908b173ba6098cc2a0a270d2050b4db981589..7c282bc1868b7882fe46bbf4249fff16cfa0ef99 100644 GIT binary patch delta 818 zcmaE;|4e_wbH@7l8_$3LKTk3_-t5hD*@s-?89z3eY-(xP(McIS~-&(p)|d4xhd5^pN}WVpmr z`enw%f*C1l?z6sGW>$wAL}-dG+_Sc}vo-(2Gl8Q$C5Cex?R?*+#fk|ZZx7u4p_-w6 zbHPIG-Mi;6KdjHbJbd~6{_yVItGSuB>?^<9Cuh0z7t0D!{&Q1U!X~$CCG1I&xhJMq4U}0!xXffGHba|?Uf&mC9JQA3BAX zmfQQc$MgBE_uDVOUaUM^oF$|7{VrMCBCoHU0qSydG&$F(@y8yhIBBuRHZFFK&bxy1 z9cB*oh9ZY!RXOhdJ$o;pEig=-XNJuG<1+i*lqB7znVw18k~`~j)zv-MCny%Fev|VK z5{?%2V)d!*{j#3R^Xg1Rra5!(PYwTjoWpeX5~*)t)^3NJomRh{5*_k<#nx)+JRbGQ z*37buhMOaqmkaP4DHxh47$^iO=(`yz7#VEl7m;V=G&VLgG%~O>GMj8Jy1d?4!2kpl z@)Wqh3`a7$1*%*Mb(-UjoG2Uw%-yH4gA=$M|@f9Qmtx* zNsCWv{7aLFPKZ%X%>LZhBRt!b!O}|h%~8IZYxa5NFOPl5zC2+kV+3QQTr?0y&fEJi zL6<|?XmW9x;L+P#Zybze?dvnCeEPyu*Rse*XrtZX7YFxoUlXmrQ*$RN_u;-n53lI1 z`s?y)Yq{l56{T0)V&X5l6MkGwo@?hj?f28yd$Rj}ujSD0i%%$fCh=!>QJDSB@Y$EQ zS8k6rahFry6{F5u%RTw1r;t~qu`!#vYUV%xZf&2kr3Duc*`?()eRiJF=w;mCe{*tf z3|DGiN^wb1YGN*kl|OkW6Cb1L<`YbH0{n&wh9(LI3PB3`Zbk}529raD|8bfdnj2Uc zni*P5juBawW@xNn00Ihm3S3}@fr+J&DW;g21*VvVCAyfYfuRAWn6csH3{n4jpi59~ zGPE?rFcs)HGYoac7Ut+;MwVt6E;leY!mz`@(im!9J;IB|7N!`M7@L`3SYm8!j3H)X iX@Fs|k)LZh6Ui0P^T;oj#nsW`YqEFz+;KGL)}bYb9$wL2m8&@SNQ8)puW&UNk*^*R4hLc=e3=mTdo*&AICT?dsDvxfgS% zot=2RQ}4W|^Zi39g_Bx>uAS*Q=;=A@|K&$qlVdewwruE^oc-XBK-z*!G7p4Tq-L+3 zypBnh(Qxw_raA$BBLyP^1p|d31${R|1w)g`k;4BtO$^Kojf{59^pk}3sVeBjLl3iEHMTGbOTK+EHNxLvb4ku3PUp_ WbtOfKlXr?)aTsu^s=E5SaRC6Zm(@4` 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..ceb6df75c042a0c113b5e146d4cba8af457bb699 GIT binary patch literal 3335 zcmb_fZ)_Ar6fY1HTpJ zVNv{`F~NV3h@v8mMiUg3)QCY$1E?SxO^SvOA_Oc%Fh)=i0*PY4_hxVIj%)1)V=t50 zdGqG?{=b=4MZ*!FRI3P8JC2k0hXsjHV)yh33l|cxb8W^TVx#WrX*)^8sGc;kLPn}|&VZgb4lU4tkdKrE#vOe;w=4?bdBF7dPPqB;@<0ym)9v2z)MrZmQg7&g|J zaigOdgu$xQ(XDJocML1OmYeGF*Vm)1u;F^f3Syg)F!cs|08~eKe;`Oy1yx*ZS+<)6 zGJJO!Sv%*%!A0nj4vvXl6U0W)6#%m&#P*8%;+m@)G1K5LB1Y0+bl8a732=X_VI|!Z zkuWgK?^)L|^nPJraNDMDmrbVAzC8cJO`tAE&dvBd~YRT!7n`eY?PSJU*M)xmn zJ^j$ms*z#w#QC$===3g_E}3 z@ecg9tr|M@QumBy)lF}2>{$9p?0BU<{N&YHgNHWOJkWS#NA#7YBPR~@{Sh49XN?|N zfAFinF6`X0?&6N@fupzA*y-Nd?!i}Uo^D=rbbD&Pp4&7t+JA8G^38pn&5K5y!&7Ho zuAh9k`gl#}Czt0;ntR)&dEX4>eo6g!?~>_n4b|^|rn>LfpDVR1&+X~@V5p|DE?oEN zYn{ni7e9Qx^U~_Am-n2zo_)Du^w_?OQOv)*EApAhT!g-qRgGt-gt;=Ie`C2Gm*siH zcKQqM4$3@!`J5KS1}_18p#UX5KUImO$RQ$8*$>f&fEMDSZuorqXJp!x>s#);Yer>j z*LHFE`tIe`;v4HW`EH5sJbU+xZ?^5G(YdqhDqA)_xMAykSI(Fc=;I z(SGRN*~tsX9veRMXNCI0oRM)X#eyhU1*sJ_vT?`ExVA$iuOh@{dOu`Oth1%7*{}>p zPy1S+j?K6rV%@aqu4A%%uB8-H3x0(!NahATYq0tn7vX+0;ij@g@_K<-a3MAfKNMR^ zcd*!jgOxsar3V->ove#2gnGJ6amQ&W^b>7B@0!?iq30M1s*KjRy_|d zt7=J~Vt(O1Lw{j?`xM||4w*;^aHDJVuK*umX(pkFH9_oJVwlO4i$qTew5}u$4E5iG z(54SCFG68U0c^6FBAyqh#a1#6twxYDN72$JsdzMT0mvG;+o0BehTynhQRkY4r1_udm)gkK?h(%3y^>; z7uNWV1J5doB51I$su~Hx8oxO&pP4M!=WE6X*mwqqKNuo1=nS)<050--wlTX=2BYDO zd|Y?@#=+@`&-YZSFdGq@}N^^Q7JqVgtPf?REh~iA$bhk;{y4Nisoes0Sy%gCxQ+b zJj6sA&S(syp?-NC8HNhZ&Kt()aKi%~l8X{P7#?3nZV}G9&#P{u=3ig_xdbKgsxc>*$7V}*R-uLz80&)buyJy8ju1sC}~p2 zN0s@M&R@Wupov@@-dNTBx|>PcZrbc2nM5z?(c`P(838N|3hvQT4yjhHO&DvW8j^C| zOr0nePuJQ`azV*8GvFA#0wq#VpoKr8sj6Qky`(@xPv9T1I8D}q;O#P+>L1IeYVf=) z=Yt$Cr)lWGGCs`@SN)ANO0_X^sXqwmP{t?IF>=AfW6ny7HbxgoRv}nrcp+sBpR8h9 zmhlC^b7eF+pp?*DM>o@k!~SDwv3hO7G6UY<9kz`L#oppE^HBqW;=R*!$7NxXgK&{o KRW-Fogns~1A9KzC 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py index cec257de255b..9b3ac7ea8e54 100644 --- a/lib/matplotlib/tests/test_mathtext.py +++ b/lib/matplotlib/tests/test_mathtext.py @@ -94,7 +94,8 @@ 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"