Merge branch 'v1.1.x' into merge-v1.1.x

Author: jdh2358

INSTALL

@@ -47,7 +47,7 @@ progress::
 
 matplotlib requires numpy version 1.1 or later.  Although it is not a
 requirement to use matplotlib, we strongly encourage you to install
-`ipython <http://ipython.scipy.org/dist>`_, which is an interactive
+`ipython <http://ipython.org>`_, which is an interactive
 shell for python that is matplotlib-aware.
 
 Next, we need to get matplotlib installed.  We provide prebuilt

doc/_templates/index.html

@@ -9,7 +9,7 @@ <h1>intro</h1>
   publication quality figures in a variety of hardcopy formats and
   interactive environments across platforms.  matplotlib can be used
   in python scripts, the python and <a
-  href="http://ipython.scipy.org">ipython</a> shell (ala
+  href="http://ipython.org">ipython</a> shell (ala
   MATLAB<sup>&reg;<a name="matlab" href="#ftn.matlab">*</a></sup>
   or
   Mathematica<sup>&reg;<a name="mathematica"

doc/_templates/indexsidebar.html

@@ -41,9 +41,9 @@ <h3>Videos</h3>
 <h3>Toolkits</h3>
 
 <p>There are several matplotlib add-on <a href="{{
-pathto('users/toolkits') }}">toolkits</a>, including the projection
+pathto('mpl_toolkits/index') }}">toolkits</a>, including the projection
 and mapping toolkit
-<a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>, 3d plotting with <a href="{{
+<a href="http://matplotlib.github.com/basemap">basemap</a>, 3d plotting with <a href="{{
 pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>, axes and axis helpers in <a href="{{
 pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
  </p>

doc/devel/gitwash/known_projects.inc

@@ -21,7 +21,7 @@
 .. _`nipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
 
 .. ipython
-.. _ipython: http://ipython.scipy.org
+.. _ipython: http://ipython.org
 .. _`ipython github`: http://github.com/ipython/ipython
 .. _`ipython mailing list`: http://mail.scipy.org/mailman/listinfo/IPython-dev
 

doc/mpl_toolkits/index.rst

@@ -19,7 +19,7 @@ Basemap
 =======
 
 Plots data on map projections, with continental and political
-boundaries, see `basemap <http://matplotlib.sf.net/basemap/doc/html>`_
+boundaries, see `basemap <http://matplotlib.github.com/basemap>`_
 docs.
 
 .. _toolkit_gtk:

doc/users/artists.rst

@@ -64,7 +64,7 @@ In this example, ``ax`` is the ``Axes`` instance created by the
 subclass of ``Axes``) and when you call ``ax.plot``, it creates a
 ``Line2D`` instance and adds it to the :attr:`Axes.lines
 <matplotlib.axes.Axes.lines>` list.  In the interactive `ipython
-<http://ipython.scipy.org/>`_ session below, you can see that the
+<http://ipython.org/>`_ session below, you can see that the
 ``Axes.lines`` list is length one and contains the same line that was
 returned by the ``line, = ax.plot...`` call:
 

doc/users/credits.rst

@@ -94,7 +94,7 @@ Fernando Perez
   has provided numerous bug reports and patches for cleaning up
   backend imports and expanding pylab functionality, and provided
   matplotlib support in the pylab mode for `ipython
-  <http://ipython.scipy.org>`_.  He also provided the
+  <http://ipython.org>`_.  He also provided the
   :func:`~matplotlib.pyplot.matshow` command, and wrote TConfig, which
   is the basis for the experimental traited mpl configuration.
 
@@ -149,7 +149,7 @@ Nicolas Young
   sampled images.
 
 The `brainvisa <http://brainvisa.info>`_ Orsay team and Fernando Perez
-  added Qt support to `ipython <http://ipython.scipy.org>`_ in pylab mode.
+  added Qt support to `ipython <http://ipython.org>`_ in pylab mode.
 
 
 Charlie Moad

doc/users/shell.rst

@@ -23,7 +23,7 @@ python shell.
 Ipython to the rescue
 =====================
 
-Fortunately, `ipython <http://ipython.scipy.org/dist>`_, an enhanced
+Fortunately, `ipython <http://ipython.org/>`_, an enhanced
 interactive python shell, has figured out all of these tricks, and is
 matplotlib aware, so when you start ipython in the *pylab* mode.
 

lib/matplotlib/backends/backend_svg.py

@@ -331,7 +331,7 @@ def _get_hatch(self, gc, rgbFace):
         else:
             _, oid = oid
         return oid
-        
+
     def _write_hatches(self):
         if not len(self._hatchd):
             return
@@ -445,7 +445,7 @@ def _write_clips(self):
                 writer.element('rect', x=str(x), y=str(y), width=str(w), height=str(h))
             writer.end('clipPath')
         writer.end('defs')
-    
+
     def _write_svgfonts(self):
         if not rcParams['svg.fonttype'] == 'svgfont':
             return
@@ -926,7 +926,8 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath):
             fontstyle = prop.get_style()
 
             attrib = {}
-            style['font-size'] = str(fontsize)
+            # Must add "px" to workaround a Firefox bug
+            style['font-size'] = str(fontsize) + 'px'
             style['font-family'] = str(fontfamily)
             style['font-style'] = prop.get_style().lower()
             attrib['style'] = generate_css(style)
@@ -967,7 +968,8 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath):
             spans = {}
             for font, fontsize, thetext, new_x, new_y, metrics in svg_glyphs:
                 style = generate_css({
-                    'font-size': str(fontsize),
+                    # Must add "px" to work around a Firefox bug
+                    'font-size': str(fontsize) + 'px',
                     'font-family': font.family_name,
                     'font-style': font.style_name.lower()})
                 if thetext == 32:

lib/matplotlib/figure.py

@@ -827,13 +827,13 @@ def draw(self, renderer):
         dsu = []
 
         for a in self.patches:
-            dsu.append( (a.get_zorder(), a.draw, [renderer]))
+            dsu.append( (a.get_zorder(), a, a.draw, [renderer]))
 
         for a in self.lines:
-            dsu.append( (a.get_zorder(), a.draw, [renderer]))
+            dsu.append( (a.get_zorder(), a, a.draw, [renderer]))
 
         for a in self.artists:
-            dsu.append( (a.get_zorder(), a.draw, [renderer]))
+            dsu.append( (a.get_zorder(), a, a.draw, [renderer]))
 
         # override the renderer default if self.suppressComposite
         # is not None
@@ -844,7 +844,7 @@ def draw(self, renderer):
         if len(self.images)<=1 or not_composite or \
                 not allequal([im.origin for im in self.images]):
             for a in self.images:
-                dsu.append( (a.get_zorder(), a.draw, [renderer]))
+                dsu.append( (a.get_zorder(), a, a.draw, [renderer]))
         else:
             # make a composite image blending alpha
             # list of (_image.Image, ox, oy)
@@ -866,21 +866,22 @@ def draw_composite():
                 renderer.draw_image(gc, l, b, im)
                 gc.restore()
 
-            dsu.append((self.images[0].get_zorder(), draw_composite, []))
+            dsu.append((self.images[0].get_zorder(), self.images[0], draw_composite, []))
 
         # render the axes
         for a in self.axes:
-            dsu.append( (a.get_zorder(), a.draw, [renderer]))
+            dsu.append( (a.get_zorder(), a, a.draw, [renderer]))
 
         # render the figure text
         for a in self.texts:
-            dsu.append( (a.get_zorder(), a.draw, [renderer]))
+            dsu.append( (a.get_zorder(), a, a.draw, [renderer]))
 
         for a in self.legends:
-            dsu.append( (a.get_zorder(), a.draw, [renderer]))
+            dsu.append( (a.get_zorder(), a, a.draw, [renderer]))
 
+        dsu = [row for row in dsu if not row[1].get_animated()]
         dsu.sort(key=itemgetter(0))
-        for zorder, func, args in dsu:
+        for zorder, a, func, args in dsu:
             func(*args)
 
         renderer.close_group('figure')

lib/matplotlib/tri/triangulation.py

@@ -171,7 +171,7 @@ def get_from_args_and_kwargs(*args, **kwargs):
     @property
     def neighbors(self):
         if self._neighbors is None:
-            self._neighbors = self._get_cpp_triangulation().get_neighbors()
+            self._neighbors = self.get_cpp_triangulation().get_neighbors()
         return self._neighbors
 
     def set_mask(self, mask):

src/_tkagg.cpp

@@ -34,6 +34,12 @@ extern "C"
 #endif
 }
 
+#if defined(_MSC_VER)
+#  define SIZE_T_FORMAT "%Iu"
+#else
+#  define SIZE_T_FORMAT "%zu"
+#endif
+
 
 
 typedef struct
@@ -53,7 +59,7 @@ PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
     // vars for blitting
     PyObject* bboxo;
 
-    unsigned long aggl, bboxl;
+    size_t aggl, bboxl;
     bool has_bbox;
     agg::int8u *destbuffer;
     double l, b, r, t;
@@ -83,7 +89,7 @@ PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
         return TCL_ERROR;
     }
     /* get array (or object that can be converted to array) pointer */
-    if (sscanf(argv[2], "%lu", &aggl) != 1)
+    if (sscanf(argv[2], SIZE_T_FORMAT, &aggl) != 1)
     {
         Tcl_AppendResult(interp, "error casting pointer", (char *) NULL);
         return TCL_ERROR;
@@ -109,7 +115,7 @@ PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
     }
 
     /* check for bbox/blitting */
-    if (sscanf(argv[4], "%lu", &bboxl) != 1)
+    if (sscanf(argv[4], SIZE_T_FORMAT, &bboxl) != 1)
     {
         Tcl_AppendResult(interp, "error casting pointer", (char *) NULL);
         return TCL_ERROR;

ttconv/pprdrv_tt2.cpp

@@ -33,8 +33,8 @@
 */
 
 #include "global_defines.h"
-#include <cmath>
 #include <cstdlib>
+#include <cmath>
 #include <cstring>
 #include <memory>
 #include "pprdrv.h"