V2.x merge to master

MANIFEST.in

@@ -19,3 +19,4 @@ recursive-include lib *
 recursive-include extern *
 include versioneer.py
 include lib/matplotlib/_version.py
+include tests.py

doc/_templates/citing.html

@@ -28,6 +28,7 @@
 
 <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>

doc/devel/MEP/MEP13.rst

@@ -1,5 +1,5 @@
 =================================
-MEP12: Use properties for Artists
+MEP13: Use properties for Artists
 =================================
 
 .. contents::

doc/devel/MEP/MEP14.rst

@@ -1,5 +1,5 @@
 ====================
-MEP13: Text handling
+MEP14: Text handling
 ====================
 
 .. contents::

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)

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)
 

lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg

@@ -5,7 +5,7 @@
 <svg height="72pt" version="1.1" viewBox="0 0 216 72" width="216pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
  <defs>
   <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
+*{stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:100000;}
   </style>
  </defs>
  <g id="figure_1">
@@ -26,8 +26,8 @@ L 27 11.382353
 z
 " style="fill:#ffffff;"/>
    </g>
-   <g clip-path="url(#p916d872123)">
-    <image height="50.4" id="image9cbe88aedc" width="57.6" x="27.0" xlink:href="data:image/png;base64,
+   <g clip-path="url(#p306f09a014)">
+    <image height="50.4" id="image207c5863ce" width="57.6" x="27.0" xlink:href="data:image/png;base64,
 iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAABHNCSVQICAgIfAhkiAAAAIVJREFUCJmFzjkKwlAAhOEvKi5FMLU2HkEQwdbSU3knL+EBLMUFQayCUaMYF55FQEsH/mYYZiZiGkA3Ydj70UlAxR/Vhv09eLfPivipuOUe69QrjcvAZLwE99CShYPsnMgWiSI0QTSfdQNcjjWHTeNLnlXLhtGgnDju2KbEV+orTqX9/+QHCXAwPEkx7O0AAAAASUVORK5CYII=" y="10.2176470588"/>
    </g>
    <g id="matplotlib.axis_1"/>
@@ -42,8 +42,8 @@ L 86.082353 7.2
 z
 " style="fill:#ffffff;"/>
    </g>
-   <image height="64.8" id="imageb8ad4fce02" width="136.8" x="79.2" xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABMAAAAJCAYAAADQHRcxAAAABHNCSVQICAgIfAhkiAAAAHNJREFUKJG10kENwlAQBuH5OVQBImoBAzVQA1hABxoQUAUYqIWaqIRepqdHmoaE9AGbzGU3+U4blV/N6d0yoUnoE56HNPUV2IJ3cAYF3d4/VZArOBZgWw22RxZwALtvsAm8gecjyB57gBcwNUgpf3+N2lkBB3gBDVzLDTYAAAAASUVORK5CYII=" y="7.2"/>
+   <image height="43.2" id="image2e9ed63e7b" width="50.4" x="86.39999999999999" xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAABHNCSVQICAgIfAhkiAAAAFVJREFUCJllzjEVwlAAxdDbBQUVgQUMYAADWKgONCAABRjAQk0ggSUdGPoPDFnyhjyVETrQhZ6jPNKN3tQXXem1i5F/+aEHncdxpYXmPaU7nWj6PbcBc+lWnSEOzhQAAAAASUVORK5CYII=" y="14.4"/>
    <g id="matplotlib.axis_3"/>
    <g id="matplotlib.axis_4"/>
   </g>
@@ -57,20 +57,20 @@ z
 " style="fill:#ffffff;"/>
    </g>
    <g id="line2d_1">
-    <path clip-path="url(#p9100a35497)" d="M 145.164706 45.6 
+    <path clip-path="url(#pef029be595)" d="M 145.164706 45.6 
 L 194.4 26.4 
-" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.000000;"/>
+" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.0;"/>
    </g>
    <g id="matplotlib.axis_5"/>
    <g id="matplotlib.axis_6"/>
   </g>
  </g>
  <defs>
-  <clipPath id="p916d872123">
-   <rect height="49.2352941176" width="49.2352941176" x="27.0" y="11.3823529412"/>
-  </clipPath>
-  <clipPath id="p9100a35497">
+  <clipPath id="pef029be595">
    <rect height="57.6" width="49.2352941176" x="145.164705882" y="7.2"/>
   </clipPath>
+  <clipPath id="p306f09a014">
+   <rect height="49.2352941176" width="49.2352941176" x="27.0" y="11.3823529412"/>
+  </clipPath>
  </defs>
 </svg>