diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py index 1c5f98d0eaa3..07cd3bef87cc 100644 --- a/lib/matplotlib/mathtext.py +++ b/lib/matplotlib/mathtext.py @@ -2083,7 +2083,7 @@ class Parser(object): corners. """ _binary_operators = set(''' - + * + + * - \\pm \\sqcap \\rhd \\mp \\sqcup \\unlhd \\times \\vee \\unrhd @@ -2499,10 +2499,21 @@ def symbol(self, s, loc, toks): raise ParseFatalException(s, loc, "Unknown symbol: %s" % c) if c in self._spaced_symbols: - return [Hlist( [self._make_space(0.2), - char, - self._make_space(0.2)] , - do_kern = True)] + # iterate until we find previous character, needed for cases + # such as ${ -2}$, $ -2$, or $ -2$. + for i in six.moves.xrange(1, loc + 1): + prev_char = s[loc-i] + if prev_char != ' ': + break + # Binary operators at start of string should not be spaced + if (c in self._binary_operators and + (len(s[:loc].split()) == 0 or prev_char == '{')): + return [char] + else: + return [Hlist( [self._make_space(0.2), + char, + self._make_space(0.2)] , + do_kern = True)] elif c in self._punctuation_symbols: return [Hlist( [char, self._make_space(0.2)] , 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 e5c5824517b2..4de2c2cff9cc 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 2ed2edab31da..615ea93c616a 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 277a27212e9f..cd4e3cdefe71 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 @@ -30,46 +30,16 @@ L 57.328125 -289.40625 L 57.328125 -295.90625 z " id="Cmex10-22"/> - +" id="Cmex10-23"/> - - - - +" id="Cmr10-32"/> + - - - - +" id="Cmr10-3d"/> + - - - + - - + + + + + + + - + @@ -784,25 +784,25 @@ Q 16.15625 1.515625 20.3125 1.515625 - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.pdf index 9668162e0ef8..4d887745bbd0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.png index 847e3f692a77..b7971b05210b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.svg index 1dd48a262b5d..e482467a30f6 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.svg @@ -20,6 +20,27 @@ z + - - + + - - + @@ -303,30 +303,30 @@ z - - - - - - - - - - - - - + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.pdf index a314fe8628e4..a68c42e9e815 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.png index ef4d33d85197..f0499bef4aa9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.svg index 38dadcdddc47..c5a5500cedcc 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_73.svg @@ -20,51 +20,121 @@ z - + + - + + - - - - + + - - +M 24.90625 1.515625 +Q 28.375 1.515625 31.34375 4.375 +Q 34.328125 7.234375 36.1875 10.796875 +Q 37.546875 13.484375 38.734375 17.359375 +Q 39.9375 21.234375 40.8125 25.625 +Q 41.703125 30.03125 41.703125 32.625 +Q 41.703125 34.90625 41.09375 36.90625 +Q 40.484375 38.921875 39.09375 40.265625 +Q 37.703125 41.609375 35.40625 41.609375 +Q 31.734375 41.609375 28.484375 38.984375 +Q 25.25 36.375 22.609375 32.515625 +L 22.609375 32.171875 +L 17.09375 10.109375 +Q 17.78125 6.546875 19.734375 4.03125 +Q 21.6875 1.515625 24.90625 1.515625 +" id="Cmmi10-70"/> + - + @@ -702,24 +702,24 @@ Q 11.71875 17.671875 11.71875 11.921875 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.pdf index 094543f87b76..86ab2cb347ff 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.png index ef4d33d85197..f0499bef4aa9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.svg index 232938da45c1..762e744cf96f 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_74.svg @@ -20,51 +20,121 @@ z - + + - + + - - - - + + - - +M 24.90625 1.515625 +Q 28.375 1.515625 31.34375 4.375 +Q 34.328125 7.234375 36.1875 10.796875 +Q 37.546875 13.484375 38.734375 17.359375 +Q 39.9375 21.234375 40.8125 25.625 +Q 41.703125 30.03125 41.703125 32.625 +Q 41.703125 34.90625 41.09375 36.90625 +Q 40.484375 38.921875 39.09375 40.265625 +Q 37.703125 41.609375 35.40625 41.609375 +Q 31.734375 41.609375 28.484375 38.984375 +Q 25.25 36.375 22.609375 32.515625 +L 22.609375 32.171875 +L 17.09375 10.109375 +Q 17.78125 6.546875 19.734375 4.03125 +Q 21.6875 1.515625 24.90625 1.515625 +" id="Cmmi10-70"/> + - + @@ -702,24 +702,24 @@ Q 11.71875 17.671875 11.71875 11.921875 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_78.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_78.pdf new file mode 100644 index 000000000000..b1e38648be64 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_78.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_78.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_78.png new file mode 100644 index 000000000000..e352272c8e36 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_78.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_78.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_78.svg new file mode 100644 index 000000000000..ca5a41e72cbd --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_78.svg @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 5febe0c40208..12ffcf34d616 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 afa2df23745a..5e7fe5a8a616 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 dd7b77312adc..a83ddba73eb9 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,91 +20,80 @@ z - - - +" id="STIXGeneral-Italic-3c0"/> + - - - - - - - - - + + +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"/> - - - + + + + + + + + + + - + @@ -596,25 +596,25 @@ z - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.pdf index b9195e0139c3..3db309ae1a3b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.png index 4275aba3ed51..ca4fe553f972 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.svg index 11211947ab3d..e5cfb7845c67 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.svg @@ -20,29 +20,6 @@ z - - - + + + - + @@ -213,30 +213,30 @@ Q 23.296875 40.5 24.296875 35.5 - - - - - - - - - - - - - + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.pdf index 8e758db4a5d3..d85fd8510162 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.png index d8f5e0f45805..6b6cc3b21c01 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.svg index 5b91d9567352..4225f9df01f1 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_73.svg @@ -20,86 +20,73 @@ z - - - + + + + - + + + + + - - - - - - + @@ -483,24 +483,24 @@ z - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.pdf index 8e758db4a5d3..2886c6866895 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.png index d8f5e0f45805..6b6cc3b21c01 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.svg index 28eacdb4d1a3..7f2c803ab051 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_74.svg @@ -20,86 +20,73 @@ z - - - + + + + - + + + + + - - - - - - + @@ -483,24 +483,24 @@ z - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_78.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_78.pdf new file mode 100644 index 000000000000..cd2be60b4367 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_78.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_78.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_78.png new file mode 100644 index 000000000000..c41190cd15f0 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_78.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_78.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_78.svg new file mode 100644 index 000000000000..4f52c1c1367f --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_78.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 c0e869cc6b81..c24e2b91f9ea 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 5690ebf2e6c0..0a0b71f801e7 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 9ac285a631da..43c5b0e76e22 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,33 +20,34 @@ z - +" id="STIXNonUnicode-Italic-e1e7"/> - - + +" id="STIXGeneral-Regular-1d7e3"/> + - - - +M 37.59375 26.796875 +Q 37.59375 32.703125 34.9375 35.953125 +Q 32.296875 39.203125 28.296875 39.203125 +Q 23.09375 39.203125 17.890625 32.953125 +Q 12.703125 26.703125 12.703125 16.59375 +Q 12.703125 11.703125 14.890625 8.890625 +Q 17.09375 6.09375 20.59375 6.09375 +Q 24.796875 6.09375 29.34375 10.1875 +Q 33.90625 14.296875 37.203125 22.40625 +Q 37.59375 24.5 37.59375 26.796875 +" id="STIXNonUnicode-Italic-e1d8"/> - - - - +" id="STIXGeneral-Regular-2b"/> + - - - - - + + + + + + + + - + @@ -503,25 +503,25 @@ Q 36.296875 11.40625 39.09375 15.796875 - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.pdf index a8ba767e131c..618e7f2442f2 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.png index 97ec8d30107a..3d4c6ec179a0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.svg index e939dabde785..c27427990b89 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.svg @@ -20,16 +20,30 @@ z - + + + - - - + - + @@ -147,30 +147,30 @@ z - - - - - - - - - - - - - + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.pdf index 14e5a8caeec7..1f3908313c9c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.png index c6248922ba2f..0e1c01d5393f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.svg index 1a454472f70a..88fb48b5e3c7 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_73.svg @@ -20,6 +20,43 @@ z + + - - - + + +" id="STIXGeneral-Italic-1d63b"/> + + + + - +" id="STIXGeneral-Regular-2212"/> - - - - - - - + @@ -301,24 +301,24 @@ z - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.pdf index 14e5a8caeec7..87e2028af9c8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.png index c6248922ba2f..0e1c01d5393f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.svg index aaadccff0ed7..0b957fe21eb5 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_74.svg @@ -20,6 +20,43 @@ z + + - - - + + +" id="STIXGeneral-Italic-1d63b"/> + + + + - +" id="STIXGeneral-Regular-2212"/> - - - - - - - + @@ -301,24 +301,24 @@ z - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_78.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_78.pdf new file mode 100644 index 000000000000..686dab4dafd9 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_78.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_78.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_78.png new file mode 100644 index 000000000000..5c592903b818 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_78.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_78.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_78.svg new file mode 100644 index 000000000000..28d017865b34 --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_78.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py index 5b03d47bc53a..d3f04a69983a 100644 --- a/lib/matplotlib/tests/test_mathtext.py +++ b/lib/matplotlib/tests/test_mathtext.py @@ -102,7 +102,8 @@ 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)) + ' '.join('$\\' + p + '$' for p in sorted(mathtext.Parser._snowflake)), + r'$6-2$; $-2$; $ -2$; ${-2}$; ${ -2}$; $20^{+3}_{-2}$', ] digits = "0123456789"