matplotlib-checkins Mailing List for matplotlib (Page 3)

Revision: 8940
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8940&view=rev
Author:   jswhit
Date:     2011-02-01 16:20:04 +0000 (Tue, 01 Feb 2011)

Log Message:
-----------
add nad2bin.c

Modified Paths:
--------------
    trunk/toolkits/basemap/MANIFEST.in

Modified: trunk/toolkits/basemap/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap/MANIFEST.in	2011-02-01 16:02:54 UTC (rev 8939)
+++ trunk/toolkits/basemap/MANIFEST.in	2011-02-01 16:20:04 UTC (rev 8940)
@@ -10,6 +10,7 @@
 include setup.py
 include setup.cfg
 include setupegg.py
+include nad2bin.c
 include src/*
 include examples/plothighsandlows.py
 include examples/save_background.py


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8939
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8939&view=rev
Author:   mdboom
Date:     2011-02-01 16:02:54 +0000 (Tue, 01 Feb 2011)

Log Message:
-----------
[3167200] Use from PIL import Image

Modified Paths:
--------------
    branches/v1_0_maint/examples/pylab_examples/image_demo3.py
    branches/v1_0_maint/examples/pylab_examples/to_numeric.py
    branches/v1_0_maint/examples/user_interfaces/histogram_demo_canvasagg.py
    branches/v1_0_maint/lib/matplotlib/image.py

Modified: branches/v1_0_maint/examples/pylab_examples/image_demo3.py
===================================================================
--- branches/v1_0_maint/examples/pylab_examples/image_demo3.py	2011-02-01 04:15:20 UTC (rev 8938)
+++ branches/v1_0_maint/examples/pylab_examples/image_demo3.py	2011-02-01 16:02:54 UTC (rev 8939)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from pylab import *
 try:
-    import Image
+    from PIL import Image
 except ImportError, exc:
     raise SystemExit("PIL must be installed to run this example")
 

Modified: branches/v1_0_maint/examples/pylab_examples/to_numeric.py
===================================================================
--- branches/v1_0_maint/examples/pylab_examples/to_numeric.py	2011-02-01 04:15:20 UTC (rev 8938)
+++ branches/v1_0_maint/examples/pylab_examples/to_numeric.py	2011-02-01 16:02:54 UTC (rev 8939)
@@ -8,7 +8,7 @@
 from pylab import *
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 try:
-    import Image
+    from PIL import Image
 except ImportError, exc:
     raise SystemExit("PIL must be installed to run this example")
 

Modified: branches/v1_0_maint/examples/user_interfaces/histogram_demo_canvasagg.py
===================================================================
--- branches/v1_0_maint/examples/user_interfaces/histogram_demo_canvasagg.py	2011-02-01 04:15:20 UTC (rev 8938)
+++ branches/v1_0_maint/examples/user_interfaces/histogram_demo_canvasagg.py	2011-02-01 16:02:54 UTC (rev 8939)
@@ -54,7 +54,7 @@
 
 if 0:
     # pass off to PIL
-    import Image
+    from PIL import Image
     im = Image.fromstring( "RGB", (w,h), s)
     im.show()
 

Modified: branches/v1_0_maint/lib/matplotlib/image.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/image.py	2011-02-01 04:15:20 UTC (rev 8938)
+++ branches/v1_0_maint/lib/matplotlib/image.py	2011-02-01 16:02:54 UTC (rev 8939)
@@ -1157,7 +1157,7 @@
 
     def pilread():
         'try to load the image with PIL or return None'
-        try: import Image
+        try: from PIL import Image
         except ImportError: return None
         image = Image.open( fname )
         return pil_to_array(image)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8938
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8938&view=rev
Author:   jswhit
Date:     2011-02-01 04:15:20 +0000 (Tue, 01 Feb 2011)

Log Message:
-----------
try to use netCDF4

Modified Paths:
--------------
    trunk/toolkits/basemap/examples/NetCDFFile_tst.py

Modified: trunk/toolkits/basemap/examples/NetCDFFile_tst.py
===================================================================
--- trunk/toolkits/basemap/examples/NetCDFFile_tst.py	2011-02-01 04:02:08 UTC (rev 8937)
+++ trunk/toolkits/basemap/examples/NetCDFFile_tst.py	2011-02-01 04:15:20 UTC (rev 8938)
@@ -5,7 +5,10 @@
 from numpy import ma
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 from numpy.random.mtrand import uniform 
-from mpl_toolkits.basemap import NetCDFFile
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+    from mpl_toolkits.basemap import NetCDFFile
 
 # test automatic conversion of masked arrays, and
 # packing/unpacking of short ints.
@@ -46,6 +49,8 @@
         file = NetCDFFile(self.file,maskandscale=False)
         datamasked = file.variables['maskeddata']
         datapacked = file.variables['packeddata']
+        if hasattr(datapacked,'set_auto_maskandscale'):
+            datapacked.set_auto_maskandscale(False)
         # check missing_value, scale_factor and add_offset attributes.
         assert datamasked.missing_value == missing_value
         assert datapacked.scale_factor == scale_factor
@@ -57,7 +62,7 @@
         file = NetCDFFile(self.file)
         datamasked = file.variables['maskeddata']
         datapacked = file.variables['packeddata']
-        assert_array_almost_equal(datamasked[:].filled(),ranarr)
+        assert_array_almost_equal(datamasked[:].filled(datamasked.missing_value),ranarr)
         assert_array_almost_equal(datapacked[:],packeddata,decimal=4)
         file.close()
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8937
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8937&view=rev
Author:   jswhit
Date:     2011-02-01 04:02:08 +0000 (Tue, 01 Feb 2011)

Log Message:
-----------
update for 1.0.1

Modified Paths:
--------------
    trunk/toolkits/basemap/Changelog

Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2011-01-28 12:38:34 UTC (rev 8936)
+++ trunk/toolkits/basemap/Changelog	2011-02-01 04:02:08 UTC (rev 8937)
@@ -1,4 +1,4 @@
-version 1.0.1 (not yet released).
+version 1.0.1 (svn revision 8937)
            * added 'celestial' keyword - if True astronomical convention for
              longitude is used (negative for 'east', positive for 'west').
              celestial=True implies resolution=None (no continents or


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8936
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8936&view=rev
Author:   mdehoon
Date:     2011-01-28 12:38:34 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
Make an autorelease pool, otherwise we're leaking memory.

Modified Paths:
--------------
    trunk/matplotlib/src/_macosx.m

Modified: trunk/matplotlib/src/_macosx.m
===================================================================
--- trunk/matplotlib/src/_macosx.m	2011-01-24 09:41:49 UTC (rev 8935)
+++ trunk/matplotlib/src/_macosx.m	2011-01-28 12:38:34 UTC (rev 8936)
@@ -4705,8 +4705,10 @@
     NSText* messagebox = self->messagebox;
 
     if (messagebox)
-    {   NSString* text = [NSString stringWithUTF8String: message];
+    {   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+        NSString* text = [NSString stringWithUTF8String: message];
         [messagebox setString: text];
+        [pool release];
     }
 
     Py_INCREF(Py_None);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8935
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8935&view=rev
Author:   pivanov314
Date:     2011-01-24 09:41:49 +0000 (Mon, 24 Jan 2011)

Log Message:
-----------
new broken axis example

Added Paths:
-----------
    trunk/matplotlib/examples/pylab_examples/broken_axis.py

Added: trunk/matplotlib/examples/pylab_examples/broken_axis.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/broken_axis.py	                        (rev 0)
+++ trunk/matplotlib/examples/pylab_examples/broken_axis.py	2011-01-24 09:41:49 UTC (rev 8935)
@@ -0,0 +1,61 @@
+"""
+Broken axis example, where the y-axis will have a portion cut out.
+"""
+import matplotlib.pylab as plt
+import numpy as np
+
+
+# 30 points between 0 0.2] originally made using np.random.rand(30)*.2
+pts = np.array([ 0.015,  0.166,  0.133,  0.159,  0.041,  0.024,  0.195,
+    0.039, 0.161,  0.018,  0.143,  0.056,  0.125,  0.096,  0.094, 0.051,
+    0.043,  0.021,  0.138,  0.075,  0.109,  0.195,  0.05 , 0.074, 0.079,
+    0.155,  0.02 ,  0.01 ,  0.061,  0.008])
+
+# Now let's make two outlier points which are far away from everything. 
+pts[[3,14]] += .8
+
+# If we were to simply plot pts, we'd lose most of the interesting
+# details due to the outliers. So let's 'break' or 'cut-out' the y-axis
+# into two portions - use the top (ax) for the outliers, and the bottom
+# (ax2) for the details of the majority of our data
+f,(ax,ax2) = plt.subplots(2,1,sharex=True)
+
+# plot the same data on both axes
+ax.plot(pts)
+ax2.plot(pts)
+
+# zoom-in / limit the view to different portions of the data
+ax.set_ylim(.78,1.) # outliers only
+ax2.set_ylim(0,.22) # most of the data
+
+# hide the spines between ax and ax2
+ax.spines['bottom'].set_visible(False)
+ax2.spines['top'].set_visible(False)
+ax.xaxis.tick_top()
+ax.tick_params(labeltop='off') # don't put tick labels at the top
+ax2.xaxis.tick_bottom()
+
+# This looks pretty good, and was fairly painless, but you can get that
+# cut-out diagonal lines look with just a bit more work. The important
+# thing to know here is that in axes coordinates, which are always
+# between 0-1, spine endpoints are at these locations (0,0), (0,1),
+# (1,0), and (1,1).  Thus, we just need to put the diagonals in the
+# appropriate corners of each of our axes, and so long as we use the
+# right transform and disable clipping.
+
+d = .015 # how big to make the diagonal lines in axes coordinates
+# arguments to pass plot, just so we don't keep repeating them
+kwargs = dict(transform=ax.transAxes, color='k', clip_on=False)
+ax.plot((-d,+d),(-d,+d), **kwargs)      # top-left diagonal
+ax.plot((1-d,1+d),(-d,+d), **kwargs)    # top-right diagonal
+
+kwargs.update(transform=ax2.transAxes)  # switch to the bottom axes
+ax2.plot((-d,+d),(1-d,1+d), **kwargs)   # bottom-left diagonal
+ax2.plot((1-d,1+d),(1-d,1+d), **kwargs) # bottom-right diagonal
+
+# What's cool about this is that now if we vary the distance between
+# ax and ax2 via f.subplots_adjust(hspace=...) or plt.subplot_tool(),
+# the diagonal lines will move accordingly, and stay right at the tips
+# of the spines they are 'breaking'
+
+plt.show()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8934
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8934&view=rev
Author:   weathergod
Date:     2011-01-22 16:40:21 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
Merged revisions 8933 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8933 | weathergod | 2011-01-22 10:35:26 -0600 (Sat, 22 Jan 2011) | 3 lines
  
  Fixing problem where reversed colormaps of LinearSegmentedColormaps were not initialized properly.
  Thanks to LittleBigBrain for reporting and Friedrich Romstedt for making the original patch.
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/cm.py

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README
    trunk/matplotlib/doc/sphinxext/gen_gallery.py
    trunk/matplotlib/doc/sphinxext/gen_rst.py
    trunk/matplotlib/examples/misc/multiprocess.py
    trunk/matplotlib/examples/mplot3d/contour3d_demo.py
    trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
    trunk/matplotlib/examples/mplot3d/polys3d_demo.py
    trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
    trunk/matplotlib/examples/mplot3d/surface3d_demo.py
    trunk/matplotlib/examples/mplot3d/wire3d_demo.py
    trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
    trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
    trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8926,8931
   + /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8926,8931,8933
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933

Modified: trunk/matplotlib/lib/matplotlib/cm.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cm.py	2011-01-22 16:35:26 UTC (rev 8933)
+++ trunk/matplotlib/lib/matplotlib/cm.py	2011-01-22 16:40:21 UTC (rev 8934)
@@ -25,6 +25,7 @@
     return freversed
 
 def revcmap(data):
+    """Can only handle specification *data* in dictionary format."""
     data_r = {}
     for key, val in data.iteritems():
         if callable(val):
@@ -39,32 +40,51 @@
         data_r[key] = valnew
     return data_r
 
+def _reverse_cmap_spec(spec):
+    """Reverses cmap specification *spec*, can handle both dict and tuple
+    type specs."""
+    
+    if 'red' in spec:
+        return revcmap(spec)
+    else:
+        revspec = list(reversed(spec))
+        if len(revspec[0]) == 2:    # e.g., (1, (1.0, 0.0, 1.0))
+            revspec = [(1.0 - a, b) for a, b in revspec]
+        return revspec
+
+def _generate_cmap(name, lutsize):
+    """Generates the requested cmap from it's name *name*.  The lut size is 
+    *lutsize*."""
+    
+    spec = datad[name]
+
+    # Generate the colormap object.
+    if 'red' in spec:
+        return colors.LinearSegmentedColormap(name, spec, lutsize)
+    else:
+        return colors.LinearSegmentedColormap.from_list(spec, spec, lutsize)
+
 LUTSIZE = mpl.rcParams['image.lut']
 
 _cmapnames = datad.keys()  # need this list because datad is changed in loop
 
+# Generate the reversed specifications ...
+
 for cmapname in _cmapnames:
-    cmapname_r = cmapname+'_r'
-    cmapspec = datad[cmapname]
-    if 'red' in cmapspec:
-        datad[cmapname_r] = revcmap(cmapspec)
-        cmap_d[cmapname] = colors.LinearSegmentedColormap(
-                                cmapname, cmapspec, LUTSIZE)
-        cmap_d[cmapname_r] = colors.LinearSegmentedColormap(
-                                cmapname_r, datad[cmapname_r], LUTSIZE)
-    else:
-        revspec = list(reversed(cmapspec))
-        if len(revspec[0]) == 2:    # e.g., (1, (1.0, 0.0, 1.0))
-            revspec = [(1.0 - a, b) for a, b in revspec]
-        datad[cmapname_r] = revspec
+    spec = datad[cmapname]
+    spec_reversed = _reverse_cmap_spec(spec)
+    datad[cmapname + '_r'] = spec_reversed
 
-        cmap_d[cmapname] = colors.LinearSegmentedColormap.from_list(
-                                cmapname, cmapspec, LUTSIZE)
-        cmap_d[cmapname_r] = colors.LinearSegmentedColormap.from_list(
-                                cmapname_r, revspec, LUTSIZE)
+# Precache the cmaps with ``lutsize = LUTSIZE`` ...
 
+# Use datad.keys() to also add the reversed ones added in the section above:
+for cmapname in datad.keys():
+    cmap_d[cmapname] = _generate_cmap(cmapname, LUTSIZE)
+
 locals().update(cmap_d)
 
+# Continue with definitions ...
+
 def register_cmap(name=None, cmap=None, data=None, lut=None):
     """
     Add a colormap to the set recognized by :func:`get_cmap`.
@@ -128,7 +148,7 @@
         if lut is None:
             return cmap_d[name]
         elif name in datad:
-            return colors.LinearSegmentedColormap(name,  datad[name], lut)
+            return _generate_cmap(name, lut)
         else:
             raise ValueError("Colormap %s is not recognized" % name)
 


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931
   + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931,8933


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8933
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8933&view=rev
Author:   weathergod
Date:     2011-01-22 16:35:26 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
Fixing problem where reversed colormaps of LinearSegmentedColormaps were not initialized properly.
Thanks to LittleBigBrain for reporting and Friedrich Romstedt for making the original patch.

Modified Paths:
--------------
    branches/v1_0_maint/lib/matplotlib/cm.py

Modified: branches/v1_0_maint/lib/matplotlib/cm.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/cm.py	2011-01-21 21:50:16 UTC (rev 8932)
+++ branches/v1_0_maint/lib/matplotlib/cm.py	2011-01-22 16:35:26 UTC (rev 8933)
@@ -25,6 +25,7 @@
     return freversed
 
 def revcmap(data):
+    """Can only handle specification *data* in dictionary format."""
     data_r = {}
     for key, val in data.iteritems():
         if callable(val):
@@ -39,32 +40,51 @@
         data_r[key] = valnew
     return data_r
 
+def _reverse_cmap_spec(spec):
+    """Reverses cmap specification *spec*, can handle both dict and tuple
+    type specs."""
+    
+    if 'red' in spec:
+        return revcmap(spec)
+    else:
+        revspec = list(reversed(spec))
+        if len(revspec[0]) == 2:    # e.g., (1, (1.0, 0.0, 1.0))
+            revspec = [(1.0 - a, b) for a, b in revspec]
+        return revspec
+
+def _generate_cmap(name, lutsize):
+    """Generates the requested cmap from it's name *name*.  The lut size is 
+    *lutsize*."""
+    
+    spec = datad[name]
+
+    # Generate the colormap object.
+    if 'red' in spec:
+        return colors.LinearSegmentedColormap(name, spec, lutsize)
+    else:
+        return colors.LinearSegmentedColormap.from_list(spec, spec, lutsize)
+
 LUTSIZE = mpl.rcParams['image.lut']
 
 _cmapnames = datad.keys()  # need this list because datad is changed in loop
 
+# Generate the reversed specifications ...
+
 for cmapname in _cmapnames:
-    cmapname_r = cmapname+'_r'
-    cmapspec = datad[cmapname]
-    if 'red' in cmapspec:
-        datad[cmapname_r] = revcmap(cmapspec)
-        cmap_d[cmapname] = colors.LinearSegmentedColormap(
-                                cmapname, cmapspec, LUTSIZE)
-        cmap_d[cmapname_r] = colors.LinearSegmentedColormap(
-                                cmapname_r, datad[cmapname_r], LUTSIZE)
-    else:
-        revspec = list(reversed(cmapspec))
-        if len(revspec[0]) == 2:    # e.g., (1, (1.0, 0.0, 1.0))
-            revspec = [(1.0 - a, b) for a, b in revspec]
-        datad[cmapname_r] = revspec
+    spec = datad[cmapname]
+    spec_reversed = _reverse_cmap_spec(spec)
+    datad[cmapname + '_r'] = spec_reversed
 
-        cmap_d[cmapname] = colors.LinearSegmentedColormap.from_list(
-                                cmapname, cmapspec, LUTSIZE)
-        cmap_d[cmapname_r] = colors.LinearSegmentedColormap.from_list(
-                                cmapname_r, revspec, LUTSIZE)
+# Precache the cmaps with ``lutsize = LUTSIZE`` ...
 
+# Use datad.keys() to also add the reversed ones added in the section above:
+for cmapname in datad.keys():
+    cmap_d[cmapname] = _generate_cmap(cmapname, LUTSIZE)
+
 locals().update(cmap_d)
 
+# Continue with definitions ...
+
 def register_cmap(name=None, cmap=None, data=None, lut=None):
     """
     Add a colormap to the set recognized by :func:`get_cmap`.
@@ -128,7 +148,7 @@
         if lut is None:
             return cmap_d[name]
         elif name in datad:
-            return colors.LinearSegmentedColormap(name,  datad[name], lut)
+            return _generate_cmap(name, lut)
         else:
             raise ValueError("Colormap %s is not recognized" % name)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8932
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8932&view=rev
Author:   weathergod
Date:     2011-01-21 21:50:16 +0000 (Fri, 21 Jan 2011)

Log Message:
-----------
Merged revisions 8931 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8931 | weathergod | 2011-01-21 15:42:45 -0600 (Fri, 21 Jan 2011) | 3 lines
  
  Fixes colors normalization with 'under' colors in LinearSegmentedColormap (values between -1 and 0 were being made positive due to an int cast).
  Thanks to Eoghan Harrington for discovering and supplying the patch!
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/colors.py

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README
    trunk/matplotlib/doc/sphinxext/gen_gallery.py
    trunk/matplotlib/doc/sphinxext/gen_rst.py
    trunk/matplotlib/examples/misc/multiprocess.py
    trunk/matplotlib/examples/mplot3d/contour3d_demo.py
    trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
    trunk/matplotlib/examples/mplot3d/polys3d_demo.py
    trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
    trunk/matplotlib/examples/mplot3d/surface3d_demo.py
    trunk/matplotlib/examples/mplot3d/wire3d_demo.py
    trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
    trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
    trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8926 /trunk/matplotlib:1-7315
   + /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8926,8931
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931

Modified: trunk/matplotlib/lib/matplotlib/colors.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/colors.py	2011-01-21 21:42:45 UTC (rev 8931)
+++ trunk/matplotlib/lib/matplotlib/colors.py	2011-01-21 21:50:16 UTC (rev 8932)
@@ -523,6 +523,10 @@
                 np.clip(xa * self.N, -1, self.N, out=xa)
             else:
                 xa = np.clip(xa * self.N, -1, self.N)
+
+            # ensure that all 'under' values will still have negative
+            # value after casting to int
+            np.putmask(xa, xa<0.0, -1)
             xa = xa.astype(int)
         # Set the over-range indices before the under-range;
         # otherwise the under-range values get converted to over-range.


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926
   + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926,8931


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8931
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8931&view=rev
Author:   weathergod
Date:     2011-01-21 21:42:45 +0000 (Fri, 21 Jan 2011)

Log Message:
-----------
Fixes colors normalization with 'under' colors in LinearSegmentedColormap (values between -1 and 0 were being made positive due to an int cast).
Thanks to Eoghan Harrington for discovering and supplying the patch!

Modified Paths:
--------------
    branches/v1_0_maint/lib/matplotlib/colors.py

Modified: branches/v1_0_maint/lib/matplotlib/colors.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/colors.py	2011-01-21 20:38:54 UTC (rev 8930)
+++ branches/v1_0_maint/lib/matplotlib/colors.py	2011-01-21 21:42:45 UTC (rev 8931)
@@ -523,6 +523,10 @@
                 np.clip(xa * self.N, -1, self.N, out=xa)
             else:
                 xa = np.clip(xa * self.N, -1, self.N)
+
+            # ensure that all 'under' values will still have negative
+            # value after casting to int
+            np.putmask(xa, xa<0.0, -1)
             xa = xa.astype(int)
         # Set the over-range indices before the under-range;
         # otherwise the under-range values get converted to over-range.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8930
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8930&view=rev
Author:   weathergod
Date:     2011-01-21 20:38:54 +0000 (Fri, 21 Jan 2011)

Log Message:
-----------
Fixing polygon shading in mplot3d and simultaneously allowing users to specify alpha values for 3d polygons.
(Shading calculation was applied to the rgba array instead of just rgb)

Modified Paths:
--------------
    trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py

Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py	2011-01-18 22:12:52 UTC (rev 8929)
+++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py	2011-01-21 20:38:54 UTC (rev 8930)
@@ -818,13 +818,13 @@
 
         if len(shade[mask]) > 0:
             norm = Normalize(min(shade[mask]), max(shade[mask]))
-            if art3d.iscolor(color):
-                color = color.copy()
-                color[3] = 1
-                colors = np.outer(0.5 + norm(shade) * 0.5, color)
-            else:
-                colors = colorConverter.to_rgba_array(color) * \
-                            (0.5 + 0.5 * norm(shade)[:, np.newaxis])
+            color = colorConverter.to_rgba_array(color)
+            # shape of color should be (M, 4) (where M is number of faces)
+            # shape of shade should be (M,)
+            # colors should have final shape of (M, 4)
+            alpha = color[:, 3]
+            colors = (0.5 + norm(shade)[:, np.newaxis] * 0.5) * color
+            colors[:, 3] = alpha
         else:
             colors = color.copy()
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8929
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8929&view=rev
Author:   jswhit
Date:     2011-01-18 22:12:52 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
try to use netcdf4-python

Modified Paths:
--------------
    trunk/toolkits/basemap/examples/pnganim.py

Modified: trunk/toolkits/basemap/examples/pnganim.py
===================================================================
--- trunk/toolkits/basemap/examples/pnganim.py	2011-01-18 22:10:10 UTC (rev 8928)
+++ trunk/toolkits/basemap/examples/pnganim.py	2011-01-18 22:12:52 UTC (rev 8929)
@@ -9,7 +9,11 @@
 import matplotlib.mlab as mlab
 import numpy.ma as ma
 import datetime, sys, time, subprocess
-from mpl_toolkits.basemap import Basemap, shiftgrid, NetCDFFile, date2index, num2date
+from mpl_toolkits.basemap import Basemap, shiftgrid, date2index, num2date
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except:
+    from mpl_toolkits.basemap import NetCDFFile
 
 # times for March 1993 'storm of the century'
 date1 = datetime.datetime(1993,3,10,0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8928
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8928&view=rev
Author:   jswhit
Date:     2011-01-18 22:10:10 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
use netcdf4-python if installed to read opendap data.

Modified Paths:
--------------
    trunk/toolkits/basemap/examples/plotsst.py

Modified: trunk/toolkits/basemap/examples/plotsst.py
===================================================================
--- trunk/toolkits/basemap/examples/plotsst.py	2011-01-18 19:00:20 UTC (rev 8927)
+++ trunk/toolkits/basemap/examples/plotsst.py	2011-01-18 22:10:10 UTC (rev 8928)
@@ -1,4 +1,8 @@
-from mpl_toolkits.basemap import Basemap, NetCDFFile, date2index, num2date
+from mpl_toolkits.basemap import Basemap, date2index, num2date
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except:
+    from mpl_toolkits.basemap import NetCDFFile
 import numpy as np
 import matplotlib.pyplot as plt
 import sys, datetime


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8927
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8927&view=rev
Author:   mdboom
Date:     2011-01-18 19:00:20 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
Merged revisions 8926 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8926 | mdboom | 2011-01-18 13:59:03 -0500 (Tue, 18 Jan 2011) | 2 lines
  
  Increase tolerance in pcolormesh test.
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/tests/test_axes.py

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README
    trunk/matplotlib/doc/sphinxext/gen_gallery.py
    trunk/matplotlib/doc/sphinxext/gen_rst.py
    trunk/matplotlib/examples/misc/multiprocess.py
    trunk/matplotlib/examples/mplot3d/contour3d_demo.py
    trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
    trunk/matplotlib/examples/mplot3d/polys3d_demo.py
    trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
    trunk/matplotlib/examples/mplot3d/surface3d_demo.py
    trunk/matplotlib/examples/mplot3d/wire3d_demo.py
    trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
    trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
    trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8920 /trunk/matplotlib:1-7315
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8926 /trunk/matplotlib:1-7315
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926


Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920
   + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920,8926

Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py	2011-01-18 18:59:03 UTC (rev 8926)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py	2011-01-18 19:00:20 UTC (rev 8927)
@@ -482,7 +482,7 @@
 
     fig.savefig('symlog')
 
-@image_comparison(baseline_images=['pcolormesh'])
+@image_comparison(baseline_images=['pcolormesh'], tol=0.02)
 def test_pcolormesh():
     n = 12
     x = np.linspace(-1.5,1.5,n)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8926
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8926&view=rev
Author:   mdboom
Date:     2011-01-18 18:59:03 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
Increase tolerance in pcolormesh test.

Modified Paths:
--------------
    branches/v1_0_maint/lib/matplotlib/tests/test_axes.py

Modified: branches/v1_0_maint/lib/matplotlib/tests/test_axes.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/tests/test_axes.py	2011-01-17 19:27:43 UTC (rev 8925)
+++ branches/v1_0_maint/lib/matplotlib/tests/test_axes.py	2011-01-18 18:59:03 UTC (rev 8926)
@@ -474,7 +474,7 @@
 
     fig.savefig('symlog')
 
-@image_comparison(baseline_images=['pcolormesh'])
+@image_comparison(baseline_images=['pcolormesh'], tol=0.02)
 def test_pcolormesh():
     n = 12
     x = np.linspace(-1.5,1.5,n)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8925
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8925&view=rev
Author:   pivanov314
Date:     2011-01-17 19:27:43 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
[DOC] fixed lots of typos in mpl_toolkits

Modified Paths:
--------------
    trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst
    trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst
    trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axisartist.rst
    trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst
    trunk/matplotlib/examples/axes_grid/demo_axes_divider.py
    trunk/matplotlib/examples/axes_grid/demo_axes_grid.py
    trunk/matplotlib/examples/axes_grid/demo_floating_axes.py
    trunk/matplotlib/examples/axes_grid/demo_floating_axis.py
    trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py
    trunk/matplotlib/lib/mpl_toolkits/axes_grid1/anchored_artists.py
    trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_divider.py
    trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_grid.py
    trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_size.py
    trunk/matplotlib/lib/mpl_toolkits/axes_grid1/colorbar.py
    trunk/matplotlib/lib/mpl_toolkits/axes_grid1/inset_locator.py
    trunk/matplotlib/lib/mpl_toolkits/axisartist/angle_helper.py
    trunk/matplotlib/lib/mpl_toolkits/axisartist/axis_artist.py
    trunk/matplotlib/lib/mpl_toolkits/axisartist/axisline_style.py
    trunk/matplotlib/lib/mpl_toolkits/axisartist/axislines.py
    trunk/matplotlib/lib/mpl_toolkits/axisartist/clip_path.py
    trunk/matplotlib/lib/mpl_toolkits/axisartist/floating_axes.py
    trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py
    trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
    trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py
    trunk/matplotlib/lib/mpl_toolkits/mplot3d/proj3d.py

Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst	2011-01-17 19:27:43 UTC (rev 8925)
@@ -18,13 +18,13 @@
    0.99. Originally, the toolkit had a single namespace of 
    *axes_grid*. In more recent version (since svn r8226), the toolkit 
    has divided into two separate namespace (*axes_grid1* and *axisartist*).
-   While *axes_grid* namespace is maintained for he backward compatibility,
+   While *axes_grid* namespace is maintained for the backward compatibility,
    use of *axes_grid1* and *axisartist* is recommended.
 
 .. warning:: 
    *axes_grid* and *axisartist* (but not *axes_grid1*) uses
-   a custome Axes class (derived from the mpl's original Axes class).
-   As a sideeffect, some commands (mostly tick-related) do not work.
+   a custom Axes class (derived from the mpl's original Axes class).
+   As a side effect, some commands (mostly tick-related) do not work.
    Use *axes_grid1* to avoid this, or see how things are different in
    *axes_grid* and *axisartist* (LINK needed)
 

Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst	2011-01-17 19:27:43 UTC (rev 8925)
@@ -4,20 +4,21 @@
 The axes_divider module provide helper classes to adjust the axes
 positions of set of images in the drawing time.
 
-* :mod:`~mpl_toolkits.axes_grid.axes_size` provides a classese of
+* :mod:`~mpl_toolkits.axes_grid.axes_size` provides a classes of
   units that the size of each axes will be determined. For example,
   you can specify a fixed size
 
 * :class:`~mpl_toolkits.axes_grid.axes_size.Divider` this is the class
   that is used calculates the axes position. It divides the given
-  renctangular area into several areas. You intialize the divider by
+  rectangular area into several areas. You initialize the divider by
   setting the horizontal and vertical list of sizes that the division
   will be based on. You then use the new_locator method, whose return
   value is a callable object that can be used to set the axes_locator
   of the axes.
 
 
-You first initialize the divider by specifying its grids, i.e., horiz and vert.
+You first initialize the divider by specifying its grids, i.e.,
+horizontal and vertical.
 
 for example,::
 
@@ -56,8 +57,8 @@
 
 
 The :mod:`mpl_toolkits.axes_grid.axes_size` contains several classes
-that can be used to set the horiz and vert. For example, for the
-vertical configuration above will be::
+that can be used to set the horizontal and vertical configurations. For
+example, for the vertical configuration above will be::
 
   from mpl_toolkits.axes_grid.axes_size import Fixed, Scaled
   vert = [Fixed(2), Scaled(2), Scaled(3)]
@@ -84,7 +85,7 @@
 .. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider2.py
    :include-source:
 
-You can adjust the size of the each axes accroding to their x or y
+You can adjust the size of the each axes according to their x or y
 data limits (AxesX and AxesY), similar to the axes aspect parameter.
 
 .. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider3.py

Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axisartist.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axisartist.rst	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axisartist.rst	2011-01-17 19:27:43 UTC (rev 8925)
@@ -4,11 +4,11 @@
 AXISARTIST namespace
 ====================
 
-The AxisArtist namesapce includes a derived Axes implementation. The
+The AxisArtist namespace includes a derived Axes implementation. The
 biggest difference is that the artists responsible to draw axis line,
 ticks, ticklabel and axis labels are separated out from the mpl's Axis
 class, which are much more than artists in the original mpl. This
-change was strongly motivated to support curvlinear grid. Here are a
+change was strongly motivated to support curvilinear grid. Here are a
 few things that mpl_tootlkits.axisartist.Axes is different from original
 Axes from mpl.
 
@@ -18,7 +18,7 @@
   have different tick location and different tick labels.
 
 * gridlines are drawn by a Gridlines instance. The change was
-  motivated that in curvelinear coordinate, a gridline may not cross
+  motivated that in curvilinear coordinate, a gridline may not cross
   axis-lines (i.e., no associated ticks). In the original Axes class,
   gridlines are tied to ticks.
 
@@ -26,7 +26,7 @@
 
 In summary, all these changes was to support
 
-* a curvelinear grid.
+* a curvilinear grid.
 * a floating axis
 
 .. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axis.py
@@ -111,7 +111,8 @@
 
   ax.axis["bottom"].major_ticklabels.set_visible(False)
 
-AxisAritst provides a helper method to control the visibility of ticks, ticklabels, and label. To make ticklabel invisible, ::
+AxisAritst provides a helper method to control the visibility of ticks,
+ticklabels, and label. To make ticklabel invisible, ::
 
   ax.axis["bottom"].toggle(ticklabels=False)
 
@@ -138,7 +139,7 @@
       for n in ["top","right"]:
         ax.axis[n].toggle(ticklabels=True))
 
-So, any return values in the for loop are ignored. And you shoud not
+So, any return values in the for loop are ignored. And you should not
 use it anything more than a simple method. 
 
 Like the list indexing ":" means all items, i.e., ::
@@ -184,8 +185,8 @@
     axis.label.set_pad method.
 
 
-Rotaion and Alignment of TickLabels
-===================================
+Rotation and Alignment of TickLabels
+====================================
 
 This is also quite different from the original mpl and can be
 confusing. When you want to rotate the ticklabels, first consider
@@ -252,7 +253,7 @@
 
 .. plot:: mpl_toolkits/axes_grid/figures/demo_axis_direction.py
 
-The axis_drection can be adjusted in the AxisArtist level, or in the
+The axis_direction can be adjusted in the AxisArtist level, or in the
 level of its child arists, i.e., ticks, ticklabels, and axis-label. ::
 
   ax1.axis["left"].set_axis_direction("top")
@@ -264,7 +265,7 @@
 
 changes the axis_direction of only the major_ticklabels.  Note that
 set_axis_direction in the AxisArtist level changes the
-ticklabel_direction and label_direction, while chainging the
+ticklabel_direction and label_direction, while changing the
 axis_direction of ticks, ticklabels, and axis-label does not affect
 them.
 
@@ -295,11 +296,11 @@
     * set_ticksize : size in points
  * TickLabels' methods (major_ticklabels and minor_ticklabels)
     * set_axis_direction : "left", "right", "bottom", or "top"
-    * set_rotation : angle with respect to the renference direction
+    * set_rotation : angle with respect to the reference direction
     * set_ha and set_va : see below
  * AxisLabels' methods (label)
     * set_axis_direction : "left", "right", "bottom", or "top"
-    * set_rotation : angle with respect to the renference direction
+    * set_rotation : angle with respect to the reference direction
     * set_ha and set_va
 
 
@@ -329,13 +330,13 @@
 GridHelper
 ==========
 
-To actually define a curvelinear coordinate, you have to use your own
+To actually define a curvilinear coordinate, you have to use your own
 grid helper. A generalised version of grid helper class is supplied
 and this class should suffice in most of cases. A user may provide
 two functions which defines a transformation (and its inverse pair)
-from the curved coordinate to (rectlinear) image coordinate. Note that
+from the curved coordinate to (rectilinear) image coordinate. Note that
 while ticks and grids are drawn for curved coordinate, the data
-transform of the axes itself (ax.transData) is still rectlinear
+transform of the axes itself (ax.transData) is still rectilinear
 (image) coordinate. ::
 
 
@@ -404,7 +405,7 @@
                                         )
 
 
-Again, the *transData* of the axes is still a rectlinear coordinate
+Again, the *transData* of the axes is still a rectilinear coordinate
 (image coordinate). You may manually do conversion between two
 coordinates, or you may use Parasite Axes for convenience.::
 
@@ -447,7 +448,7 @@
 The code need more refinement. Here is a incomplete list of issues and TODO's
 
 * No easy way to support a user customized tick location (for
-  curvelinear grid). A new Locator class needs to be created.
+  curvilinear grid). A new Locator class needs to be created.
 
 * FloatingAxis may have coordinate limits, e.g., a floating axis of x
   = 0, but y only spans from 0 to 1.

Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst	2011-01-17 19:27:43 UTC (rev 8925)
@@ -17,19 +17,19 @@
    0.99. Originally, the toolkit had a single namespace of 
    *axes_grid*. In more recent version (since svn r8226), the toolkit 
    has divided into two separate namespace (*axes_grid1* and *axisartist*).
-   While *axes_grid* namespace is maintained for he backward compatibility,
+   While *axes_grid* namespace is maintained for the backward compatibility,
    use of *axes_grid1* and *axisartist* is recommended.
 
 .. warning:: 
    *axes_grid* and *axisartist* (but not *axes_grid1*) uses
-   a custome Axes class (derived from the mpl's original Axes class).
-   As a sideeffect, some commands (mostly tick-related) do not work.
+   a custom Axes class (derived from the mpl's original Axes class).
+   As a side effect, some commands (mostly tick-related) do not work.
    Use *axes_grid1* to avoid this, or see how things are different in
    *axes_grid* and *axisartist* (LINK needed)
 
 
 AxesGrid toolkit has two namespaces (*axes_grid1* and *axisartist*).
-*axisartist* contains custome Axes class that is meant to support for
+*axisartist* contains custom Axes class that is meant to support for
 curvilinear grids (e.g., the world coordinate system in astronomy).
 Unlike mpl's original Axes class which uses Axes.xaxis and Axes.yaxis
 to draw ticks, ticklines and etc., Axes in axisartist uses special
@@ -46,7 +46,7 @@
 (multiple) images with matplotlib.  In matplotlib, the axes location
 (and size) is specified in the normalized figure coordinates, which
 may not be ideal for displaying images that needs to have a given
-aspect ratio.  For example, it helps you to have a colobar whose
+aspect ratio.  For example, it helps you to have a colorbar whose
 height always matches that of the image.  `ImageGrid`_, `RGB Axes`_ and
 `AxesDivider`_ are helper classes that deals with adjusting the
 location of (multiple) Axes.  They provides a framework to adjust the
@@ -76,9 +76,9 @@
 .. plot:: mpl_toolkits/axes_grid/examples/simple_axesgrid.py
    :include-source:
 
-* The postion of each axes is determined at the drawing time (see
+* The position of each axes is determined at the drawing time (see
   `AxesDivider`_), so that the size of the entire grid fits in the
-  given rectangle (like the aspec of axes). Note that in this example,
+  given rectangle (like the aspect of axes). Note that in this example,
   the paddings between axes are fixed even if you changes the figure
   size.
 
@@ -141,7 +141,7 @@
   means the increasing direction of the axes number.
 
  *aspect*
-  By default (False), widths and heigths of axes in the grid are
+  By default (False), widths and heights of axes in the grid are
   scaled independently. If True, they are scaled according to their
   data limits (similar to aspect parameter in mpl).
 
@@ -165,7 +165,7 @@
    | grid[1] | grid[3] |
    +---------+---------+
 
-You can also create a colorbar (or colobars). You can have colorbar
+You can also create a colorbar (or colorbars). You can have colorbar
 for each axes (cbar_mode="each"), or you can have a single colorbar
 for the grid (cbar_mode="single"). The colorbar can be placed on your
 right, or top. The axes for each colorbar is stored as a *cbar_axes*
@@ -187,7 +187,7 @@
 explained in (yet to be written) AxesDividerGuide, direct use of the
 AxesDivider class will not be necessary for most users.  The
 axes_divider module provides a helper function make_axes_locatable,
-which can be useful. It takes a exisitng axes instance and create a
+which can be useful. It takes a existing axes instance and create a
 divider for it. ::
 
 	ax = subplot(1,1,1)
@@ -196,7 +196,7 @@
 
 
 
-*make_axes_locatable* returns an isntance of the AxesLocator class,
+*make_axes_locatable* returns an instance of the AxesLocator class,
 derived from the Locator. It provides *append_axes* method that
 creates a new axes on the given side of ("top", "right", "bottom" and
 "left") of the original axes.
@@ -255,7 +255,7 @@
 In most cases, you first create a host axes, which provides a few
 method that can be used to create parasite axes. They are *twinx*,
 *twiny* (which are similar to twinx and twiny in the matplotlib) and
-*twin*. *twin* takes an arbitraty tranfromation that maps between the
+*twin*. *twin* takes an arbitrary transformation that maps between the
 data coordinates of the host axes and the parasite axes.  *draw*
 method of the parasite axes are never called. Instead, host axes
 collects artists in parasite axes and draw them as if they belong to
@@ -292,7 +292,7 @@
 
 
 
-A more sophiscated example using twin. Note that if you change the
+A more sophisticated example using twin. Note that if you change the
 x-limit in the host axes, the x-limit of the parasite axes will change
 accordingly.
 
@@ -319,7 +319,7 @@
 
 :mod:`mpl_toolkits.axes_grid.inset_locator` provides helper classes
 and functions to place your (inset) axes at the anchored position of
-the parent axes, similarly to AnchoredArtis.
+the parent axes, similarly to AnchoredArtist.
 
 Using :func:`mpl_toolkits.axes_grid.inset_locator.inset_axes`, you
 can have inset axes whose size is either fixed, or a fixed proportion
@@ -359,7 +359,7 @@
 RGB Axes
 ~~~~~~~~
 
-RGBAxes is a helper clase to conveniently show RGB composite
+RGBAxes is a helper class to conveniently show RGB composite
 images. Like ImageGrid, the location of axes are adjusted so that the
 area occupied by them fits in a given rectangle.  Also, the xaxis and
 yaxis of each axes are shared. ::
@@ -386,7 +386,7 @@
 
 AxisArtist module provides a custom (and very experimental) Axes
 class, where each axis (left, right, top and bottom) have a separate
-artist associated which is resposible to draw axis-line, ticks,
+artist associated which is responsible to draw axis-line, ticks,
 ticklabels, label.  Also, you can create your own axis, which can pass
 through a fixed position in the axes coordinate, or a fixed position
 in the data coordinate (i.e., the axis floats around when viewlimit
@@ -407,7 +407,7 @@
   ax = AA.Axes(fig, [0.1, 0.1, 0.8, 0.8])
   fig.add_axes(ax)
 
-or to creat a subplot ::
+or to create a subplot ::
 
   ax = AA.Subplot(fig, 111)
   fig.add_subplot(ax)
@@ -441,7 +441,7 @@
 AxisArtist with ParasiteAxes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Most commands in the axes_grid toolkit1 can take a axes_class keyword
+Most commands in the axes_grid1 toolkit can take a axes_class keyword
 argument, and the commands creates an axes of the given class. For example,
 to create a host subplot with axisartist.Axes, ::
 
@@ -458,10 +458,10 @@
 
 
 
-Curvelinear Grid
+Curvilinear Grid
 ----------------
 
-The motivation behind the AxisArtist module is to support cuvelinear grid
+The motivation behind the AxisArtist module is to support curvilinear grid
 and ticks.
 
 .. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axis.py
@@ -472,7 +472,7 @@
 Floating Axes
 -------------
 
-This also suppport a Floating Axes whose outer axis are defined as
+This also support a Floating Axes whose outer axis are defined as
 floating axis.
 
 .. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axes.py

Modified: trunk/matplotlib/examples/axes_grid/demo_axes_divider.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_axes_divider.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/examples/axes_grid/demo_axes_divider.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -27,7 +27,7 @@
     # axes for image
     ax = LocatableAxes(fig1, divider.get_position())
 
-    # axes for coloarbar
+    # axes for colorbar
     ax_cb = LocatableAxes(fig1, divider.get_position())
 
     h = [Size.AxesX(ax), # main axes
@@ -117,7 +117,7 @@
 
 
     ## PLOT 4
-    # two images side by sied with fixed padding.
+    # two images side by side with fixed padding.
 
     ax = fig1.add_subplot(2, 2, 4)
     demo_images_side_by_sied(ax)

Modified: trunk/matplotlib/examples/axes_grid/demo_axes_grid.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_axes_grid.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/examples/axes_grid/demo_axes_grid.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -12,7 +12,7 @@
 def demo_simple_grid(fig):
     """
     A grid of 2x2 images with 0.05 inch pad between images and only
-    the lower-left axes is labeld.
+    the lower-left axes is labeled.
     """
     grid = AxesGrid(fig, 131, # similar to subplot(131)
                     nrows_ncols = (2, 2),
@@ -31,7 +31,7 @@
 
 def demo_grid_with_single_cbar(fig):
     """
-    A grid of 2x2 images with a single colobar
+    A grid of 2x2 images with a single colorbar
     """
     grid = AxesGrid(fig, 132, # similar to subplot(132)
                     nrows_ncols = (2, 2),
@@ -58,7 +58,7 @@
 
 def demo_grid_with_each_cbar(fig):
     """
-    A grid of 2x2 images. Each image has its own colobar.
+    A grid of 2x2 images. Each image has its own colorbar.
     """
 
     grid = AxesGrid(F, 133, # similar to subplot(122)

Modified: trunk/matplotlib/examples/axes_grid/demo_floating_axes.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_floating_axes.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/examples/axes_grid/demo_floating_axes.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -146,7 +146,7 @@
 
     ax3, aux_ax3 = setup_axes3(fig, 133)
 
-    theta = (8 + np.random.rand(10)*(14-8))*15. # indegree
+    theta = (8 + np.random.rand(10)*(14-8))*15. # in degrees
     radius = np.random.rand(10)*14000.
     aux_ax3.scatter(theta, radius)
 

Modified: trunk/matplotlib/examples/axes_grid/demo_floating_axis.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_floating_axis.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/examples/axes_grid/demo_floating_axis.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -1,5 +1,5 @@
 """
-An experimental support for curvelinear grid.
+An experimental support for curvilinear grid.
 """
 
 

Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -162,7 +162,7 @@
 
 class CbarAxesLocator(object):
     """
-    CbarAxesLocator is a axes_locator for colobar axes. It adjust the
+    CbarAxesLocator is a axes_locator for colorbar axes. It adjust the
     position of the axes to make a room for extended ends, i.e., the
     extended ends are located outside the axes area.
     """
@@ -194,7 +194,7 @@
     def get_end_vertices(self):
         """
         return a tuple of two vertices for the colorbar extended ends.
-        The first vertives is for min. end, and the second is for
+        The first vertices is for min. end, and the second is for
         max. end.
         """
         # Note that concatenating two vertices needs to make a
@@ -390,7 +390,7 @@
 
     def _get_colorbar_limits(self):
         """
-        initial limits for colorbar range. The returne min, max values
+        initial limits for colorbar range. The returned min, max values
         will be used to create colorbar solid(?) and etc.
         """
         if self.boundaries is not None:
@@ -407,7 +407,7 @@
 
     def _config_axes(self):
         '''
-        Adjust the properties of the axes to be adquate for colorbar display.
+        Adjust the properties of the axes to be adequate for colorbar display.
         '''
         ax = self.ax
 
@@ -416,7 +416,7 @@
                                        orientation=self.orientation)
         ax.set_axes_locator(axes_locator)
 
-        # overide the get_data_ratio for the aspect works.
+        # override the get_data_ratio for the aspect works.
         def _f():
             return 1.
         ax.get_data_ratio = _f
@@ -557,7 +557,7 @@
 
     def add_lines(self, levels, colors, linewidths):
         '''
-        Draw lines on the colorbar. It deletes preexting lines.
+        Draw lines on the colorbar. It deletes preexisting lines.
         '''
         del self.lines
 
@@ -735,7 +735,7 @@
     def update_bruteforce(self, mappable):
         """
         Update the colorbar artists to reflect the change of the
-        assocaited mappable.
+        associated mappable.
         """
         self.update_artists()
 

Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/anchored_artists.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/anchored_artists.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/anchored_artists.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -17,7 +17,7 @@
                  **kwargs):
         """
         *width*, *height*, *xdescent*, *ydescent* : the dimensions of the DrawingArea.
-        *prop* : font property. this is only used for scaling the paddings.
+        *prop* : font property. This is only used for scaling the paddings.
         """
 
         self.da = DrawingArea(width, height, xdescent, ydescent, clip=True)
@@ -69,7 +69,7 @@
                  **kwargs):
         """
         Draw a horizontal bar with the size in data coordinate of the give axes.
-        A label will be drawn underneath (center-alinged).
+        A label will be drawn underneath (center-aligned).
 
         pad, borderpad in fraction of the legend font size (or prop)
         sep in points.

Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_divider.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_divider.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_divider.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -3,8 +3,8 @@
 multiple axes at the drawing time.
 
  Divider: this is the class that is used calculates the axes
-    position. It divides the given renctangular area into several sub
-    rectangles. You intialize the divider by setting the horizontal
+    position. It divides the given rectangular area into several sub
+    rectangles. You initialize the divider by setting the horizontal
     and vertical list of sizes that the division will be based on. You
     then use the new_locator method, whose return value is a callable
     object that can be used to set the axes_locator of the axes.
@@ -23,8 +23,8 @@
 class Divider(object):
     """
     This is the class that is used calculates the axes position. It
-    divides the given renctangular area into several
-    sub-rectangles. You intialize the divider by setting the
+    divides the given rectangular area into several
+    sub-rectangles. You initialize the divider by setting the
     horizontal and vertical lists of sizes
     (:mod:`mpl_toolkits.axes_grid.axes_size`) that the division will
     be based on. You then use the new_locator method to create a
@@ -44,11 +44,11 @@
         :param vertical: list of sizes
                     (:mod:`~mpl_toolkits.axes_grid.axes_size`)
                     for vertical division
-        :param aspect: if True, the overall rectalngular area is reduced
+        :param aspect: if True, the overall rectangular area is reduced
                     so that the relative part of the horizontal and
                     vertical scales have same scale.
-        :param anchor: Detrmine how the reduced rectangle is placed
-                       when aspect is True,
+        :param anchor: Determine how the reduced rectangle is placed
+                       when aspect is True.
         """
 
         self._fig = fig
@@ -290,7 +290,7 @@
 
 class AxesLocator(object):
     """
-    A simple callable object, initiallized with AxesDivider class,
+    A simple callable object, initialized with AxesDivider class,
     returns the position and size of the given cell.
     """
     def __init__(self, axes_divider, nx, ny, nx1=None, ny1=None):
@@ -336,7 +336,7 @@
 
 class SubplotDivider(Divider):
     """
-    The Divider class whose rectangle area is specified as a subplot grometry.
+    The Divider class whose rectangle area is specified as a subplot geometry.
     """
 
 
@@ -475,18 +475,17 @@
 
         :param size: A width of the axes. A :mod:`~mpl_toolkits.axes_grid.axes_size`
           instance or if float or string is given, *from_any*
-          fucntion is used to create one, with *ref_size* set to AxesX instance
+          function is used to create one, with *ref_size* set to AxesX instance
           of the current axes.
         :param pad: pad between the axes. It takes same argument as *size*.
         :param pack_start: If False, the new axes is appended at the end
           of the list, i.e., it became the right-most axes. If True, it is
-          inseted at the start of the list, and becomes the left-most axes.
+          inserted at the start of the list, and becomes the left-most axes.
 
-        All extra keywords argument is passed to when creating a axes.
-        if *axes_class* is given, the new axes will be created as an
+        All extra keywords arguments are passed to the created axes.
+        If *axes_class* is given, the new axes will be created as an
         instance of the given class. Otherwise, the same class of the
-        main axes will be used.  if Not provided
-
+        main axes will be used.
         """
 
         if pad:
@@ -522,18 +521,17 @@
 
         :param size: A height of the axes. A :mod:`~mpl_toolkits.axes_grid.axes_size`
           instance or if float or string is given, *from_any*
-          fucntion is used to create one, with *ref_size* set to AxesX instance
+          function is used to create one, with *ref_size* set to AxesX instance
           of the current axes.
         :param pad: pad between the axes. It takes same argument as *size*.
         :param pack_start: If False, the new axes is appended at the end
           of the list, i.e., it became the top-most axes. If True, it is
-          inseted at the start of the list, and becomes the bottom-most axes.
+          inserted at the start of the list, and becomes the bottom-most axes.
 
-        All extra keywords argument is passed to when creating a axes.
-        if *axes_class* is given, the new axes will be created as an
+        All extra keywords arguments are passed to the created axes.
+        If *axes_class* is given, the new axes will be created as an
         instance of the given class. Otherwise, the same class of the
-        main axes will be used.  if Not provided
-
+        main axes will be used.
         """
 
         if pad:
@@ -751,7 +749,7 @@
 
 class VBoxDivider(HBoxDivider):
     """
-    The Divider class whose rectangle area is specified as a subplot grometry.
+    The Divider class whose rectangle area is specified as a subplot geometry.
     """
 
 

Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_grid.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_grid.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_grid.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -187,7 +187,7 @@
           Keyword           Default   Description
           ================  ========  =========================================
           direction         "row"     [ "row" | "column" ]
-          axes_pad          0.02      float| pad betweein axes given in inches
+          axes_pad          0.02      float| pad between axes given in inches
           add_all           True      [ True | False ]
           share_all         False     [ True | False ]
           share_x           True      [ True | False ]
@@ -475,7 +475,7 @@
           Keyword           Default   Description
           ================  ========  =========================================
           direction         "row"     [ "row" | "column" ]
-          axes_pad          0.02      float| pad betweein axes given in inches
+          axes_pad          0.02      float| pad between axes given in inches
           add_all           True      [ True | False ]
           share_all         False     [ True | False ]
           aspect            True      [ True | False ]

Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_size.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_size.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_size.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -1,6 +1,6 @@
 
 """
-provides a classese of simlpe units that will be used with AxesDivider
+provides a classes of simple units that will be used with AxesDivider
 class (or others) to determine the size of each axes. The unit
 classes define `get_size` method that returns a tuple of two floats,
 meaning relative and absolute sizes, respectively.

Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/colorbar.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/colorbar.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/colorbar.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -162,7 +162,7 @@
 
 class CbarAxesLocator(object):
     """
-    CbarAxesLocator is a axes_locator for colobar axes. It adjust the
+    CbarAxesLocator is a axes_locator for colorbar axes. It adjust the
     position of the axes to make a room for extended ends, i.e., the
     extended ends are located outside the axes area.
     """
@@ -194,8 +194,8 @@
     def get_end_vertices(self):
         """
         return a tuple of two vertices for the colorbar extended ends.
-        The first vertives is for min. end, and the second is for
-        max. end.
+        The first vertices is for the minimum end, and the second is for
+        the maximum end.
         """
         # Note that concatenating two vertices needs to make a
         # vertices for the frame.
@@ -390,7 +390,7 @@
 
     def _get_colorbar_limits(self):
         """
-        initial limits for colorbar range. The returne min, max values
+        initial limits for colorbar range. The returned min, max values
         will be used to create colorbar solid(?) and etc.
         """
         if self.boundaries is not None:
@@ -407,7 +407,7 @@
 
     def _config_axes(self):
         '''
-        Adjust the properties of the axes to be adquate for colorbar display.
+        Adjust the properties of the axes to be adequate for colorbar display.
         '''
         ax = self.ax
 
@@ -416,7 +416,7 @@
                                        orientation=self.orientation)
         ax.set_axes_locator(axes_locator)
 
-        # overide the get_data_ratio for the aspect works.
+        # override the get_data_ratio for the aspect works.
         def _f():
             return 1.
         ax.get_data_ratio = _f
@@ -559,7 +559,7 @@
 
     def add_lines(self, levels, colors, linewidths):
         '''
-        Draw lines on the colorbar. It deletes preexting lines.
+        Draw lines on the colorbar. It deletes preexisting lines.
         '''
         del self.lines
 
@@ -737,7 +737,7 @@
     def update_bruteforce(self, mappable):
         """
         Update the colorbar artists to reflect the change of the
-        assocaited mappable.
+        associated mappable.
         """
         self.update_artists()
 

Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/inset_locator.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/inset_locator.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/inset_locator.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -143,7 +143,7 @@
 class BboxPatch(Patch):
    def __init__(self, bbox, **kwargs):
         if "transform" in kwargs:
-           raise ValueError("trnasform should nt be set")
+           raise ValueError("transform should not be set")
 
         kwargs["transform"] = IdentityTransform()
         Patch.__init__(self, **kwargs)
@@ -225,7 +225,7 @@
 
         """
         if "transform" in kwargs:
-           raise ValueError("trnasform should nt be set")
+           raise ValueError("transform should not be set")
 
         kwargs["transform"] = IdentityTransform()
         Patch.__init__(self, **kwargs)

Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/angle_helper.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/angle_helper.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/angle_helper.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -130,8 +130,8 @@
     levs = np.arange(math.floor(f1/step), math.ceil(f2/step)+0.5,
                      1, dtype="i") * step
 
-    # n : number valid levels. If there is a cycle, e.g., [0, 90, 180,
-    # 270, 360], the a grid line needs to be extend from 0 to 360, so
+    # n : number of valid levels. If there is a cycle, e.g., [0, 90, 180,
+    # 270, 360], the grid line needs to be extended from 0 to 360, so
     # we need to return the whole array. However, the last level (360)
     # needs to be ignored often. In this case, so we return n=4.
 
@@ -288,7 +288,7 @@
         get extreme values.
 
         x1, y1, x2, y2 in image coordinates (0-based)
-        nx, ny : number of dvision in each axis
+        nx, ny : number of divisions in each axis
         """
         x_, y_ = np.linspace(x1, x2, self.nx), np.linspace(y1, y2, self.ny)
         x, y = np.meshgrid(x_, y_)

Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/axis_artist.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/axis_artist.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/axis_artist.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -10,7 +10,7 @@
 The main artist class is a AxisArtist and a GridlinesCollection. The
 GridlinesCollection is responsible for drawing grid lines and the
 AxisArtist is responsible for all other artists. The AxisArtist class
-has attributest that are associated with each type of artists.
+has attributes that are associated with each type of artists.
 
  * line : axis line
  * major_ticks : major tick lines
@@ -25,11 +25,14 @@
 
   ax.axis["bottom"]
 
-where *ax* is an instance of axes (mpl_toolkits.axislines.Axes).
-Thus, ax.axis["bottom"].line is an artist associated with the axis line, and ax.axis["bottom"].major_ticks is an artist associated with the major tick lines.
+where *ax* is an instance of axes (mpl_toolkits.axislines.Axes).  Thus,
+ax.axis["bottom"].line is an artist associated with the axis line, and
+ax.axis["bottom"].major_ticks is an artist associated with the major tick
+lines.
 
 You can change the colors, fonts, line widths, etc. of these artists
-by calling sutable set method. For example, to change the color of the major ticks of the bottom axis to red,
+by calling suitable set method. For example, to change the color of the major
+ticks of the bottom axis to red,
 
   ax.axis["bottom"].major_ticks.set_color("r")
 
@@ -39,7 +42,7 @@
 axis_direction
 --------------
 
-AxisArtist, AxisLabel, TickLabels have *axis_drection* attribute,
+AxisArtist, AxisLabel, TickLabels have *axis_direction* attribute,
 which adjusts the location, angle, etc.,. The *axis_direction* must be
 one of [left, right, bottom, top] and they follow the matplotlib
 convention for the rectangle axis.
@@ -62,7 +65,7 @@
  ticklabels angle       90    0      -90  180
  axislabel angle        180   0     0     180
  ticklabel va           center baseline center baseline
- axislabel va           center top      center btoom
+ axislabel va           center top      center bottom
  ticklabel ha           right  center   right  center
  axislabel ha           right  center   right  center
 
@@ -177,7 +180,7 @@
         self._ref_artist = artist
 
     def get_ref_artist(self):
-        raise RuntimeError("get_ref_artist must overriden")
+        raise RuntimeError("get_ref_artist must overridden")
     #return self._ref_artist
 
     def get_attribute_from_ref_artist(self, attr_name, default_value):
@@ -257,7 +260,7 @@
 
     def set_ticksize(self, ticksize):
         """
-        set lenth of the ticks in points.
+        set length of the ticks in points.
         """
         self._ticksize = ticksize
 
@@ -490,7 +493,7 @@
 class AxisLabel(LabelBase, AttributeCopier):
     """
     Axis Label. Derived from Text. The position of the text is updated
-    in the fly, so chaning text position has no effect. Otherwise, the
+    in the fly, so changing text position has no effect. Otherwise, the
     properties can be changed as a normal Text.
 
     To change the pad between ticklabels and axis label, use set_pad.
@@ -587,7 +590,7 @@
         property                 left       bottom    right      top
         =====================    ========== ========= ========== ==========
         axislabel angle          180        0         0          180
-        axislabel va             center     top       center     btoom
+        axislabel va             center     top       center     bottom
         axislabel ha             right      center    right      center
         =====================    ========== ========= ========== ==========
 
@@ -808,7 +811,7 @@
 
     def get_texts_widths_heights_descents(self, renderer):
         """
-        return a list of width, height, descent for ticklaels.
+        return a list of width, height, descent for ticklabels.
         """
         whd_list = []
         for (x, y), a, l in self._locs_angles_labels:
@@ -981,7 +984,7 @@
         ticklabel va             center     baseline  center     baseline
         ticklabel ha             right      center    right      center
         axislabel angle          180        0         0          180
-        axislabel va             center     top       center     btoom
+        axislabel va             center     top       center     bottom
         axislabel ha             right      center    right      center
         =====================    ========== ========= ========== ==========
 

Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/axisline_style.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/axisline_style.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/axisline_style.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -6,7 +6,7 @@
 class _FancyAxislineStyle:
     class SimpleArrow(FancyArrowPatch):
         """
-        The artist class that will be returend for SimpleArrow style.
+        The artist class that will be returned for SimpleArrow style.
         """
         _ARROW_STYLE = "->"
 
@@ -60,7 +60,7 @@
         def draw(self, renderer):
             """
             Draw the axis line.
-             1) transform the path to the display cooridnate.
+             1) transform the path to the display coordinate.
              2) extend the path to make a room for arrow
              3) update the path of the FancyArrowPatch.
              4) draw
@@ -75,7 +75,7 @@
 
     class FilledArrow(SimpleArrow):
         """
-        The artist class that will be returend for SimpleArrow style.
+        The artist class that will be returned for SimpleArrow style.
         """
         _ARROW_STYLE = "-|>"
 
@@ -115,7 +115,7 @@
 
         def __init__(self):
             """
-            initializtion.
+            initialization.
             """
             super(AxislineStyle._Base, self).__init__()
 

Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/axislines.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/axislines.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/axislines.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -3,7 +3,7 @@
 biggest difference is that the artists responsible to draw axis line,
 ticks, ticklabel and axis labels are separated out from the mpl's Axis
 class, which are much more than artists in the original
-mpl. Originally, this change was motivated to support curvlinear
+mpl. Originally, this change was motivated to support curvilinear
 grid. Here are a few reasons that I came up with new axes class.
 
 
@@ -11,7 +11,7 @@
    different ticks (tick locations and labels). This is not possible
    with the current mpl, although some twin axes trick can help.
 
- * Curvelinear grid.
+ * Curvilinear grid.
 
  * angled ticks.
 
@@ -109,7 +109,7 @@
             return trans
 
         def get_tick_iterators(self, axes):
-            # iter : iteratoable object that yields (c, angle, l) where
+            # iter : iteratable object that yields (c, angle, l) where
             # c, angle, l is position, tick angle, and label
 
             return iter_major, iter_minor
@@ -639,7 +639,7 @@
 
         self.axes._set_artist_props(gridlines)
         # gridlines.set_clip_path(self.axes.patch)
-        # set_clip_path need to be defered after Axes.cla is completed.
+        # set_clip_path need to be deferred after Axes.cla is completed.
         # It is done inside the cla.
 
         self.gridlines = gridlines
@@ -662,7 +662,7 @@
 
     def grid(self, b=None, which='major', **kwargs):
         """
-        Toggel the gridlines, and optionally set the properties of the lines.
+        Toggle the gridlines, and optionally set the properties of the lines.
         """
         # their are some discrepancy between the behavior of grid in
         # axes_grid and the original mpl's grid, because axes_grid

Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/clip_path.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/clip_path.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/clip_path.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -10,7 +10,7 @@
         return math.atan2(dy, dx)
 
 # FIXME : The current algorithm seems to return incorrect angle when the line
-# ends at the boudnary.
+# ends at the boundary.
 
 def clip(xlines, ylines, x0, clip="right"):
 

Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/floating_axes.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/floating_axes.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/floating_axes.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -1,5 +1,5 @@
 """
-An experimental support for curvelinear grid.
+An experimental support for curvilinear grid.
 """
 
 
@@ -225,7 +225,7 @@
         get extreme values.
 
         x1, y1, x2, y2 in image coordinates (0-based)
-        nx, ny : number of dvision in each axis
+        nx, ny : number of division in each axis
         """
         #lon_min, lon_max, lat_min, lat_max = self._extremes
         return self._extremes
@@ -241,7 +241,7 @@
                  tick_formatter2=None):
         """
         aux_trans : a transform from the source (curved) coordinate to
-        target (rectlinear) coordinate. An instance of MPL's Transform
+        target (rectilinear) coordinate. An instance of MPL's Transform
         (inverse transform should be defined) or a tuple of two callable
         objects which defines the transform and its inverse. The callables
         need take two arguments of array of source coordinates and
@@ -320,7 +320,7 @@
         return axisline
 
 
-    # new_floating_axis will inheirt the grid_helper's extremes.
+    # new_floating_axis will inherit the grid_helper's extremes.
 
     # def new_floating_axis(self, nth_coord,
     #                       value,

Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -19,7 +19,7 @@
         get extreme values.
 
         x1, y1, x2, y2 in image coordinates (0-based)
-        nx, ny : number of dvision in each axis
+        nx, ny : number of division in each axis
         """
         x_, y_ = np.linspace(x1, x2, self.nx), np.linspace(y1, y2, self.ny)
         x, y = np.meshgrid(x_, y_)
@@ -31,9 +31,10 @@
         return self._add_pad(lon_min, lon_max, lat_min, lat_max)
 
     def _add_pad(self, lon_min, lon_max, lat_min, lat_max):
-        # a small amound of padding is added because the current
-        # clipping algorithms seems to fail when the gidline ends at
-        # the bbox boundary.
+        """ a small amount of padding is added because the current
+        clipping algorithms seems to fail when the gridline ends at
+        the bbox boundary.
+        """
         dlon = (lon_max - lon_min) / self.nx
         dlat = (lat_max - lat_min) / self.ny
 
@@ -205,7 +206,7 @@
                      "tick_formatter2"]:
                 setattr(self, k, kw[k])
             else:
-                raise ValueError("unknwonw update property")
+                raise ValueError("unknown update property '%s'" % k)
 
 
 
@@ -220,7 +221,7 @@
                  tick_formatter1=None,
                  tick_formatter2=None):
         """
-        transform : transfrom from the image coordinate (which will be
+        transform : transform from the image coordinate (which will be
         the transData of the axes to the world coordinate.
 
         or transform = (transform_xy, inv_transform_xy)

Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -1,5 +1,5 @@
 """
-An experimental support for curvelinear grid.
+An experimental support for curvilinear grid.
 """
 
 from itertools import chain
@@ -309,7 +309,7 @@
                  tick_formatter2=None):
         """
         aux_trans : a transform from the source (curved) coordinate to
-        target (rectlinear) coordinate. An instance of MPL's Transform
+        target (rectilinear) coordinate. An instance of MPL's Transform
         (inverse transform should be defined) or a tuple of two callable
         objects which defines the transform and its inverse. The callables
         need take two arguments of array of source coordinates and

Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -225,7 +225,7 @@
         self.autoscale_view()
 
     def autoscale_view(self, scalex=True, scaley=True, scalez=True, **kw):
-        # This method looks at the rectanglular volume (see above)
+        # This method looks at the rectangular volume (see above)
         # of data and decides how to scale the view portal to fit it.
 
         self.set_top_view()

Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/proj3d.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/mplot3d/proj3d.py	2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/proj3d.py	2011-01-17 19:27:43 UTC (rev 8925)
@@ -51,7 +51,7 @@
     p0[1] = y(s)
 
     intersection point p = p1 + u*(p2-p1)
-    and intersection point lies within segement if u is between 0 and 1
+    and intersection point lies within segment if u is between 0 and 1
     """
 
     x21 = p2[0] - p1[0]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8924
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8924&view=rev
Author:   jswhit
Date:     2011-01-17 17:48:03 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
try to use netCDF4 module first before falling back on included NetCDFFile function

Modified Paths:
--------------
    trunk/toolkits/basemap/examples/ccsm_popgrid.py
    trunk/toolkits/basemap/examples/fcstmaps.py
    trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
    trunk/toolkits/basemap/examples/plothighsandlows.py
    trunk/toolkits/basemap/examples/ploticos.py
    trunk/toolkits/basemap/examples/plotprecip.py

Modified: trunk/toolkits/basemap/examples/ccsm_popgrid.py
===================================================================
--- trunk/toolkits/basemap/examples/ccsm_popgrid.py	2011-01-17 17:28:07 UTC (rev 8923)
+++ trunk/toolkits/basemap/examples/ccsm_popgrid.py	2011-01-17 17:48:03 UTC (rev 8924)
@@ -24,7 +24,11 @@
 import numpy.ma as ma
 import numpy as np
 import matplotlib.pyplot as plt
-from mpl_toolkits.basemap import Basemap, NetCDFFile
+from mpl_toolkits.basemap import Basemap
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+    from mpl_toolkits.basemap import NetCDFFile
 
 # read in data from netCDF file.
 infile    = 'ccsm_popgrid.nc'

Modified: trunk/toolkits/basemap/examples/fcstmaps.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps.py	2011-01-17 17:28:07 UTC (rev 8923)
+++ trunk/toolkits/basemap/examples/fcstmaps.py	2011-01-17 17:48:03 UTC (rev 8924)
@@ -5,7 +5,11 @@
 import sys
 import numpy.ma as ma
 import datetime
-from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic, num2date
+from mpl_toolkits.basemap import Basemap, addcyclic, num2date
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+    from mpl_toolkits.basemap import NetCDFFile
 
 
 # today's date is default.

Modified: trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py	2011-01-17 17:28:07 UTC (rev 8923)
+++ trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py	2011-01-17 17:48:03 UTC (rev 8924)
@@ -6,8 +6,12 @@
 import sys
 import numpy.ma as ma
 import datetime
-from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic, num2date
+from mpl_toolkits.basemap import Basemap, addcyclic, num2date
 from mpl_toolkits.axes_grid1 import AxesGrid
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+    from mpl_toolkits.basemap import NetCDFFile
 
 
 # today's date is default.

Modified: trunk/toolkits/basemap/examples/plothighsandlows.py
===================================================================
--- trunk/toolkits/basemap/examples/plothighsandlows.py	2011-01-17 17:28:07 UTC (rev 8923)
+++ trunk/toolkits/basemap/examples/plothighsandlows.py	2011-01-17 17:48:03 UTC (rev 8924)
@@ -5,8 +5,12 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import sys
-from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic
+from mpl_toolkits.basemap import Basemap, addcyclic
 from scipy.ndimage.filters import minimum_filter, maximum_filter
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+    from mpl_toolkits.basemap import NetCDFFile
 
 def extrema(mat,mode='wrap',window=10):
     """find the indices of local extrema (min and max)

Modified: trunk/toolkits/basemap/examples/ploticos.py
===================================================================
--- trunk/toolkits/basemap/examples/ploticos.py	2011-01-17 17:28:07 UTC (rev 8923)
+++ trunk/toolkits/basemap/examples/ploticos.py	2011-01-17 17:48:03 UTC (rev 8924)
@@ -1,7 +1,11 @@
-from mpl_toolkits.basemap import Basemap, NetCDFFile
+from mpl_toolkits.basemap import Basemap
 import matplotlib.pyplot as plt
 import numpy as np
 from numpy import ma
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+    from mpl_toolkits.basemap import NetCDFFile
 # read in orography of icosahedral global grid.
 f = NetCDFFile('C02562.orog.nc')
 lons = (180./np.pi)*f.variables['grid_center_lon'][:]

Modified: trunk/toolkits/basemap/examples/plotprecip.py
===================================================================
--- trunk/toolkits/basemap/examples/plotprecip.py	2011-01-17 17:28:07 UTC (rev 8923)
+++ trunk/toolkits/basemap/examples/plotprecip.py	2011-01-17 17:48:03 UTC (rev 8924)
@@ -1,4 +1,8 @@
-from mpl_toolkits.basemap import Basemap, cm, NetCDFFile
+from mpl_toolkits.basemap import Basemap, cm
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+    from mpl_toolkits.basemap import NetCDFFile
 import numpy as np
 import matplotlib.pyplot as plt
 import copy


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8923
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8923&view=rev
Author:   jswhit
Date:     2011-01-17 17:28:07 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
add qualification to tissot docstring.

Modified Paths:
--------------
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2011-01-17 07:13:37 UTC (rev 8922)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2011-01-17 17:28:07 UTC (rev 8923)
@@ -2351,6 +2351,10 @@
         which when drawn on a map shows the distortion
         inherent in the map projection.
 
+        .. note::
+         Cannot handle situations in which the polygon intersects
+         the edge of the map projection domain, and then re-enters the domain.
+
         Extra keyword ``ax`` can be used to override the default axis instance.
 
         Other \**kwargs passed on to matplotlib.patches.Polygon.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8922
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8922&view=rev
Author:   efiring
Date:     2011-01-17 07:13:37 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
backend_qt4agg: eliminate duplicate call to FigureCanvasAgg.draw()

The basic problem is that the most efficient way to eliminate the
duplication appears to be to do the Agg drawing in the paintEvent,
not in draw(); but then a draw() followed by copy_from_bbox may
result in a copy being made before the Agg draw has occurred.
The solution here is to do that drawing inside copy_from_bbox
when necessary.

Side note: it seems that by using the update() method, the
qt4agg draw() is acting more like draw_idle() than like the draw()
methods in the other interactive backends.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backends/backend_qt4agg.py

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt4agg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qt4agg.py	2011-01-16 01:09:08 UTC (rev 8921)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qt4agg.py	2011-01-17 07:13:37 UTC (rev 8922)
@@ -110,7 +110,7 @@
             w = int(r) - int(l)
             h = int(t) - int(b)
             t = int(b) + h
-            reg = self.copy_from_bbox(bbox)
+            reg = FigureCanvasAgg.copy_from_bbox(self, bbox)
             stringBuffer = reg.to_string_argb()
             qImage = QtGui.QImage(stringBuffer, w, h, QtGui.QImage.Format_ARGB32)
             pixmap = QtGui.QPixmap.fromImage(qImage)
@@ -127,7 +127,6 @@
 
         if DEBUG: print "FigureCanvasQtAgg.draw", self
         self.replot = True
-        FigureCanvasAgg.draw(self)
         self.update()
 
     def blit(self, bbox=None):
@@ -140,6 +139,16 @@
         t = b + h
         self.repaint(l, self.renderer.height-t, w, h)
 
+    def copy_from_bbox(self, *args):
+        """
+        If a draw() has been called but the update() has not
+        occurred, draw into the agg canvas before copying.
+        """
+        if self.replot:
+            FigureCanvasAgg.draw(self)
+            self.replot = False
+        return FigureCanvasAgg.copy_from_bbox(self, *args)
+
     def print_figure(self, *args, **kwargs):
         FigureCanvasAgg.print_figure(self, *args, **kwargs)
         self.draw()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8921
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8921&view=rev
Author:   efiring
Date:     2011-01-16 01:09:08 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
Merged revisions 8920 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8920 | efiring | 2011-01-15 15:00:37 -1000 (Sat, 15 Jan 2011) | 8 lines
  
  Change pcolor and contourf default antialiasing to False; closes 3151847.
  
  To avoid misplaced boundaries and artifacts with alpha < 1, we do not
  stroke the pcolor and contourf patch boundaries by default; but without
  that stroking, antialiasing produces boundary artifacts that tend to
  be visually disturbing.  Therefore we sacrifice antialiasing for these
  patches.
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py
    trunk/matplotlib/lib/matplotlib/contour.py

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README
    trunk/matplotlib/doc/sphinxext/gen_gallery.py
    trunk/matplotlib/doc/sphinxext/gen_rst.py
    trunk/matplotlib/examples/misc/multiprocess.py
    trunk/matplotlib/examples/mplot3d/contour3d_demo.py
    trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
    trunk/matplotlib/examples/mplot3d/polys3d_demo.py
    trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
    trunk/matplotlib/examples/mplot3d/surface3d_demo.py
    trunk/matplotlib/examples/mplot3d/wire3d_demo.py
    trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
    trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
    trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8917 /trunk/matplotlib:1-7315
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8920 /trunk/matplotlib:1-7315
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2011-01-16 01:00:37 UTC (rev 8920)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2011-01-16 01:09:08 UTC (rev 8921)
@@ -6934,14 +6934,14 @@
 
         %(PolyCollection)s
 
-        Note: the default *antialiaseds* is taken from
+        Note: the default *antialiaseds* is False if the default
+        *edgecolors*="none" is used.  This eliminates artificial lines
+        at patch boundaries, and works regardless of the value of
+        alpha.  If *edgecolors* is not "none", then the default
+        *antialiaseds* is taken from
         rcParams['patch.antialiased'], which defaults to *True*.
-        In some cases, particularly if *alpha* is 1,
-        you may be able to reduce rendering artifacts (light or
-        dark patch boundaries) by setting it to *False*.  An
-        alternative it to set *edgecolors* to 'face'.  Unfortunately,
-        there seems to be no single combination of parameters that
-        eliminates artifacts under all conditions.
+        Stroking the edges may be preferred if *alpha* is 1, but
+        will cause artifacts otherwise.
 
         """
 
@@ -6990,22 +6990,29 @@
 
         C = compress(ravelmask, ma.filled(C[0:Ny-1,0:Nx-1]).ravel())
 
+        linewidths = (0.25,)
+        if 'linewidth' in kwargs:
+            kwargs['linewidths'] = kwargs.pop('linewidth')
+        kwargs.setdefault('linewidths', linewidths)
+
         if shading == 'faceted':
             edgecolors = 'k',
         else:
             edgecolors = 'none'
-        linewidths = (0.25,)
-        # Not sure if we want to have the following, or just trap
-        # invalid kwargs and raise an exception.
         if 'edgecolor' in kwargs:
             kwargs['edgecolors'] = kwargs.pop('edgecolor')
-        if 'linewidth' in kwargs:
-            kwargs['linewidths'] = kwargs.pop('linewidth')
+        ec = kwargs.setdefault('edgecolors', edgecolors)
+
+        # aa setting will default via collections to patch.antialiased
+        # unless the boundary is not stroked, in which case the
+        # default will be False; with unstroked boundaries, aa
+        # makes artifacts that are often disturbing.
         if 'antialiased' in kwargs:
             kwargs['antialiaseds'] = kwargs.pop('antialiased')
-        kwargs.setdefault('edgecolors', edgecolors)
-        kwargs.setdefault('linewidths', linewidths)
+        if 'antialiaseds' not in kwargs and ec.lower() == "none":
+                kwargs['antialiaseds'] = False
 
+
         collection = mcoll.PolyCollection(verts, **kwargs)
 
         collection.set_alpha(alpha)

Modified: trunk/matplotlib/lib/matplotlib/contour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/contour.py	2011-01-16 01:00:37 UTC (rev 8920)
+++ trunk/matplotlib/lib/matplotlib/contour.py	2011-01-16 01:09:08 UTC (rev 8921)
@@ -662,7 +662,14 @@
         self.colors = kwargs.get('colors', None)
         norm = kwargs.get('norm', None)
         self.extend = kwargs.get('extend', 'neither')
-        self.antialiased = kwargs.get('antialiased', True)
+        self.antialiased = kwargs.get('antialiased', None)
+        if self.antialiased is None and self.filled:
+            self.antialiased = False # eliminate artifacts; we are not
+                                     # stroking the boundaries.
+            # The default for line contours will be taken from
+            # the LineCollection default, which uses the
+            # rcParams['lines.antialiased']
+
         self.nchunk = kwargs.get('nchunk', 0)
         self.locator = kwargs.get('locator', None)
         if (isinstance(norm, colors.LogNorm)
@@ -734,11 +741,15 @@
             tlinewidths = self._process_linewidths()
             self.tlinewidths = tlinewidths
             tlinestyles = self._process_linestyles()
+            aa = self.antialiased
+            if aa is not None:
+                aa = (self.antialiased,)
             for level, width, lstyle, segs in \
                     zip(self.levels, tlinewidths, tlinestyles, self.allsegs):
                 # Default zorder taken from LineCollection
                 zorder = kwargs.get('zorder', 2)
                 col = collections.LineCollection(segs,
+                                     antialiaseds = aa,
                                      linewidths = width,
                                      linestyle = lstyle,
                                      alpha=self.alpha,
@@ -1358,6 +1369,10 @@
             Override axis units by specifying an instance of a
             :class:`matplotlib.units.ConversionInterface`.
 
+          *antialiased*: [ True | False ]
+            enable antialiasing, overriding the defaults.  For
+            filled contours, the default is True.  For line contours,
+            it is taken from rcParams['lines.antialiased'].
 
         contour-only keyword arguments:
 
@@ -1385,9 +1400,6 @@
 
         contourf-only keyword arguments:
 
-          *antialiased*: [ True | False ]
-            enable antialiasing
-
           *nchunk*: [ 0 | integer ]
             If 0, no subdivision of the domain. Specify a positive integer to
             divide the domain into subdomains of roughly *nchunk* by *nchunk*


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911
   + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764,8769-8770,8772,8774,8776,8778,8780,8785,8788,8790,8794,8798-8799,8808,8815,8830,8835,8841-8842,8844-8846,8870-8899,8902-8906,8908,8911,8920


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8920
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8920&view=rev
Author:   efiring
Date:     2011-01-16 01:00:37 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
Change pcolor and contourf default antialiasing to False; closes 3151847.

To avoid misplaced boundaries and artifacts with alpha < 1, we do not
stroke the pcolor and contourf patch boundaries by default; but without
that stroking, antialiasing produces boundary artifacts that tend to
be visually disturbing.  Therefore we sacrifice antialiasing for these
patches.

Modified Paths:
--------------
    branches/v1_0_maint/lib/matplotlib/axes.py
    branches/v1_0_maint/lib/matplotlib/contour.py

Modified: branches/v1_0_maint/lib/matplotlib/axes.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/axes.py	2011-01-15 19:49:09 UTC (rev 8919)
+++ branches/v1_0_maint/lib/matplotlib/axes.py	2011-01-16 01:00:37 UTC (rev 8920)
@@ -6921,14 +6921,14 @@
 
         %(PolyCollection)s
 
-        Note: the default *antialiaseds* is taken from
+        Note: the default *antialiaseds* is False if the default
+        *edgecolors*="none" is used.  This eliminates artificial lines
+        at patch boundaries, and works regardless of the value of
+        alpha.  If *edgecolors* is not "none", then the default
+        *antialiaseds* is taken from
         rcParams['patch.antialiased'], which defaults to *True*.
-        In some cases, particularly if *alpha* is 1,
-        you may be able to reduce rendering artifacts (light or
-        dark patch boundaries) by setting it to *False*.  An
-        alternative it to set *edgecolors* to 'face'.  Unfortunately,
-        there seems to be no single combination of parameters that
-        eliminates artifacts under all conditions.
+        Stroking the edges may be preferred if *alpha* is 1, but
+        will cause artifacts otherwise.
 
         """
 
@@ -6977,22 +6977,29 @@
 
         C = compress(ravelmask, ma.filled(C[0:Ny-1,0:Nx-1]).ravel())
 
+        linewidths = (0.25,)
+        if 'linewidth' in kwargs:
+            kwargs['linewidths'] = kwargs.pop('linewidth')
+        kwargs.setdefault('linewidths', linewidths)
+
         if shading == 'faceted':
             edgecolors = 'k',
         else:
             edgecolors = 'none'
-        linewidths = (0.25,)
-        # Not sure if we want to have the following, or just trap
-        # invalid kwargs and raise an exception.
         if 'edgecolor' in kwargs:
             kwargs['edgecolors'] = kwargs.pop('edgecolor')
-        if 'linewidth' in kwargs:
-            kwargs['linewidths'] = kwargs.pop('linewidth')
+        ec = kwargs.setdefault('edgecolors', edgecolors)
+
+        # aa setting will default via collections to patch.antialiased
+        # unless the boundary is not stroked, in which case the
+        # default will be False; with unstroked boundaries, aa
+        # makes artifacts that are often disturbing.
         if 'antialiased' in kwargs:
             kwargs['antialiaseds'] = kwargs.pop('antialiased')
-        kwargs.setdefault('edgecolors', edgecolors)
-        kwargs.setdefault('linewidths', linewidths)
+        if 'antialiaseds' not in kwargs and ec.lower() == "none":
+                kwargs['antialiaseds'] = False
 
+
         collection = mcoll.PolyCollection(verts, **kwargs)
 
         collection.set_alpha(alpha)

Modified: branches/v1_0_maint/lib/matplotlib/contour.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/contour.py	2011-01-15 19:49:09 UTC (rev 8919)
+++ branches/v1_0_maint/lib/matplotlib/contour.py	2011-01-16 01:00:37 UTC (rev 8920)
@@ -662,7 +662,14 @@
         self.colors = kwargs.get('colors', None)
         norm = kwargs.get('norm', None)
         self.extend = kwargs.get('extend', 'neither')
-        self.antialiased = kwargs.get('antialiased', True)
+        self.antialiased = kwargs.get('antialiased', None)
+        if self.antialiased is None and self.filled:
+            self.antialiased = False # eliminate artifacts; we are not
+                                     # stroking the boundaries.
+            # The default for line contours will be taken from
+            # the LineCollection default, which uses the
+            # rcParams['lines.antialiased']
+
         self.nchunk = kwargs.get('nchunk', 0)
         self.locator = kwargs.get('locator', None)
         if (isinstance(norm, colors.LogNorm)
@@ -734,11 +741,15 @@
             tlinewidths = self._process_linewidths()
             self.tlinewidths = tlinewidths
             tlinestyles = self._process_linestyles()
+            aa = self.antialiased
+            if aa is not None:
+                aa = (self.antialiased,)
             for level, width, lstyle, segs in \
                     zip(self.levels, tlinewidths, tlinestyles, self.allsegs):
                 # Default zorder taken from LineCollection
                 zorder = kwargs.get('zorder', 2)
                 col = collections.LineCollection(segs,
+                                     antialiaseds = aa,
                                      linewidths = width,
                                      linestyle = lstyle,
                                      alpha=self.alpha,
@@ -1358,6 +1369,10 @@
             Override axis units by specifying an instance of a
             :class:`matplotlib.units.ConversionInterface`.
 
+          *antialiased*: [ True | False ]
+            enable antialiasing, overriding the defaults.  For
+            filled contours, the default is True.  For line contours,
+            it is taken from rcParams['lines.antialiased'].
 
         contour-only keyword arguments:
 
@@ -1385,9 +1400,6 @@
 
         contourf-only keyword arguments:
 
-          *antialiased*: [ True | False ]
-            enable antialiasing
-
           *nchunk*: [ 0 | integer ]
             If 0, no subdivision of the domain. Specify a positive integer to
             divide the domain into subdomains of roughly *nchunk* by *nchunk*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8919
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8919&view=rev
Author:   jswhit
Date:     2011-01-15 19:49:09 +0000 (Sat, 15 Jan 2011)

Log Message:
-----------
fix docstring typo

Modified Paths:
--------------
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2011-01-14 18:16:42 UTC (rev 8918)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2011-01-15 19:49:09 UTC (rev 8919)
@@ -257,7 +257,7 @@
                   ``N``, ``NW``, and ``W``.
  celestial        use astronomical conventions for longitude (i.e.
                   negative longitudes to the east of 0). Default False.
-                  Implies ``resolution=None``.
+                  Implies resolution=None.
  ax               set default axes instance
                   (default None - matplotlib.pyplot.gca() may be used
                   to get the current axes instance).


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8918
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8918&view=rev
Author:   mdboom
Date:     2011-01-14 18:16:42 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
Merged revisions 8917 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8917 | mdboom | 2011-01-14 13:15:33 -0500 (Fri, 14 Jan 2011) | 2 lines
  
  Fix doc build with recent versions of Sphinx (reported by Sandro Tosi)
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8913 /trunk/matplotlib:1-7315
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8917 /trunk/matplotlib:1-7315

Modified: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py	2011-01-14 18:15:33 UTC (rev 8917)
+++ trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py	2011-01-14 18:16:42 UTC (rev 8918)
@@ -346,7 +346,7 @@
         del options['nofigs']
 
     formats = setup.config.plot_formats
-    if type(formats) == str:
+    if isinstance(formats, basestring):
         formats = eval(formats)
 
     fname = os.path.basename(plot_path)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8917
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8917&view=rev
Author:   mdboom
Date:     2011-01-14 18:15:33 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
Fix doc build with recent versions of Sphinx (reported by Sandro Tosi)

Modified Paths:
--------------
    branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py

Modified: branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py	2011-01-14 05:42:04 UTC (rev 8916)
+++ branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py	2011-01-14 18:15:33 UTC (rev 8917)
@@ -346,7 +346,7 @@
         del options['nofigs']
 
     formats = setup.config.plot_formats
-    if type(formats) == str:
+    if isinstance(formats, basestring):
         formats = eval(formats)
 
     fname = os.path.basename(plot_path)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8916
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8916&view=rev
Author:   leejjoon
Date:     2011-01-14 05:42:04 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
add demo_gridspec06.py and update gridspec doc (original patch from Paul Ivanov)

Modified Paths:
--------------
    trunk/matplotlib/doc/users/gridspec.rst

Added Paths:
-----------
    trunk/matplotlib/doc/users/plotting/examples/demo_gridspec06.py

Modified: trunk/matplotlib/doc/users/gridspec.rst
===================================================================
--- trunk/matplotlib/doc/users/gridspec.rst	2011-01-13 19:07:12 UTC (rev 8915)
+++ trunk/matplotlib/doc/users/gridspec.rst	2011-01-14 05:42:04 UTC (rev 8916)
@@ -129,6 +129,16 @@
 .. plot:: users/plotting/examples/demo_gridspec04.py
 
 
+A Complex Nested GridSpec using SubplotSpec
+===========================================
+
+Here's a more sophisticated example of nested gridspec where we put
+a box around each cell of the outer 4x4 grid, by hiding appropriate 
+spines in each of the inner 3x3 grids. ::
+
+.. plot:: users/plotting/examples/demo_gridspec06.py
+
+
 GridSpec with Varying Cell Sizes
 ================================
 

Added: trunk/matplotlib/doc/users/plotting/examples/demo_gridspec06.py
===================================================================
--- trunk/matplotlib/doc/users/plotting/examples/demo_gridspec06.py	                        (rev 0)
+++ trunk/matplotlib/doc/users/plotting/examples/demo_gridspec06.py	2011-01-14 05:42:04 UTC (rev 8916)
@@ -0,0 +1,53 @@
+import matplotlib.pyplot as plt
+import matplotlib.gridspec as gridspec
+import numpy as np
+
+try:
+    from itertools import product
+except ImportError:
+    # product is new in v 2.6
+    def product(*args, **kwds):
+        pools = map(tuple, args) * kwds.get('repeat', 1)
+        result = [[]]
+        for pool in pools:
+            result = [x+[y] for x in result for y in pool]
+        for prod in result:
+            yield tuple(prod)
+
+
+def squiggle_xy(a, b, c, d, i=np.arange(0.0, 2*np.pi, 0.05)):
+    return np.sin(i*a)*np.cos(i*b), np.sin(i*c)*np.cos(i*d)
+
+f = plt.figure(figsize=(8, 8))
+
+# gridspec inside gridspec
+outer_grid = gridspec.GridSpec(4, 4, wspace=0.0, hspace=0.0)
+
+for i in xrange(16):
+    inner_grid = gridspec.GridSpecFromSubplotSpec(3, 3,
+            subplot_spec=outer_grid[i], wspace=0.0, hspace=0.0)
+    a, b = int(i/4)+1,i%4+1
+    for j, (c, d) in enumerate(product(range(1, 4), repeat=2)):
+        ax = plt.Subplot(f, inner_grid[j])
+        ax.plot(*squiggle_xy(a, b, c, d))
+        ax.set_xticks([])
+        ax.set_yticks([])
+        f.add_subplot(ax)
+
+all_axes = f.get_axes()
+
+#show only the outside spines
+for ax in all_axes:
+    for sp in ax.spines.values():
+        sp.set_visible(False)
+    if ax.is_first_row():
+        ax.spines['top'].set_visible(True)
+    if ax.is_last_row():
+        ax.spines['bottom'].set_visible(True)
+    if ax.is_first_col():
+        ax.spines['left'].set_visible(True)
+    if ax.is_last_col():
+        ax.spines['right'].set_visible(True)
+
+plt.show()
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.