Merge pull request #5882 from zblz/edge-comma-dots

mathtext: Fix comma behaviour at start of string
matplotlib · Oct 16, 2016 · b04c5b9 · b04c5b9
1 parent f9cb9cf
commit b04c5b9
Show file tree

Hide file tree

Showing 17 changed files with 296 additions and 228 deletions.
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2656,11 +2656,12 @@ def symbol(self, s, loc, toks):
 
             # Do not space commas between brackets
             if c == ',':
+                prev_char, next_char = '', ''
                 for i in six.moves.xrange(1, loc + 1):
                     prev_char = s[loc - i]
                     if prev_char != ' ':
                         break
-                for i in six.moves.xrange(1, loc + 1):
+                for i in six.moves.xrange(1, len(s) - loc):
                     next_char = s[loc + i]
                     if next_char != ' ':
                         break

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.png