matplotlib · jenshnielsen · Jan 13, 2016 · Jan 10, 2016 · Jan 11, 2016 · Jan 11, 2016
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -19,3 +19,4 @@ recursive-include lib *
 recursive-include extern *
 include versioneer.py
 include lib/matplotlib/_version.py
+include tests.py
diff --git a/doc/_templates/citing.html b/doc/_templates/citing.html
@@ -28,6 +28,7 @@ <h1>Citing matplotlib</h1>
 
 <h2>DOIs</h2>
 <dl>
+  <dt>v1.5.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.44579"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.44579.svg" alt="10.5281/zenodo.44579"></a></dd>
   <dt>v1.5.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.32914"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.32914.svg" alt="10.5281/zenodo.32914"></a></dd>
   <dt>v1.4.3</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.15423"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.15423.svg" alt="10.5281/zenodo.15423"></a></dd>
   <dt>v1.4.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12400"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12400.png" alt="10.5281/zenodo.12400"></a></dd>

diff --git a/doc/devel/MEP/MEP13.rst b/doc/devel/MEP/MEP13.rst
@@ -1,5 +1,5 @@
 =================================
-MEP12: Use properties for Artists
+MEP13: Use properties for Artists
 =================================
 
 .. contents::

diff --git a/doc/devel/MEP/MEP14.rst b/doc/devel/MEP/MEP14.rst
@@ -1,5 +1,5 @@
 ====================
-MEP13: Text handling
+MEP14: Text handling
 ====================
 
 .. contents::

diff --git a/examples/pylab_examples/legend_demo5.py b/examples/pylab_examples/legend_demo5.py
@@ -41,7 +41,7 @@ def create_artists(self, legend, orig_handle,
                 lw = orig_handle.get_linewidths()[i]
             except IndexError:
                 lw = orig_handle.get_linewidths()[0]
-            if dashes[0] != None:
+            if dashes[0] is not None:
                 legline.set_dashes(dashes[1])
             legline.set_color(color)
             legline.set_transform(trans)

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/baseline_images/test_image/rasterize_10dpi.svg b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
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