no space after comma in brackets

zblz · zblz · commit 1f156be5ec70 · 2016-01-08T18:31:33.000+01:00
Fixes #5799 Following TeX behaviour: http://www.tex.ac.uk/FAQ-dec_comma.html
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2646,6 +2646,20 @@ def symbol(self, s, loc, toks):
                                self._make_space(0.2)] ,
                                do_kern = True)]
         elif c in self._punctuation_symbols:
+
+            # Do not space commas between brackets
+            if c == ',':
+                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):
+                    next_char = s[loc + i]
+                    if next_char != ' ':
+                        break
+                if (prev_char == '{' and next_char == '}'):
+                    return [char]
+
             # Do not space dots as decimal separators
             if (c == '.' and s[loc - 1].isdigit() and s[loc + 1].isdigit()):
                 return [char]
@@ -2819,6 +2833,9 @@ def is_slanted(self, nucleus):
             return nucleus.is_slanted()
         return False
 
+    def is_between_brackets(self, s, loc):
+        return False
+
     def subsuper(self, s, loc, toks):
         assert(len(toks)==1)
 
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -105,6 +105,7 @@
     ' '.join('$\\' + p + '$' for p in sorted(mathtext.Parser._snowflake)),
     r'$6-2$; $-2$; $ -2$; ${-2}$; ${  -2}$; $20^{+3}_{-2}$',
     r'$\overline{\omega}^x \frac{1}{2}_0^x$', # github issue #5444
+    r'$1{,}234{, }567{ , }890$ and $1,234,567,890$', # github issue 5799
 ]
 
 digits = "0123456789"

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@`
`105`	`105`	`' '.join('$\\' + p + '$' for p in sorted(mathtext.Parser._snowflake)),`
`106`	`106`	`r'$6-2$; $-2$; $ -2$; ${-2}$; ${ -2}$; $20^{+3}_{-2}$',`
`107`	`107`	`r'$\overline{\omega}^x \frac{1}{2}_0^x$', # github issue #5444`
	`108`	`+ r'$1{,}234{, }567{ , }890$ and $1,234,567,890$', # github issue 5799`
`108`	`109`	`]`
`109`	`110`
`110`	`111`	`digits = "0123456789"`