Merge remote-tracking branch 'origin/v1.1.x'

mdboom · mdboom · commit 1c3383078f23 · 2012-04-27T13:28:33.000-04:00
diff --git a/doc/users/usetex.rst b/doc/users/usetex.rst
@@ -47,7 +47,7 @@ matplotlibrc use::
   from matplotlib import rc
   rc('font',**{'family':'sans-serif','sans-serif':['Helvetica']})
   ## for Palatino and other serif fonts use:
-  #rc('font',**{'family':'serif','serif':['Palatino']))
+  #rc('font',**{'family':'serif','serif':['Palatino']})
   rc('text', usetex=True)
 
 Here is the standard example, `tex_demo.py`:
diff --git a/examples/pylab_examples/marker_path.py b/examples/pylab_examples/marker_path.py
@@ -0,0 +1,16 @@
+import matplotlib.pyplot as plt
+import matplotlib.path as mpath
+import numpy as np
+
+
+star = mpath.Path.unit_regular_star(6)
+circle = mpath.Path.unit_circle()
+# concatenate the star with an internal cutout of the circle
+verts = np.concatenate([star.vertices, circle.vertices[::-1, ...]])
+codes = np.concatenate([star.codes, circle.codes])
+cut_star = mpath.Path(verts, codes)
+
+
+plt.plot(np.arange(10)**2, '--r', marker=cut_star, markersize=15)
+
+plt.show()
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -71,7 +71,7 @@ class RendererAgg(RendererBase):
     # draw at at time and so the font cache is used by only one
     # renderer at a time
 
-    lock = threading.Lock()
+    lock = threading.RLock()
     _fontd = maxdict(50)
     def __init__(self, width, height, dpi):
         if __debug__: verbose.report('RendererAgg.__init__', 'debug-annoying')
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -33,7 +33,7 @@ def __init__(self, nrows, ncols,
                  height_ratios=None, width_ratios=None):
         """
         The number of rows and number of columns of the grid need to
-        be set. Optionally, the ratio of heights and widths of ros and
+        be set. Optionally, the ratio of heights and widths of rows and
         columns can be specified.
         """
         #self.figure = figure
@@ -360,7 +360,7 @@ def __init__(self, nrows, ncols,
         """
         The number of rows and number of columns of the grid need to
         be set. An instance of SubplotSpec is also needed to be set
-        from which the layout parameters will be inheirted. The wspace
+        from which the layout parameters will be inherited. The wspace
         and hspace of the layout can be optionally specified or the
         default values (from the figure or rcParams) will be used.
         """
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -540,7 +540,7 @@ def get_legend_handler(legend_handler_map, orig_handle):
 
         It first checks if the *orig_handle* itself is a key in the
         *legend_hanler_map* and return the associated value.
-        Otherwised, it checks for each of the classes in its
+        Otherwise, it checks for each of the classes in its
         method-resolution-order. If no matching key is found, it
         returns None.
         """
@@ -561,7 +561,7 @@ def get_legend_handler(legend_handler_map, orig_handle):
 
     def _init_legend_box(self, handles, labels):
         """
-        Initiallize the legend_box. The legend_box is an instance of
+        Initialize the legend_box. The legend_box is an instance of
         the OffsetBox, which is packed with legend handles and
         texts. Once packed, their location is calculated during the
         drawing time.
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -24,8 +24,9 @@ class MarkerStyle:
 marker                         description
 ============================== ===============================================
 %s
-``'$...$'``                    render the string using mathtext
-*verts*                        a list of (x, y) pairs in range (0, 1)
+``'$...$'``                    render the string using mathtext.
+*verts*                        a list of (x, y) pairs used for Path vertices.
+path                           a :class:`~matplotlib.path.Path` instance.
 (*numsides*, *style*, *angle*) see below
 ============================== ===============================================
 
@@ -151,6 +152,8 @@ def set_marker(self, marker):
         if (iterable(marker) and len(marker) in (2, 3) and
             marker[1] in (0, 1, 2, 3)):
             self._marker_function = self._set_tuple_marker
+        elif isinstance(marker, np.ndarray):
+            self._marker_function = self._set_vertices
         elif marker in self.markers:
             self._marker_function = getattr(
                 self, '_set_' + self.markers[marker])
@@ -160,10 +163,10 @@ def set_marker(self, marker):
             self._marker_function = self._set_path_marker
         else:
             try:
-                path = Path(marker)
+                _ = Path(marker)
                 self._marker_function = self._set_vertices
-            except:
-                raise ValueError('Unrecognized marker style %s' % marker)
+            except ValueError:
+                raise ValueError('Unrecognized marker style {}'.format(marker))
 
         self._marker = marker
         self._recache()
@@ -196,8 +199,9 @@ def _set_path_marker(self):
         self._set_custom_marker(self._marker)
 
     def _set_vertices(self):
-        path = Path(verts)
-        self._set_custom_marker(path)
+        verts = self._marker
+        marker = Path(verts)
+        self._set_custom_marker(marker)
 
     def _set_tuple_marker(self):
         marker = self._marker
@@ -231,7 +235,6 @@ def _set_mathtext_path(self):
 
         Submitted by tcb
         """
-        from matplotlib.patches import PathPatch
         from matplotlib.text import TextPath
         from matplotlib.font_manager import FontProperties
 
@@ -443,10 +446,10 @@ def _set_star(self):
         else:
             verts = polypath.vertices
 
-            top = Path(np.vstack((verts[0:4,:], verts[7:10,:], verts[0])))
-            bottom = Path(np.vstack((verts[3:8,:], verts[3])))
-            left = Path(np.vstack((verts[0:6,:], verts[0])))
-            right = Path(np.vstack((verts[0], verts[5:10,:], verts[0])))
+            top = Path(np.vstack((verts[0:4, :], verts[7:10, :], verts[0])))
+            bottom = Path(np.vstack((verts[3:8, :], verts[3])))
+            left = Path(np.vstack((verts[0:6, :], verts[0])))
+            right = Path(np.vstack((verts[0], verts[5:10, :], verts[0])))
 
             if fs == 'top':
                 mpath, mpath_alt = top, bottom
@@ -476,10 +479,10 @@ def _set_hexagon1(self):
 
             # not drawing inside lines
             x = np.abs(np.cos(5*np.pi/6.))
-            top = Path(np.vstack(([-x,0],verts[(1,0,5),:],[x,0])))
-            bottom = Path(np.vstack(([-x,0],verts[2:5,:],[x,0])))
-            left = Path(verts[(0,1,2,3),:])
-            right = Path(verts[(0,5,4,3),:])
+            top = Path(np.vstack(([-x, 0], verts[(1, 0, 5), :], [x, 0])))
+            bottom = Path(np.vstack(([-x, 0], verts[2:5, :], [x, 0])))
+            left = Path(verts[(0, 1, 2, 3), :])
+            right = Path(verts[(0, 5, 4, 3), :])
 
             if fs == 'top':
                 mpath, mpath_alt = top, bottom
@@ -510,10 +513,10 @@ def _set_hexagon2(self):
 
             # not drawing inside lines
             x, y = np.sqrt(3)/4, 3/4.
-            top = Path(verts[(1,0,5,4,1),:])
-            bottom = Path(verts[(1,2,3,4),:])
-            left = Path(np.vstack(([x,y],verts[(0,1,2),:],[-x,-y],[x,y])))
-            right = Path(np.vstack(([x,y],verts[(5,4,3),:],[-x,-y])))
+            top = Path(verts[(1, 0, 5, 4, 1), :])
+            bottom = Path(verts[(1, 2, 3, 4), :])
+            left = Path(np.vstack(([x, y], verts[(0, 1, 2), :], [-x, -y], [x, y])))
+            right = Path(np.vstack(([x, y], verts[(5, 4, 3), :], [-x, -y])))
 
             if fs == 'top':
                 mpath, mpath_alt = top, bottom
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -96,10 +96,10 @@ def _get_packed_offsets(wd_list, total, sep, mode="fixed"):
 
 def _get_aligned_offsets(hd_list, height, align="baseline"):
     """
-    Geiven a list of (height, descent) of each boxes, align the boxes
+    Given a list of (height, descent) of each boxes, align the boxes
     with *align* and calculate the y-offsets of each boxes.
     total width and the offset positions of each items according to
-    *mode*. xdescent is analagous to the usual descent, but along the
+    *mode*. xdescent is analogous to the usual descent, but along the
     x-direction. xdescent values are currently ignored.
 
     *hd_list* : list of (width, xdescent) of boxes to be aligned.
@@ -258,7 +258,7 @@ def __init__(self, pad=None, sep=None, width=None, height=None,
 
         .. note::
           *pad* and *sep* need to given in points and will be
-          scale with the renderer dpi, while *width* and *hight*
+          scale with the renderer dpi, while *width* and *height*
           need to be in pixels.
         """
         super(PackerBase, self).__init__()
@@ -276,7 +276,7 @@ def __init__(self, pad=None, sep=None, width=None, height=None,
 class VPacker(PackerBase):
     """
     The VPacker has its children packed vertically. It automatically
-    adjust the relative postisions of children in the drawing time.
+    adjust the relative positions of children in the drawing time.
     """
     def __init__(self, pad=None, sep=None, width=None, height=None,
                  align="baseline", mode="fixed",
@@ -291,7 +291,7 @@ def __init__(self, pad=None, sep=None, width=None, height=None,
 
         .. note::
           *pad* and *sep* need to given in points and will be
-          scale with the renderer dpi, while *width* and *hight*
+          scale with the renderer dpi, while *width* and *height*
           need to be in pixels.
         """
         super(VPacker, self).__init__(pad, sep, width, height,
@@ -343,7 +343,7 @@ def get_extent_offsets(self, renderer):
 class HPacker(PackerBase):
     """
     The HPacker has its children packed horizontally. It automatically
-    adjust the relative postisions of children in the drawing time.
+    adjust the relative positions of children in the drawing time.
     """
     def __init__(self, pad=None, sep=None, width=None, height=None,
                  align="baseline", mode="fixed",
@@ -358,7 +358,7 @@ def __init__(self, pad=None, sep=None, width=None, height=None,
 
         .. note::
           *pad* and *sep* need to given in points and will be
-          scale with the renderer dpi, while *width* and *hight*
+          scale with the renderer dpi, while *width* and *height*
           need to be in pixels.
         """
         super(HPacker, self).__init__(pad, sep, width, height,
@@ -367,7 +367,7 @@ def __init__(self, pad=None, sep=None, width=None, height=None,
 
     def get_extent_offsets(self, renderer):
         """
-        update offset of childrens and return the extents of the box
+        update offset of children and return the extents of the box
         """
 
         dpicor = renderer.points_to_pixels(1.)
@@ -415,7 +415,7 @@ def __init__(self, child, pad=None, draw_frame=False, patch_attrs=None):
 
         .. note::
           *pad* need to given in points and will be
-          scale with the renderer dpi, while *width* and *hight*
+          scale with the renderer dpi, while *width* and *height*
           need to be in pixels.
         """
 
@@ -771,12 +771,12 @@ class AuxTransformBox(OffsetBox):
     Offset Box with the aux_transform . Its children will be
     transformed with the aux_transform first then will be
     offseted. The absolute coordinate of the aux_transform is meaning
-    as it will be automaticcaly adjust so that the left-lower corner
+    as it will be automatically adjust so that the left-lower corner
     of the bounding box of children will be set to (0,0) before the
-    offset trnasform.
+    offset transform.
 
     It is similar to drawing area, except that the extent of the box
-    is not predetemined but calculated from the window extent of its
+    is not predetermined but calculated from the window extent of its
     children. Furthermore, the extent of the children will be
     calculated in the transformed coordinate.
     """
@@ -821,7 +821,7 @@ def set_offset(self, xy):
         """
         set offset of the container.
 
-        Accept : tuple of x,y cooridnate in disokay units.
+        Accept : tuple of x,y coordinate in disokay units.
         """
         self._offset = xy
 
@@ -883,7 +883,7 @@ class AnchoredOffsetbox(OffsetBox):
     """
     An offset box placed according to the legend location
     loc. AnchoredOffsetbox has a single child. When multiple children
-    is needed, use other OffsetBox class to enlose them.  By default,
+    is needed, use other OffsetBox class to enclose them.  By default,
     the offset box is anchored against its parent axes. You may
     explicitly specify the bbox_to_anchor.
     """
@@ -1198,7 +1198,7 @@ def get_zoom(self):
 #         """
 #         set offset of the container.
 
-#         Accept : tuple of x,y cooridnate in disokay units.
+#         Accept : tuple of x,y coordinate in disokay units.
 #         """
 #         self._offset = xy
 
