Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #836 from mdboom/mathtext-prime

mathtext-prime
  • Loading branch information...
commit 9a8b35e167c912333f54c6d68ade8bf2a060a1c9 2 parents c063a9f + aa7e33d
@mdboom authored
View
4 lib/matplotlib/_mathtext_data.py
@@ -133,6 +133,8 @@
r'\Psi' : ('cmr10', 15),
r'\Omega' : ('cmr10', 12),
+ r'\prime' : ('cmsy10', 73),
+
# these are mathml names, I think. I'm just using them for the
# tex methods noted
r'\circumflexaccent' : ('cmr10', 124), # for \hat
@@ -245,7 +247,7 @@
r'\spadesuit' : ('cmsy10', 7),
r'?' : ('cmr10', 50),
r'!' : ('cmr10', 29),
- r'&' : ('cmr10', 109)
+ r'&' : ('cmr10', 109)
}
latex_to_cmex = {
View
48 lib/matplotlib/mathtext.py
@@ -2179,13 +2179,15 @@ def __init__(self):
).setParseAction(self.customspace).setName('customspace')
unicode_range = u"\U00000080-\U0001ffff"
- symbol =(Regex(UR"([a-zA-Z0-9 +\-*/<>=:,.;!\?&'@()\[\]|%s])|(\\[%%${}\[\]_|])" % unicode_range)
+ symbol =(Regex(UR"([a-zA-Z0-9 +\-*/<>=:,.;!\?&@()\[\]|%s])|(\\[%%${}\[\]_|])" % unicode_range)
| (Combine(
bslash
+ oneOf(tex2uni.keys())
) + FollowedBy(Regex("[^a-zA-Z]")))
).setParseAction(self.symbol).leaveWhitespace()
+ apostrophe = Regex(r"'+")
+
c_over_c =(Suppress(bslash)
+ oneOf(self._char_over_chars.keys())
).setParseAction(self.char_over_chars)
@@ -2296,8 +2298,10 @@ def __init__(self):
subsuperop
- placeable
)
+ + Optional(apostrophe)
)
- | placeable
+ | (placeable + Optional(apostrophe))
+ | apostrophe
)
autoDelim <<(Suppress(Literal(r"\left"))
@@ -2464,8 +2468,6 @@ def customspace(self, s, loc, toks):
def symbol(self, s, loc, toks):
# print "symbol", toks
c = toks[0]
- if c == "'":
- c = '\prime'
try:
char = Char(c, self.get_state())
except ValueError:
@@ -2625,23 +2627,39 @@ def subsuperscript(self, s, loc, toks):
sub = None
super = None
- if len(toks[0]) == 1:
- return toks[0].asList()
- elif len(toks[0]) == 2:
- op, next = toks[0]
+ # Pick all of the apostrophe's out
+ napostrophes = 0
+ new_toks = []
+ for tok in toks[0]:
+ if isinstance(tok, str) and tok not in ('^', '_'):
+ napostrophes += len(tok)
+ else:
+ new_toks.append(tok)
+ toks = new_toks
+
+ if len(toks) == 0:
+ assert napostrophes
+ nucleus = Hbox(0.0)
+ elif len(toks) == 1:
+ if not napostrophes:
+ return toks[0] # .asList()
+ else:
+ nucleus = toks[0]
+ elif len(toks) == 2:
+ op, next = toks
nucleus = Hbox(0.0)
if op == '_':
sub = next
else:
super = next
- elif len(toks[0]) == 3:
- nucleus, op, next = toks[0]
+ elif len(toks) == 3:
+ nucleus, op, next = toks
if op == '_':
sub = next
else:
super = next
- elif len(toks[0]) == 5:
- nucleus, op1, next1, op2, next2 = toks[0]
+ elif len(toks) == 5:
+ nucleus, op1, next1, op2, next2 = toks
if op1 == op2:
if op1 == '_':
raise ParseFatalException("Double subscript")
@@ -2664,6 +2682,12 @@ def subsuperscript(self, s, loc, toks):
xHeight = state.font_output.get_xheight(
state.font, state.fontsize, state.dpi)
+ if napostrophes:
+ if super is None:
+ super = Hlist([])
+ for i in range(napostrophes):
+ super.children.extend(self.symbol(s, loc, ['\prime']))
+
# Handle over/under symbols, such as sum or integral
if self.is_overunder(nucleus):
vlist = []
View
BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf
Binary file not shown
View
BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
169 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg
@@ -178,17 +178,18 @@ Q41.2188 40.1875 40.9219 40.1875
Q39.8438 40.4844 38.625 40.4844
Q34.0781 40.4844 32.9062 39.8906" id="Cmmi10-af"/>
<path d="
-M7.5 41.0938
-L14.2031 63.2031
-Q14.5938 64.7031 15 65.5469
-Q15.4062 66.4062 16.2969 67.0938
-Q17.2031 67.7969 18.5938 67.7969
-Q19.9062 67.7969 20.6562 66.8438
-Q21.4062 65.9062 21.4062 64.5
-Q21.4062 63.4062 20 60.5938
-L9.40625 40.2031
+M10.2031 23
+Q9.375 23 8.82812 23.625
+Q8.29688 24.2656 8.29688 25
+Q8.29688 25.7344 8.82812 26.3594
+Q9.375 27 10.2031 27
+L67.5781 27
+Q68.3594 27 68.875 26.3594
+Q69.3906 25.7344 69.3906 25
+Q69.3906 24.2656 68.875 23.625
+Q68.3594 23 67.5781 23
z
-" id="STIXGeneral-Regular-2032"/>
+" id="Cmsy10-a1"/>
<path d="
M10.5938 -217.094
Q13.0938 -219.578 16.7031 -219.578
@@ -517,6 +518,19 @@ Q20.8438 -2.20312 19.8281 -2.20312
L19 -2.20312
Q17.8281 -2.20312 17.8281 -1.125" id="Cmmi10-57"/>
<path d="
+M3.51562 5.42188
+Q2.875 5.60938 2.875 6.39062
+L15.0938 51.8125
+Q15.6719 53.6562 17.0781 54.7812
+Q18.5 55.9062 20.3125 55.9062
+Q22.6562 55.9062 24.4375 54.3594
+Q26.2188 52.8281 26.2188 50.4844
+Q26.2188 49.4688 25.6875 48.1875
+L7.625 4.98438
+Q7.28125 4.29688 6.6875 4.29688
+Q6.15625 4.29688 5 4.78125
+Q3.85938 5.28125 3.51562 5.42188" id="Cmsy10-30"/>
+ <path d="
M7.51562 23
Q6.6875 23 6.14062 23.625
Q5.60938 24.2656 5.60938 25
@@ -544,18 +558,33 @@ L36.9219 23
z
" id="Cmr10-2b"/>
<path d="
-M10.2031 23
-Q9.375 23 8.82812 23.625
-Q8.29688 24.2656 8.29688 25
-Q8.29688 25.7344 8.82812 26.3594
-Q9.375 27 10.2031 27
-L67.5781 27
-Q68.3594 27 68.875 26.3594
-Q69.3906 25.7344 69.3906 25
-Q69.3906 24.2656 68.875 23.625
-Q68.3594 23 67.5781 23
-z
-" id="Cmsy10-a1"/>
+M25 -2.20312
+Q12.75 -2.20312 8.32812 7.875
+Q3.90625 17.9688 3.90625 31.8906
+Q3.90625 40.5781 5.48438 48.2344
+Q7.07812 55.9062 11.7812 61.25
+Q16.5 66.6094 25 66.6094
+Q31.5938 66.6094 35.7812 63.375
+Q39.9844 60.1562 42.1875 55.0469
+Q44.3906 49.9531 45.1875 44.1094
+Q46 38.2812 46 31.8906
+Q46 23.2969 44.4062 15.7969
+Q42.8281 8.29688 38.1875 3.04688
+Q33.5469 -2.20312 25 -2.20312
+M25 0.390625
+Q30.5625 0.390625 33.2969 6.09375
+Q36.0312 11.8125 36.6719 18.75
+Q37.3125 25.6875 37.3125 33.5
+Q37.3125 41.0156 36.6719 47.3594
+Q36.0312 53.7188 33.3125 58.8594
+Q30.6094 64.0156 25 64.0156
+Q19.3438 64.0156 16.6094 58.8281
+Q13.875 53.6562 13.2344 47.3281
+Q12.5938 41.0156 12.5938 33.5
+Q12.5938 27.9375 12.8594 23
+Q13.1406 18.0625 14.3125 12.8125
+Q15.4844 7.5625 18.0938 3.96875
+Q20.7031 0.390625 25 0.390625" id="Cmr10-30"/>
<path d="
M17.3906 -1.125
Q11.0781 -1.125 7.4375 3.64062
@@ -638,34 +667,6 @@ L30.9062 -295.906
z
" id="Cmex10-23"/>
<path d="
-M25 -2.20312
-Q12.75 -2.20312 8.32812 7.875
-Q3.90625 17.9688 3.90625 31.8906
-Q3.90625 40.5781 5.48438 48.2344
-Q7.07812 55.9062 11.7812 61.25
-Q16.5 66.6094 25 66.6094
-Q31.5938 66.6094 35.7812 63.375
-Q39.9844 60.1562 42.1875 55.0469
-Q44.3906 49.9531 45.1875 44.1094
-Q46 38.2812 46 31.8906
-Q46 23.2969 44.4062 15.7969
-Q42.8281 8.29688 38.1875 3.04688
-Q33.5469 -2.20312 25 -2.20312
-M25 0.390625
-Q30.5625 0.390625 33.2969 6.09375
-Q36.0312 11.8125 36.6719 18.75
-Q37.3125 25.6875 37.3125 33.5
-Q37.3125 41.0156 36.6719 47.3594
-Q36.0312 53.7188 33.3125 58.8594
-Q30.6094 64.0156 25 64.0156
-Q19.3438 64.0156 16.6094 58.8281
-Q13.875 53.6562 13.2344 47.3281
-Q12.5938 41.0156 12.5938 33.5
-Q12.5938 27.9375 12.8594 23
-Q13.1406 18.0625 14.3125 12.8125
-Q15.4844 7.5625 18.0938 3.96875
-Q20.7031 0.390625 25 0.390625" id="Cmr10-30"/>
- <path d="
M20.0156 -1.51562
Q16.5469 -1.51562 13.5625 -0.21875
Q10.5938 1.07812 8.375 3.51562
@@ -754,7 +755,7 @@ Q26.2656 63.625 25.6875 61.375
L16.0156 22.6094
Q14.7031 17.3281 14.7031 13.9219" id="Cmmi10-55"/>
</defs>
- <g transform="translate(84.54 43.32)scale(0.12 -0.12)">
+ <g transform="translate(84.72 43.32)scale(0.12 -0.12)">
<use transform="translate(0.0 122.135416667)" xlink:href="#Cmmi10-57"/>
<use transform="translate(109.441765625 172.607291667)scale(0.7)" xlink:href="#Cmr10-33"/>
<use transform="translate(144.441765625 172.607291667)scale(0.7)" xlink:href="#Cmmi10-af"/>
@@ -784,35 +785,35 @@ Q14.7031 17.3281 14.7031 13.9219" id="Cmmi10-55"/>
<use transform="translate(937.965820312 0.9934375)scale(0.49)" xlink:href="#Cmr10-32"/>
<use transform="translate(1029.97144531 122.135416667)" xlink:href="#Cmmi10-64"/>
<use transform="translate(1081.97339844 122.135416667)" xlink:href="#Cmmi10-ae"/>
- <use transform="translate(1158.13391406 164.651041667)scale(0.7)" xlink:href="#STIXGeneral-Regular-2032"/>
+ <use transform="translate(1158.13391406 164.651041667)scale(0.7)" xlink:href="#Cmsy10-30"/>
<use transform="translate(1145.88941406 96.6260416667)scale(0.7)" xlink:href="#Cmr10-32"/>
- <use transform="translate(1204.04015796 262.139416667)scale(0.77266895905)" xlink:href="#Cmex10-22"/>
- <use transform="translate(1249.08662097 195.359697917)scale(0.7)" xlink:href="#Cmmi10-55"/>
- <use transform="translate(1307.37554441 230.690010417)scale(0.49)" xlink:href="#Cmr10-32"/>
- <use transform="translate(1331.87554441 230.690010417)scale(0.49)" xlink:href="#Cmmi10-af"/>
- <use transform="translate(1296.83564441 172.135010417)scale(0.49)" xlink:href="#Cmmi10-b1"/>
- <use transform="translate(1318.58417957 159.635416667)scale(0.343)" xlink:href="#Cmr10-31"/>
- <use transform="translate(1343.08417957 172.135010417)scale(0.49)" xlink:href="#Cmmi10-bd"/>
- <use transform="translate(1368.42158191 159.635416667)scale(0.343)" xlink:href="#Cmr10-31"/>
- <use transform="translate(1392.92158191 195.359697917)scale(0.7)" xlink:href="#Cmsy10-a1"/>
- <use transform="translate(1447.30146472 195.359697917)scale(0.7)" xlink:href="#Cmmi10-ae"/>
- <use transform="translate(1500.61382566 225.120635417)scale(0.49)" xlink:href="#STIXGeneral-Regular-2032"/>
- <use transform="translate(1492.04267566 177.503135417)scale(0.49)" xlink:href="#Cmr10-32"/>
- <use transform="translate(1532.74819639 195.359697917)scale(0.7)" xlink:href="#Cmmi10-55"/>
- <use transform="translate(1589.10459482 225.321885417)scale(0.49)" xlink:href="#Cmr10-31"/>
- <use transform="translate(1613.60459482 225.321885417)scale(0.49)" xlink:href="#Cmmi10-af"/>
- <use transform="translate(1580.49721982 177.503135417)scale(0.49)" xlink:href="#Cmmi10-bd"/>
- <use transform="translate(1605.83462217 165.003541667)scale(0.343)" xlink:href="#Cmr10-31"/>
- <use transform="translate(1630.33462217 177.503135417)scale(0.49)" xlink:href="#Cmmi10-be"/>
- <use transform="translate(1658.30386045 165.003541667)scale(0.343)" xlink:href="#Cmr10-32"/>
- <use transform="translate(1391.08662097 63.8705729167)scale(0.7)" xlink:href="#Cmmi10-55"/>
- <use transform="translate(1447.44301941 93.8327604167)scale(0.49)" xlink:href="#Cmr10-30"/>
- <use transform="translate(1471.94301941 93.8327604167)scale(0.49)" xlink:href="#Cmmi10-af"/>
- <use transform="translate(1438.83564441 46.0140104167)scale(0.49)" xlink:href="#Cmmi10-bd"/>
- <use transform="translate(1464.17304675 33.5144166667)scale(0.343)" xlink:href="#Cmr10-31"/>
- <use transform="translate(1488.67304675 46.0140104167)scale(0.49)" xlink:href="#Cmmi10-be"/>
- <use transform="translate(1516.64228503 33.5144166667)scale(0.343)" xlink:href="#Cmr10-32"/>
- <use transform="translate(1695.30386045 262.139416667)scale(0.77266895905)" xlink:href="#Cmex10-23"/>
+ <use transform="translate(1202.63039844 262.139416667)scale(0.77266895905)" xlink:href="#Cmex10-22"/>
+ <use transform="translate(1247.67686145 195.359697917)scale(0.7)" xlink:href="#Cmmi10-55"/>
+ <use transform="translate(1305.96578489 230.690010417)scale(0.49)" xlink:href="#Cmr10-32"/>
+ <use transform="translate(1330.46578489 230.690010417)scale(0.49)" xlink:href="#Cmmi10-af"/>
+ <use transform="translate(1295.42588489 172.135010417)scale(0.49)" xlink:href="#Cmmi10-b1"/>
+ <use transform="translate(1317.17442004 159.635416667)scale(0.343)" xlink:href="#Cmr10-31"/>
+ <use transform="translate(1341.67442004 172.135010417)scale(0.49)" xlink:href="#Cmmi10-bd"/>
+ <use transform="translate(1367.01182239 159.635416667)scale(0.343)" xlink:href="#Cmr10-31"/>
+ <use transform="translate(1391.51182239 195.359697917)scale(0.7)" xlink:href="#Cmsy10-a1"/>
+ <use transform="translate(1445.8917052 195.359697917)scale(0.7)" xlink:href="#Cmmi10-ae"/>
+ <use transform="translate(1499.20406614 225.120635417)scale(0.49)" xlink:href="#Cmsy10-30"/>
+ <use transform="translate(1490.63291614 177.503135417)scale(0.49)" xlink:href="#Cmr10-32"/>
+ <use transform="translate(1530.3516052 195.359697917)scale(0.7)" xlink:href="#Cmmi10-55"/>
+ <use transform="translate(1586.70800364 225.321885417)scale(0.49)" xlink:href="#Cmr10-31"/>
+ <use transform="translate(1611.20800364 225.321885417)scale(0.49)" xlink:href="#Cmmi10-af"/>
+ <use transform="translate(1578.10062864 177.503135417)scale(0.49)" xlink:href="#Cmmi10-bd"/>
+ <use transform="translate(1603.43803098 165.003541667)scale(0.343)" xlink:href="#Cmr10-31"/>
+ <use transform="translate(1627.93803098 177.503135417)scale(0.49)" xlink:href="#Cmmi10-be"/>
+ <use transform="translate(1655.90726926 165.003541667)scale(0.343)" xlink:href="#Cmr10-32"/>
+ <use transform="translate(1388.67686145 63.8705729167)scale(0.7)" xlink:href="#Cmmi10-55"/>
+ <use transform="translate(1445.03325989 93.8327604167)scale(0.49)" xlink:href="#Cmr10-30"/>
+ <use transform="translate(1469.53325989 93.8327604167)scale(0.49)" xlink:href="#Cmmi10-af"/>
+ <use transform="translate(1436.42588489 46.0140104167)scale(0.49)" xlink:href="#Cmmi10-bd"/>
+ <use transform="translate(1461.76328723 33.5144166667)scale(0.343)" xlink:href="#Cmr10-31"/>
+ <use transform="translate(1486.26328723 46.0140104167)scale(0.49)" xlink:href="#Cmmi10-be"/>
+ <use transform="translate(1514.23252551 33.5144166667)scale(0.343)" xlink:href="#Cmr10-32"/>
+ <use transform="translate(1692.90726926 262.139416667)scale(0.77266895905)" xlink:href="#Cmex10-23"/>
<path d="
M715.319 134.635
L715.319 140.885
@@ -822,11 +823,11 @@ L715.319 134.635
z
"/>
<path d="
-M1249.09 134.635
-L1249.09 140.885
-L1682.8 140.885
-L1682.8 134.635
-L1249.09 134.635
+M1247.68 134.635
+L1247.68 140.885
+L1680.41 140.885
+L1680.41 134.635
+L1247.68 134.635
z
"/>
</g>
View
BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf
Binary file not shown
View
62 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.svg
@@ -604,32 +604,32 @@ z
<use transform="translate(1061.29592511 129.62328125)scale(0.7)" xlink:href="#STIXGeneral-Regular-2032"/>
<use transform="translate(1047.69917511 54.08578125)scale(0.7)" xlink:href="#STIXGeneral-Regular-32"/>
<use transform="translate(1099.01466901 36.0625)scale(0.89769054878)" xlink:href="#STIXSizeThreeSym-Regular-5b"/>
- <use transform="translate(1144.6156059 145.955)scale(0.7)" xlink:href="#STIXGeneral-Italic-55"/>
- <use transform="translate(1205.47735558 188.22078125)scale(0.49)" xlink:href="#STIXGeneral-Regular-32"/>
- <use transform="translate(1229.9773481 188.22078125)scale(0.49)" xlink:href="#STIXGeneral-Italic-3b2"/>
- <use transform="translate(1195.15559308 130.87765625)scale(0.49)" xlink:href="#STIXGeneral-Italic-3b4"/>
- <use transform="translate(1217.6955856 124.395875)scale(0.343)" xlink:href="#STIXGeneral-Regular-31"/>
- <use transform="translate(1242.19557813 130.87765625)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c1"/>
- <use transform="translate(1266.89157513 124.395875)scale(0.343)" xlink:href="#STIXGeneral-Regular-31"/>
- <use transform="translate(1291.39156766 145.955)scale(0.7)" xlink:href="#STIXGeneral-Regular-2212"/>
- <use transform="translate(1339.34155698 145.955)scale(0.7)" xlink:href="#STIXGeneral-Italic-3b1"/>
- <use transform="translate(1387.49927984 178.56625)scale(0.49)" xlink:href="#STIXGeneral-Regular-2032"/>
- <use transform="translate(1377.98155484 125.69)scale(0.49)" xlink:href="#STIXGeneral-Regular-32"/>
- <use transform="translate(1413.90240057 145.955)scale(0.7)" xlink:href="#STIXGeneral-Italic-55"/>
- <use transform="translate(1472.669794 182.403125)scale(0.49)" xlink:href="#STIXGeneral-Regular-31"/>
- <use transform="translate(1497.16978652 182.403125)scale(0.49)" xlink:href="#STIXGeneral-Italic-3b2"/>
- <use transform="translate(1464.44238775 136.6953125)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c1"/>
- <use transform="translate(1489.13838476 130.21353125)scale(0.343)" xlink:href="#STIXGeneral-Regular-31"/>
- <use transform="translate(1513.63837728 136.6953125)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c3"/>
- <use transform="translate(1538.0403713 130.21353125)scale(0.343)" xlink:href="#STIXGeneral-Regular-32"/>
- <use transform="translate(1279.6156059 19.9140625)scale(0.7)" xlink:href="#STIXGeneral-Italic-55"/>
- <use transform="translate(1338.38299933 56.3621875)scale(0.49)" xlink:href="#STIXGeneral-Regular-30"/>
- <use transform="translate(1362.88299185 56.3621875)scale(0.49)" xlink:href="#STIXGeneral-Italic-3b2"/>
- <use transform="translate(1330.15559308 10.654375)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c1"/>
- <use transform="translate(1354.85159009 4.17259375)scale(0.343)" xlink:href="#STIXGeneral-Regular-31"/>
- <use transform="translate(1379.35158261 10.654375)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c3"/>
- <use transform="translate(1403.75357663 4.17259375)scale(0.343)" xlink:href="#STIXGeneral-Regular-32"/>
- <use transform="translate(1575.04036382 36.0625)scale(0.89769054878)" xlink:href="#STIXSizeThreeSym-Regular-5d"/>
+ <use transform="translate(1144.60765607 145.955)scale(0.7)" xlink:href="#STIXGeneral-Italic-55"/>
+ <use transform="translate(1205.46940575 188.22078125)scale(0.49)" xlink:href="#STIXGeneral-Regular-32"/>
+ <use transform="translate(1229.96939827 188.22078125)scale(0.49)" xlink:href="#STIXGeneral-Italic-3b2"/>
+ <use transform="translate(1195.14764325 130.87765625)scale(0.49)" xlink:href="#STIXGeneral-Italic-3b4"/>
+ <use transform="translate(1217.68763577 124.395875)scale(0.343)" xlink:href="#STIXGeneral-Regular-31"/>
+ <use transform="translate(1242.1876283 130.87765625)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c1"/>
+ <use transform="translate(1266.88362531 124.395875)scale(0.343)" xlink:href="#STIXGeneral-Regular-31"/>
+ <use transform="translate(1291.38361783 145.955)scale(0.7)" xlink:href="#STIXGeneral-Regular-2212"/>
+ <use transform="translate(1339.33360715 145.955)scale(0.7)" xlink:href="#STIXGeneral-Italic-3b1"/>
+ <use transform="translate(1387.49133001 178.56625)scale(0.49)" xlink:href="#STIXGeneral-Regular-2032"/>
+ <use transform="translate(1377.97360501 125.69)scale(0.49)" xlink:href="#STIXGeneral-Regular-32"/>
+ <use transform="translate(1413.89445074 145.955)scale(0.7)" xlink:href="#STIXGeneral-Italic-55"/>
+ <use transform="translate(1472.66184417 182.403125)scale(0.49)" xlink:href="#STIXGeneral-Regular-31"/>
+ <use transform="translate(1497.16183669 182.403125)scale(0.49)" xlink:href="#STIXGeneral-Italic-3b2"/>
+ <use transform="translate(1464.43443792 136.6953125)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c1"/>
+ <use transform="translate(1489.13043493 130.21353125)scale(0.343)" xlink:href="#STIXGeneral-Regular-31"/>
+ <use transform="translate(1513.63042745 136.6953125)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c3"/>
+ <use transform="translate(1538.03242147 130.21353125)scale(0.343)" xlink:href="#STIXGeneral-Regular-32"/>
+ <use transform="translate(1279.60765607 19.9140625)scale(0.7)" xlink:href="#STIXGeneral-Italic-55"/>
+ <use transform="translate(1338.3750495 56.3621875)scale(0.49)" xlink:href="#STIXGeneral-Regular-30"/>
+ <use transform="translate(1362.87504202 56.3621875)scale(0.49)" xlink:href="#STIXGeneral-Italic-3b2"/>
+ <use transform="translate(1330.14764325 10.654375)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c1"/>
+ <use transform="translate(1354.84364026 4.17259375)scale(0.343)" xlink:href="#STIXGeneral-Regular-31"/>
+ <use transform="translate(1379.34363278 10.654375)scale(0.49)" xlink:href="#STIXGeneral-Italic-3c3"/>
+ <use transform="translate(1403.7456268 4.17259375)scale(0.343)" xlink:href="#STIXGeneral-Regular-32"/>
+ <use transform="translate(1575.032414 36.0625)scale(0.89769054878)" xlink:href="#STIXSizeThreeSym-Regular-5d"/>
<path d="
M675.767 95.8327
L675.767 102.083
@@ -639,11 +639,11 @@ L675.767 95.8327
z
"/>
<path d="
-M1144.62 95.8327
-L1144.62 102.083
-L1562.54 102.083
-L1562.54 95.8327
-L1144.62 95.8327
+M1144.61 95.8327
+L1144.61 102.083
+L1562.53 102.083
+L1562.53 95.8327
+L1144.61 95.8327
z
"/>
</g>
View
BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.pdf
Binary file not shown
View
58 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.svg
@@ -512,32 +512,32 @@ Q32.5938 25.9062 27.5938 28.5938" id="STIXGeneral-Regular-1d7ea"/>
<use transform="translate(1079.81983551 131.22453125)scale(0.7)" xlink:href="#STIXGeneral-Regular-2032"/>
<use transform="translate(1079.81983551 57.89015625)scale(0.7)" xlink:href="#STIXGeneral-Regular-1d7e4"/>
<use transform="translate(1129.81982025 37.015625)scale(0.91399898374)" xlink:href="#STIXSizeThreeSym-Regular-5b"/>
- <use transform="translate(1176.24625763 149.29640625)scale(0.7)" xlink:href="#STIXGeneral-Italic-1d61c"/>
- <use transform="translate(1233.16482622 192.53453125)scale(0.49)" xlink:href="#STIXGeneral-Regular-1d7e4"/>
- <use transform="translate(1257.66481874 192.53453125)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1d9"/>
- <use transform="translate(1222.51625122 133.37578125)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1db"/>
- <use transform="translate(1246.86924973 126.717140625)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
- <use transform="translate(1271.36924225 133.37578125)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1e8"/>
- <use transform="translate(1297.53523926 126.717140625)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
- <use transform="translate(1322.03523178 149.29640625)scale(0.7)" xlink:href="#STIXGeneral-Regular-2212"/>
- <use transform="translate(1369.9852211 149.29640625)scale(0.7)" xlink:href="#STIXNonUnicode-Italic-e1d8"/>
- <use transform="translate(1411.00521469 181.655)scale(0.49)" xlink:href="#STIXGeneral-Regular-2032"/>
- <use transform="translate(1411.00521469 130.3209375)scale(0.49)" xlink:href="#STIXGeneral-Regular-1d7e4"/>
- <use transform="translate(1446.00520401 149.29640625)scale(0.7)" xlink:href="#STIXGeneral-Italic-1d61c"/>
- <use transform="translate(1500.61679135 186.12625)scale(0.49)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
- <use transform="translate(1525.11678387 186.12625)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1d9"/>
- <use transform="translate(1492.2751976 139.7840625)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1e8"/>
- <use transform="translate(1518.44119461 133.125421875)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
- <use transform="translate(1542.94118713 139.7840625)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1ea"/>
- <use transform="translate(1572.68418564 133.125421875)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e4"/>
- <use transform="translate(1311.24625763 21.24953125)scale(0.7)" xlink:href="#STIXGeneral-Italic-1d61c"/>
- <use transform="translate(1365.85784497 58.079375)scale(0.49)" xlink:href="#STIXGeneral-Regular-1d7e2"/>
- <use transform="translate(1390.35783749 58.079375)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1d9"/>
- <use transform="translate(1357.51625122 11.7371875)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1e8"/>
- <use transform="translate(1383.68224823 5.078546875)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
- <use transform="translate(1408.18224075 11.7371875)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1ea"/>
- <use transform="translate(1437.92523926 5.078546875)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e4"/>
- <use transform="translate(1609.68417816 37.015625)scale(0.91399898374)" xlink:href="#STIXSizeThreeSym-Regular-5d"/>
+ <use transform="translate(1176.2383078 149.29640625)scale(0.7)" xlink:href="#STIXGeneral-Italic-1d61c"/>
+ <use transform="translate(1233.15687639 192.53453125)scale(0.49)" xlink:href="#STIXGeneral-Regular-1d7e4"/>
+ <use transform="translate(1257.65686891 192.53453125)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1d9"/>
+ <use transform="translate(1222.50830139 133.37578125)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1db"/>
+ <use transform="translate(1246.8612999 126.717140625)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
+ <use transform="translate(1271.36129242 133.37578125)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1e8"/>
+ <use transform="translate(1297.52728943 126.717140625)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
+ <use transform="translate(1322.02728195 149.29640625)scale(0.7)" xlink:href="#STIXGeneral-Regular-2212"/>
+ <use transform="translate(1369.97727127 149.29640625)scale(0.7)" xlink:href="#STIXNonUnicode-Italic-e1d8"/>
+ <use transform="translate(1410.99726486 181.655)scale(0.49)" xlink:href="#STIXGeneral-Regular-2032"/>
+ <use transform="translate(1410.99726486 130.3209375)scale(0.49)" xlink:href="#STIXGeneral-Regular-1d7e4"/>
+ <use transform="translate(1445.99725418 149.29640625)scale(0.7)" xlink:href="#STIXGeneral-Italic-1d61c"/>
+ <use transform="translate(1500.60884152 186.12625)scale(0.49)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
+ <use transform="translate(1525.10883405 186.12625)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1d9"/>
+ <use transform="translate(1492.26724777 139.7840625)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1e8"/>
+ <use transform="translate(1518.43324478 133.125421875)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
+ <use transform="translate(1542.9332373 139.7840625)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1ea"/>
+ <use transform="translate(1572.67623581 133.125421875)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e4"/>
+ <use transform="translate(1311.2383078 21.24953125)scale(0.7)" xlink:href="#STIXGeneral-Italic-1d61c"/>
+ <use transform="translate(1365.84989514 58.079375)scale(0.49)" xlink:href="#STIXGeneral-Regular-1d7e2"/>
+ <use transform="translate(1390.34988766 58.079375)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1d9"/>
+ <use transform="translate(1357.50830139 11.7371875)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1e8"/>
+ <use transform="translate(1383.6742984 5.078546875)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e3"/>
+ <use transform="translate(1408.17429092 11.7371875)scale(0.49)" xlink:href="#STIXNonUnicode-Italic-e1ea"/>
+ <use transform="translate(1437.91728943 5.078546875)scale(0.343)" xlink:href="#STIXGeneral-Regular-1d7e4"/>
+ <use transform="translate(1609.67622833 37.015625)scale(0.91399898374)" xlink:href="#STIXSizeThreeSym-Regular-5d"/>
<path d="
M698.197 97.7948
L698.197 104.045
@@ -547,11 +547,11 @@ L698.197 97.7948
z
"/>
<path d="
-M1176.25 97.7948
-L1176.25 104.045
+M1176.24 97.7948
+L1176.24 104.045
L1597.18 104.045
L1597.18 97.7948
-L1176.25 97.7948
+L1176.24 97.7948
z
"/>
</g>
View
2  lib/matplotlib/tests/test_mathtext.py
@@ -35,7 +35,7 @@
r"$\gamma = \frac{x=\frac{6}{8}}{y} \delta$",
r'$\limsup_{x\to\infty}$',
r'$\oint^\infty_0$',
- r"$f^'$",
+ r"$f'$",
r'$\frac{x_2888}{y}$',
r"$\sqrt[3]{\frac{X_2}{Y}}=5$",
r"$\sqrt[5]{\prod^\frac{x}{2\pi^2}_\infty}$",
Please sign in to comment.
Something went wrong with that request. Please try again.