diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
index 126fef3e27a4..78af0b45b779 100644
--- a/lib/matplotlib/mathtext.py
+++ b/lib/matplotlib/mathtext.py
@@ -2658,11 +2658,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
index cedb7c898fd1..8e44f24eba2f 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.pdf differ
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
index a54eedcc5eb9..09147448dcb8 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.png differ
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
index 3f5fcb8a823b..61ee84791179 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_80.svg
@@ -18,23 +18,8 @@ z
" style="fill:#ffffff;"/>
-
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
index c456bf519d60..e63cf1cf468b 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.pdf differ
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
index 77f201ad7e79..e172fd1b879c 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.png differ
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
index ed538515d234..416380a2707f 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_80.svg
@@ -18,8 +18,23 @@ z
" style="fill:#ffffff;"/>
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
index dda13decf161..1836c097a257 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.pdf differ
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
index ae52bed06cb5..d2b3cecb441a 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.svg
index f02f17f8eede..4ee11299dd0e 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_80.svg
@@ -18,8 +18,28 @@ z
" style="fill:#ffffff;"/>
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.pdf
index 22f414b598f2..af60e108b0f1 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.png
index 1b8a075f997c..c0a9a2577e7e 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.svg
index 5f6c111c106d..ec5f382a1cbf 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_80.svg
@@ -18,8 +18,33 @@ z
" style="fill:#ffffff;"/>
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.pdf
index eb6a537b9262..e6484938b079 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.pdf differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.png
index 1e0daf1e9293..02a1ed4873cc 100644
Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.png differ
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.svg
index baf25a7400bf..906d64164637 100644
--- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.svg
+++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_80.svg
@@ -18,18 +18,8 @@ z
" style="fill:#ffffff;"/>
-
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
index eeac74ad3878..69eed8bbfb5e 100644
--- a/lib/matplotlib/tests/test_mathtext.py
+++ b/lib/matplotlib/tests/test_mathtext.py
@@ -105,7 +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
+ r'$,$ $.$ $1{,}234{, }567{ , }890$ and $1,234,567,890$', # github issue 5799
]
digits = "0123456789"