diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py index db6737a9e86a..1c5f98d0eaa3 100644 --- a/lib/matplotlib/mathtext.py +++ b/lib/matplotlib/mathtext.py @@ -2107,8 +2107,8 @@ class Parser(object): \\subseteq \\supseteq \\cong \\Join \\sqsubset \\sqsupset \\neq \\smile \\sqsubseteq \\sqsupseteq \\doteq \\frown - \\in \\ni \\propto - \\vdash \\dashv \\dots'''.split()) + \\in \\ni \\propto \\vdash + \\dashv \\dots \\dotplus \\doteqdot'''.split()) _arrow_symbols = set(''' \\leftarrow \\longleftarrow \\uparrow @@ -2190,6 +2190,7 @@ def __init__(self): p.simple = Forward() p.simple_group = Forward() p.single_symbol = Forward() + p.snowflake = Forward() p.space = Forward() p.sqrt = Forward() p.stackrel = Forward() @@ -2223,6 +2224,7 @@ def __init__(self): unicode_range = "\U00000080-\U0001ffff" p.single_symbol <<= Regex(r"([a-zA-Z0-9 +\-*/<>=:,.;!\?&'@()\[\]|%s])|(\\[%%${}\[\]_|])" % unicode_range) + p.snowflake <<= Suppress(p.bslash) + oneOf(self._snowflake) p.symbol_name <<= (Combine(p.bslash + oneOf(list(six.iterkeys(tex2uni)))) + FollowedBy(Regex("[^A-Za-z]").leaveWhitespace() | StringEnd())) p.symbol <<= (p.single_symbol | p.symbol_name).leaveWhitespace() @@ -2297,8 +2299,10 @@ def __init__(self): | Error("Expected \operatorname{value}")) ) - p.placeable <<= ( p.symbol # Must be first - | p.accent # Must be second + p.placeable <<= ( p.snowflake # this needs to be before accent so named symbols + # that are prefixed with an accent name work + | p.accent # Must be before symbol as all accents are symbols + | p.symbol # Must be third to catch all named symbols and single chars not in a group | p.c_over_c | p.function | p.group @@ -2498,13 +2502,15 @@ def symbol(self, s, loc, toks): return [Hlist( [self._make_space(0.2), char, self._make_space(0.2)] , - do_kern = False)] + do_kern = True)] elif c in self._punctuation_symbols: return [Hlist( [char, self._make_space(0.2)] , - do_kern = False)] + do_kern = True)] return [char] + snowflake = symbol + def unknown_symbol(self, s, loc, toks): # print "symbol", toks c = toks[0] @@ -2560,9 +2566,9 @@ def c_over_c(self, s, loc, toks): r'bar' : r'\combiningoverline', r'grave' : r'\combininggraveaccent', r'acute' : r'\combiningacuteaccent', - r'ddot' : r'\combiningdiaeresis', r'tilde' : r'\combiningtilde', r'dot' : r'\combiningdotabove', + r'ddot' : r'\combiningdiaeresis', r'vec' : r'\combiningrightarrowabove', r'"' : r'\combiningdiaeresis', r"`" : r'\combininggraveaccent', @@ -2577,6 +2583,11 @@ def c_over_c(self, s, loc, toks): _wide_accents = set(r"widehat widetilde widebar".split()) + # make a lambda and call it to get the namespace right + _snowflake = (lambda am: [p for p in tex2uni if + any(p.startswith(a) and a != p for a in am)] + ) (set(_accent_map)) + def accent(self, s, loc, toks): assert(len(toks)==1) state = self.get_state() diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.pdf index 2aa42af97a11..7ec963754a71 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.png index aefda9099d55..b90c0f1d3956 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.svg index 850e58198b67..24d898f909b6 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_01.svg @@ -5,228 +5,161 @@ - - - - - - + + + - - - - - - + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.pdf index 1f8b832e7865..1c896f8a0080 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.png index 0c0591e685be..ff8b3962e1f9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.svg index d07277d3e26e..85243d1773e0 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.svg @@ -5,336 +5,331 @@ - - - - - + + + - - - - +" id="Cmr10-3d"/> + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.pdf index 1641dcb4e344..a0f21451b012 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.png index bea8426a9ab2..6e479476a94c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.svg index 5df0dcdf776b..b381e4e73337 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.svg @@ -5,390 +5,386 @@ - - + + + - - + + - - - - - +" id="Cmr10-31"/> + + - + - - - - - - - - - + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.pdf index d8bf0af338d0..0c57a05a1d3a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.png index 827a04ff0874..c0295ba56e67 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.svg index 6278d8bfec14..80a0f849b363 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.svg @@ -20,6 +20,220 @@ z + + + + + - - + + + + - - + + + - - - - - - - - - - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf index 782007f381cd..43dcf1b1cf86 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.png index 21037caf8bba..b8d97b0ce19c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.svg index d3b457c427a4..d135d49ec0d7 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.svg @@ -20,70 +20,6 @@ z - - - - - - - - + + + + + + + + + + + + + + + - - + + + - - - - - - - - - + @@ -710,26 +710,26 @@ Q 16.15625 1.515625 20.3125 1.515625 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf index 07baa4f40eeb..e5c5824517b2 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.png index 5c55554629b6..2ed2edab31da 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg index d18a89797fea..277a27212e9f 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg @@ -20,6 +20,124 @@ z + + + + - - - - - + + + + + + + + + - - - + - - - +" id="Cmr10-31"/> + - - - - - - - + @@ -755,66 +755,66 @@ Q 14.265625 1.515625 17.484375 1.515625 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.pdf index c6dc587b9ab7..b6c63e8885ea 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.png index df90bc37a973..1e1b37467ac2 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.svg index 48d8b7979447..89c1766b6dc1 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.svg @@ -5,270 +5,256 @@ - - - + - + + - + - - + - +" id="Cmex10-73"/> - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.pdf index 958676105e18..c40bfb701955 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.png index fe584e2fa823..f13d4fa01e5b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.svg index 35086f565ca1..7076f40cad00 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.svg @@ -20,125 +20,6 @@ z - - - - - + + - + +L 15.578125 10.5 +Q 14.203125 7.171875 14.203125 4.5 +Q 14.203125 1.515625 16.5 1.515625 +Q 20.40625 1.515625 23.015625 5.6875 +Q 25.640625 9.859375 26.703125 14.703125 +Q 26.90625 15.28125 27.484375 15.28125 +L 28.71875 15.28125 +Q 29.109375 15.28125 29.34375 15.015625 +Q 29.59375 14.75 29.59375 14.40625 +Q 29.59375 14.3125 29.5 14.109375 +Q 28.125 8.453125 24.734375 3.65625 +Q 21.34375 -1.125 16.3125 -1.125 +Q 12.796875 -1.125 10.296875 1.296875 +Q 7.8125 3.71875 7.8125 7.171875 +M 19.09375 60.59375 +Q 19.09375 62.703125 20.84375 64.40625 +Q 22.609375 66.109375 24.703125 66.109375 +Q 26.421875 66.109375 27.515625 65.0625 +Q 28.609375 64.015625 28.609375 62.40625 +Q 28.609375 60.15625 26.828125 58.46875 +Q 25.046875 56.78125 22.90625 56.78125 +Q 21.296875 56.78125 20.1875 57.875 +Q 19.09375 58.984375 19.09375 60.59375 +" id="Cmmi10-69"/> + + - - + - + + - + @@ -490,24 +490,24 @@ z - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.pdf new file mode 100644 index 000000000000..8b8bc68dfd5b Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.png new file mode 100644 index 000000000000..9d3870d24e09 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.svg new file mode 100644 index 000000000000..198a2d907d89 --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_77.svg @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.pdf index 2d1b7be4c3e4..050dc07d148b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.png index 017c8acf1b96..52356d3e3a71 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.svg index 72a647712feb..d6445df2020a 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_01.svg @@ -5,177 +5,127 @@ - - - - + + - - +M 63.703125 12 +L 4.796875 12 +L 4.796875 18.59375 +L 63.703125 18.59375 +z +" id="STIXGeneral-Regular-2250"/> - - - - - - + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.pdf index ab435eb22611..e8423c038ac4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.png index f4bea46f5e4e..439df747f103 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.svg index c31a824ff36f..fae0e281ba34 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_05.svg @@ -5,239 +5,234 @@ - - - - - + + - - - + - + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.pdf index e39f7c0bebd0..c6fdb0909d9f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.png index dd316e61b24e..3be6dfe96b5e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.svg index d700e174f46f..fa66d1652326 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_06.svg @@ -5,318 +5,314 @@ - - + + - - - - - + + + - + - +" id="STIXGeneral-Regular-2f"/> + - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.pdf index 065d7d9bcfa8..4ba2e950f2db 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.png index a2859dab4dab..16fa46602197 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.svg index d1f7916df11e..507e1fb079c1 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.svg @@ -20,88 +20,78 @@ z - - - +" id="STIXGeneral-Italic-3b3"/> + + + + + - + + +" id="STIXGeneral-Regular-2b"/> - - - - - - - - +" id="STIXGeneral-Regular-32"/> + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.pdf index a3c7f927496c..9b6ad78bc600 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.png index 64d290ec0bef..59ae38d25fc7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.svg index 14304497370b..21c06b4065ec 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.svg @@ -20,54 +20,108 @@ z - - +" id="BitstreamVeraSans-Roman-3a"/> + + + + + - + + + +" id="STIXGeneral-Regular-2f"/> + + - - - - - - + + - - +" id="STIXGeneral-Regular-31"/> - - - - + +" id="STIXGeneral-Regular-2b"/> - - - +" id="STIXGeneral-Italic-74"/> - + @@ -520,26 +520,26 @@ z - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf index 6843da64feae..5febe0c40208 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.png index c91de20640ab..afa2df23745a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.svg index bf227ebb2f5a..dd7b77312adc 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.svg @@ -20,29 +20,48 @@ z - +M 35.90625 27.203125 +Q 35.90625 42 28.203125 42 +Q 23 42 16.953125 32.796875 +Q 10.90625 23.59375 10.90625 12.5 +Q 10.90625 7.703125 12.59375 4.34375 +Q 14.296875 1 17.796875 1 +Q 25.09375 1 34.296875 20.09375 +Q 34.40625 20.703125 34.84375 22.046875 +Q 35.296875 23.40625 35.59375 24.703125 +Q 35.90625 26 35.90625 27.203125 +" id="STIXGeneral-Italic-3b1"/> + + + - - - - +" id="STIXGeneral-Regular-2212"/> - - - +M 35.5 22.09375 +Q 35.5 26.703125 33.84375 30.296875 +Q 32.203125 33.90625 29.703125 35.40625 +Q 23.90625 35.40625 17.5 27.65625 +Q 11.09375 19.90625 11.09375 10 +Q 11.09375 5.59375 13.1875 3.296875 +Q 15.296875 1 18.90625 1 +Q 25.59375 1 30.546875 8.203125 +Q 35.5 15.40625 35.5 22.09375 +" id="STIXGeneral-Italic-3c3"/> - - - - +" id="STIXGeneral-Italic-3c0"/> + + + - + - +" id="STIXGeneral-Regular-32"/> + + - + @@ -567,66 +567,66 @@ z - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.pdf index afce4eb61520..70ada597f416 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.png index 9274880f3379..232a5654b3b2 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.svg index 3da2029bd182..888e1e11f7b1 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.svg @@ -5,242 +5,228 @@ - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.pdf index 7ed74da06698..59736a5af0d9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.png index 82c6d0787671..2d368e039cd8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.svg index 27e1671de715..c1efc6937067 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_54.svg @@ -20,6 +20,93 @@ z + + + + - + + - - +" id="STIXGeneral-Regular-7c"/> + - - - - - - + - + @@ -321,24 +321,24 @@ z - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.pdf new file mode 100644 index 000000000000..3966ee6ddd59 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.png new file mode 100644 index 000000000000..9d3870d24e09 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.svg new file mode 100644 index 000000000000..198a2d907d89 --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_77.svg @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.pdf index 770bfbae1a01..39554ec57627 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.png index 0d2388975c34..bf3569afa28e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.svg index adb2f6c13219..6717332dd4b0 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_01.svg @@ -5,124 +5,79 @@ - - - - - + - +M 63.703125 12 +L 4.796875 12 +L 4.796875 18.59375 +L 63.703125 18.59375 +z +" id="STIXGeneral-Regular-2250"/> - - - - - - + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.pdf index 8c6188a27067..3d2fd052bb31 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.png index d430d6c1b305..cf1227dcc3a7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.svg index e45382f8447c..ecb6d984c16c 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_05.svg @@ -5,193 +5,186 @@ - - + - + - - - - - + + - + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.pdf index d174e18d71a4..52dc764762b8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.png index a2a9d31e03d0..c8b9ee31c72c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.svg index bf1d284e12ff..3bca8025d0af 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.svg @@ -5,267 +5,261 @@ - - - + - - + - - + - - +" id="STIXGeneral-Italic-1d63a"/> + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.pdf index 6dc863cccbc3..2178ebef20ea 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.png index ae2ed7c0ff93..0e865eed1847 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.svg index 577ce51a0ba9..a92a0e776575 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.svg @@ -20,57 +20,43 @@ z - - - + +M 39.09375 15.796875 +L 43.40625 32.90625 +Q 40.703125 39.203125 34.59375 39.203125 +Q 28.09375 39.203125 21.796875 32.640625 +Q 15.5 26.09375 15.5 16.796875 +Q 15.5 11.5 18.140625 8.796875 +Q 20.796875 6.09375 25.203125 6.09375 +Q 28.703125 6.09375 32.5 8.75 +Q 36.296875 11.40625 39.09375 15.796875 +" id="STIXGeneral-Italic-1d625"/> - - + + + - - - - - - - + + +" id="STIXGeneral-Regular-2b"/> + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.pdf index 5b8939b73b8b..cdee61e24df6 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.png index 74ac9f96a754..7694fa3f295f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.svg index a27ee4ae5ab5..885dfec41c82 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.svg @@ -20,40 +20,6 @@ z - - - - - + + - +" id="STIXGeneral-Italic-1d635"/> + - - - + + +" id="STIXNonUnicode-Italic-e1e7"/> - + +" id="BitstreamVeraSans-Roman-46"/> - - - +" id="STIXGeneral-Regular-1d7e4"/> + - - - + + - +" id="STIXGeneral-Italic-1d62a"/> + + + - + @@ -424,26 +424,26 @@ z - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.pdf index 36ef8eb88337..c0e869cc6b81 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.png index e95e37e5c987..5690ebf2e6c0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.svg index 6e0371c70ba5..9ac285a631da 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.svg @@ -20,6 +20,125 @@ z + + + + + + + + - + - + - - +" id="STIXGeneral-Italic-1d61e"/> + + - - - - - - - - - - + @@ -474,66 +474,66 @@ Q 13.09375 54.796875 11.296875 49.203125 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.pdf index b309393bf782..2c728dba796d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.png index 164b3e47acd0..9115cc1eb7a9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.svg index cadfe862a39a..33fac2c45ae6 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.svg @@ -5,204 +5,189 @@ - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.pdf index 06af4a47a097..12a24a24f817 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.png index 86270fd9ba44..150a321a7792 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.svg index ccc023b60b3a..a8126c6b965e 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_54.svg @@ -20,16 +20,38 @@ z - + + + + + + + - +" id="STIXGeneral-Regular-2b"/> - - - - - - - + - + @@ -257,24 +257,24 @@ Q 42.5 38.40625 38.203125 21.40625 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.pdf new file mode 100644 index 000000000000..98512f54330d Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.png new file mode 100644 index 000000000000..9d3870d24e09 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.svg new file mode 100644 index 000000000000..198a2d907d89 --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_77.svg @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py index 485890e542c1..5b03d47bc53a 100644 --- a/lib/matplotlib/tests/test_mathtext.py +++ b/lib/matplotlib/tests/test_mathtext.py @@ -12,7 +12,7 @@ from matplotlib import mathtext math_tests = [ - r'$a+b+\dots+\dot{s}+\ldots$', + r'$a+b+\dot s+\dot{s}+\ldots$', r'$x \doteq y$', r'\$100.00 $\alpha \_$', r'$\frac{\$100.00}{y}$', @@ -102,7 +102,7 @@ r'${xyz}^k{x}_{k}{x}^{p}{y}^{p-2} {d}_{i}^{j}{b}_{j}{c}_{k}{d} {x}^{j}_{i}{E}^{0}{E}^0_u$', r'${\int}_x^x x\oint_x^x x\int_{X}^{X}x\int_x x \int^x x \int_{x} x\int^{x}{\int}_{x} x{\int}^{x}_{x}x$', r'testing$^{123}$', - + ' '.join('$\\' + p + '$' for p in sorted(mathtext.Parser._snowflake)) ] digits = "0123456789"