matplotlib-checkins — Commit notification. DO NOT POST to this list, just subscribe to it.

SF.net SVN: matplotlib:[7960] trunk/matplotlib/lib/matplotlib/image.py

[<as...@us...>]

Revision: 7960
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7960&view=rev
Author:   astraw
Date:     2009-11-12 23:05:45 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
image.py: change default image zorder 1 -> 0

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

Modified: trunk/matplotlib/lib/matplotlib/image.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/image.py	2009-11-12 22:49:37 UTC (rev 7959)
+++ trunk/matplotlib/lib/matplotlib/image.py	2009-11-12 23:05:45 UTC (rev 7960)
@@ -27,7 +27,7 @@
 from matplotlib.transforms import BboxBase
 
 class _AxesImageBase(martist.Artist, cm.ScalarMappable):
-    zorder = 1
+    zorder = 0
     # map interpolation strings to module constants
     _interpd = {
         'nearest'  : _image.NEAREST,
@@ -687,7 +687,7 @@
         self.update_dict['array'] = True
 
 class FigureImage(martist.Artist, cm.ScalarMappable):
-    zorder = 1
+    zorder = 0
     def __init__(self, fig,
                  cmap = None,
                  norm = None,
@@ -805,7 +805,6 @@
     """
     The Image class whose size is determined by the given bbox.
     """
-    zorder = 1
     def __init__(self, bbox,
                  cmap = None,
                  norm = None,


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

SF.net SVN: matplotlib:[7959] trunk/matplotlib/lib/matplotlib/backend_bases .py

[<as...@us...>]

Revision: 7959
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7959&view=rev
Author:   astraw
Date:     2009-11-12 22:49:37 +0000 (Thu, 12 Nov 2009)

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

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

Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py	2009-11-12 22:47:43 UTC (rev 7958)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py	2009-11-12 22:49:37 UTC (rev 7959)
@@ -335,7 +335,7 @@
 
     def option_image_nocomposite(self):
         """
-        overwrite this method for renderers that do not necessarily
+        override this method for renderers that do not necessarily
         want to rescale and composite raster images. (like SVG)
         """
         return False


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

SF.net SVN: matplotlib:[7958] trunk/matplotlib/lib/matplotlib/axes.py

[<as...@us...>]

Revision: 7958
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7958&view=rev
Author:   astraw
Date:     2009-11-12 22:47:43 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
axes.py: remove redundant variable

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

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009-11-12 22:17:24 UTC (rev 7957)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009-11-12 22:47:43 UTC (rev 7958)
@@ -1698,7 +1698,7 @@
             artists.extend(self.spines.itervalues())
 
 
-        dsu = [ (a.zorder, i, a) for i, a in enumerate(artists)
+        dsu = [ (a.zorder, a) for a in artists
                 if not a.get_animated() ]
         dsu.sort()
 
@@ -1721,7 +1721,7 @@
 
         if len(self.images)<=1 or renderer.option_image_nocomposite():
             for im in self.images:
-                dsu.append( (im.zorder, len(dsu), im) )
+                dsu.append( (im.zorder, im) )
             dsu.sort() # re-sort with images now
         else:
             # make a composite image blending alpha
@@ -1757,11 +1757,11 @@
             gc.restore()
 
         if dsu_rasterized:
-            for zorder, i, a in dsu_rasterized:
+            for zorder, a in dsu_rasterized:
                 a.draw(renderer)
             renderer.stop_rasterizing()
 
-        for zorder, i, a in dsu:
+        for zorder, a in dsu:
             a.draw(renderer)
 
         renderer.close_group('axes')


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

SF.net SVN: matplotlib:[7957] trunk/matplotlib/doc/devel/coding_guide.rst

[<as...@us...>]

Revision: 7957
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7957&view=rev
Author:   astraw
Date:     2009-11-12 22:17:24 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
docs: update git guide

Modified Paths:
--------------
    trunk/matplotlib/doc/devel/coding_guide.rst

Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst	2009-11-12 20:53:36 UTC (rev 7956)
+++ trunk/matplotlib/doc/devel/coding_guide.rst	2009-11-12 22:17:24 UTC (rev 7957)
@@ -166,15 +166,14 @@
 ~~~~~~~~~~~~~~~~~~~~~~
 
 There is an experimental `matplotlib github mirror`_ of the subversion
-repository. To make a local clone of it in the directory ``mpl.git``,
+repository. To make a local clone of it in the directory ``matplotlib``,
 enter the following commands::
 
+  # Download the entire git repository into "matplotlib", name the source repository "svn".
+  git clone --origin svn gi...@gi...:astraw/matplotlib.git
 
-  # Download the entire git repository into "mpl.git", name the source repository "svn".
-  git clone --origin svn gi...@gi...:astraw/matplotlib.git mpl.git
-
   # Change into the newly created git repository.
-  cd mpl.git
+  cd matplotlib
 
   # Setup the subversion mirroring.
   git svn init --trunk=trunk/matplotlib --prefix=svn/ https://matplotlib.svn.sourceforge.net/svnroot/matplotlib
@@ -187,12 +186,16 @@
 To install from this cloned repository, use the commands in the
 :ref:`svn installation <install-svn>` section::
 
-  > cd mpl.git
+  > cd matplotlib
   > python setup.py install
 
-Using git
-~~~~~~~~~
+Note that it is not possible to interact with the matplotlib
+maintenance branches through git due to different representations of
+source code repositories in svnmerge and git.
 
+An example git workflow
+~~~~~~~~~~~~~~~~~~~~~~~
+
 The following is a suggested workflow for git/git-svn.
 
 Start with a virgin tree in sync with the svn trunk on the git branch
@@ -227,11 +230,64 @@
   git checkout whizbang-branch
   git rebase trunk
 
-Working on a maintenance branch from git
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+How was this git mirror set up?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The matplotlib maintenance branches are not available through git.
+These are notes for those interested in mirroring a subversion
+repository on github. I pieced this together by lots of
+trial-and-error.
 
+Step 1: Create a local mirror of the svn repository
+
+::
+
+  rsync -avzP rsync://matplotlib.svn.sourceforge.net/svn/matplotlib/ matplotlib-svn-rsync/
+
+Step 2: Import the svn history into a new git repository
+
+::
+
+  #!/bin/bash
+  set -e
+
+  TARGET=mpl.git.fixed
+  GIT=/home/astraw/git/bin/git
+  TRUNKBRANCH=trunk
+  SVNBRANCHPREFIX="svn/"
+
+  rm -rf $TARGET
+  mkdir $TARGET
+  cd $TARGET
+
+  $GIT init
+  $GIT svn init --rewrite-root=https://matplotlib.svn.sourceforge.net/svnroot/matplotlib \
+     --trunk=trunk/matplotlib --prefix=$SVNBRANCHPREFIX file:///mnt/workdisk/tmp/matplotlib-svn-rsync
+  $GIT svn fetch
+
+  # now, make master branch track ${SVNBRANCHPREFIX}trunk
+  $GIT checkout master -b tmp
+  $GIT branch -d master
+  $GIT checkout ${SVNBRANCHPREFIX}trunk -b $TRUNKBRANCH
+  $GIT branch -D tmp
+  $GIT svn rebase -l
+
+Step 3: Upload the git repository to github
+
+::
+
+  #!/bin/bash
+  set -e
+
+  TARGET=mpl.git.fixed
+  GIT=/home/astraw/git/bin/git
+  TRUNKBRANCH=trunk
+  SVNBRANCHPREFIX="svn/"
+
+  cd $TARGET
+
+  $GIT remote add github gi...@gi...:astraw/matplotlib.git
+  git push github $TRUNKBRANCH:master
+
 .. _style-guide:
 
 Style guide


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

SF.net SVN: matplotlib:[7956] trunk/matplotlib/lib/matplotlib

[<md...@us...>]

Revision: 7956
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7956&view=rev
Author:   mdboom
Date:     2009-11-12 20:53:36 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
Fix a number of font manager issues: 
1) AFM fonts now store stretch information in the FontManager database
2) pdf.use14corefonts and ps.useafm will now only use the afm files for their respective formats
3) The fontList.cache file is now versioned -- if the version doesn't match the current version of matplotlib it is thrown away and regenerated

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
    trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
    trunk/matplotlib/lib/matplotlib/font_manager.py
    trunk/matplotlib/lib/matplotlib/mathtext.py

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py	2009-11-12 17:57:13 UTC (rev 7955)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py	2009-11-12 20:53:36 UTC (rev 7956)
@@ -363,6 +363,8 @@
         else:
             raise ValueError("filename must be a path or a file-like object")
 
+        self._core14fontdir = os.path.join(
+            rcParams['datapath'], 'fonts', 'pdfcorefonts')
         self.fh = fh
         self.currentstream = None # stream object to write to, if any
         fh.write("%PDF-1.4\n")    # 1.4 is the first version to have alpha
@@ -507,7 +509,11 @@
         if is_string_like(fontprop):
             filename = fontprop
         elif rcParams['pdf.use14corefonts']:
-            filename = findfont(fontprop, fontext='afm')
+            filename = findfont(
+                fontprop, fontext='afm', directory=self._core14fontdir)
+            if filename is None:
+                filename = findfont(
+                    "Helvetica", fontext='afm', directory=self._core14fontdir)
         else:
             filename = findfont(fontprop)
 
@@ -1743,7 +1749,12 @@
         key = hash(prop)
         font = self.afm_font_cache.get(key)
         if font is None:
-            filename = findfont(prop, fontext='afm')
+            filename = findfont(
+                prop, fontext='afm', directory=self.file._core14fontdir)
+            if filename is None:
+                filename = findfont(
+                    "Helvetica", fontext='afm',
+                    directory=self.file._core14fontdir)
             font = self.afm_font_cache.get(filename)
             if font is None:
                 fh = file(filename)

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_ps.py	2009-11-12 17:57:13 UTC (rev 7955)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_ps.py	2009-11-12 20:53:36 UTC (rev 7956)
@@ -170,6 +170,9 @@
         self.used_characters = {}
         self.mathtext_parser = MathTextParser("PS")
 
+        self._afm_font_dir = os.path.join(
+            rcParams['datapath'], 'fonts', 'afm')
+
     def track_characters(self, font, s):
         """Keeps track of which characters are required from
         each font."""
@@ -312,10 +315,13 @@
         key = hash(prop)
         font = self.afmfontd.get(key)
         if font is None:
-            fname = findfont(prop, fontext='afm')
+            fname = findfont(prop, fontext='afm', directory=self._afm_font_dir)
+            if fname is None:
+                fname = findfont(
+                    "Helvetica", fontext='afm', directory=self._afm_font_dir)
             font = self.afmfontd.get(fname)
             if font is None:
-                font = AFM(file(findfont(prop, fontext='afm')))
+                font = AFM(file(fname))
                 self.afmfontd[fname] = font
             self.afmfontd[key] = font
         return font

Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py	2009-11-12 17:57:13 UTC (rev 7955)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py	2009-11-12 20:53:36 UTC (rev 7956)
@@ -301,7 +301,7 @@
     except OSError:
         # Calling fc-list did not work, so we'll just return nothing
         return fontfiles
-    
+
     if pipe.returncode == 0:
         for line in output.split('\n'):
             fname = line.split(':')[0]
@@ -463,8 +463,7 @@
     #  Relative stretches are: wider, narrower
     #  Child value is: inherit
 
-    #  !!!!  Incomplete
-    if   sfnt4.find('narrow') >= 0 or sfnt4.find('condensed') >= 0 or \
+    if sfnt4.find('narrow') >= 0 or sfnt4.find('condensed') >= 0 or \
            sfnt4.find('cond') >= 0:
         stretch = 'condensed'
     elif sfnt4.find('demi cond') >= 0:
@@ -502,6 +501,7 @@
     """
 
     name = font.get_familyname()
+    fontname = font.get_fontname().lower()
 
     #  Styles are: italic, oblique, and normal (default)
 
@@ -532,10 +532,16 @@
     #    and ultra-expanded.
     #  Relative stretches are: wider, narrower
     #  Child value is: inherit
+    if fontname.find('narrow') >= 0 or fontname.find('condensed') >= 0 or \
+           fontname.find('cond') >= 0:
+        stretch = 'condensed'
+    elif fontname.find('demi cond') >= 0:
+        stretch = 'semi-condensed'
+    elif fontname.find('wide') >= 0 or fontname.find('expanded') >= 0:
+        stretch = 'expanded'
+    else:
+        stretch = 'normal'
 
-    # !!!!  Incomplete
-    stretch = 'normal'
-
     #  Sizes can be absolute and relative.
     #  Absolute sizes are: xx-small, x-small, small, medium, large, x-large,
     #    and xx-large.
@@ -960,12 +966,20 @@
     matches the specification.  If no good enough match is found, a
     default font is returned.
     """
+    # Increment this version number whenever the font cache data
+    # format or behavior has changed and requires a existing font
+    # cache files to be rebuilt.
+    __version__ = 5
+
     def __init__(self, size=None, weight='normal'):
+        self._version = self.__version__
+
         self.__default_weight = weight
         self.default_size = size
 
         paths = [os.path.join(rcParams['datapath'], 'fonts', 'ttf'),
-                 os.path.join(rcParams['datapath'], 'fonts', 'afm')]
+                 os.path.join(rcParams['datapath'], 'fonts', 'afm'),
+                 os.path.join(rcParams['datapath'], 'fonts', 'pdfcorefonts')]
 
         #  Create list of font paths
         for pathname in ['TTFPATH', 'AFMPATH']:
@@ -982,32 +996,23 @@
         #  Load TrueType fonts and create font dictionary.
 
         self.ttffiles = findSystemFonts(paths) + findSystemFonts()
+        self.defaultFont = {}
 
         for fname in self.ttffiles:
             verbose.report('trying fontname %s' % fname, 'debug')
             if fname.lower().find('vera.ttf')>=0:
-                self.defaultFont = fname
+                self.defaultFont['ttf'] = fname
                 break
         else:
             # use anything
-            self.defaultFont = self.ttffiles[0]
+            self.defaultFont['ttf'] = self.ttffiles[0]
 
         self.ttflist = createFontList(self.ttffiles)
 
-        if rcParams['pdf.use14corefonts']:
-            # Load only the 14 PDF core fonts. These fonts do not need to be
-            # embedded; every PDF viewing application is required to have them:
-            # Helvetica, Helvetica-Bold, Helvetica-Oblique, Helvetica-BoldOblique,
-            # Courier, Courier-Bold, Courier-Oblique, Courier-BoldOblique,
-            # Times-Roman, Times-Bold, Times-Italic, Times-BoldItalic, Symbol,
-            # ZapfDingbats.
-            afmpath = os.path.join(rcParams['datapath'],'fonts','pdfcorefonts')
-            afmfiles = findSystemFonts(afmpath, fontext='afm')
-            self.afmlist = createFontList(afmfiles, fontext='afm')
-        else:
-            self.afmfiles = findSystemFonts(paths, fontext='afm') + \
-                            findSystemFonts(fontext='afm')
-            self.afmlist = createFontList(self.afmfiles, fontext='afm')
+        self.afmfiles = findSystemFonts(paths, fontext='afm') + \
+            findSystemFonts(fontext='afm')
+        self.afmlist = createFontList(self.afmfiles, fontext='afm')
+        self.defaultFont['afm'] = None
 
         self.ttf_lookup_cache = {}
         self.afm_lookup_cache = {}
@@ -1151,7 +1156,7 @@
             return 1.0
         return abs(sizeval1 - sizeval2) / 72.0
 
-    def findfont(self, prop, fontext='ttf'):
+    def findfont(self, prop, fontext='ttf', directory=None):
         """
         Search the font list for the font that most closely matches
         the :class:`FontProperties` *prop*.
@@ -1162,6 +1167,9 @@
         returned.  If no matches below a certain threshold are found,
         the default font (usually Vera Sans) is returned.
 
+        `directory`, is specified, will only return fonts from the
+        given directory (or subdirectory of that directory).
+
         The result is cached, so subsequent lookups don't have to
         perform the O(n) nearest neighbor search.
 
@@ -1194,6 +1202,10 @@
         best_font = None
 
         for font in fontlist:
+            if (directory is not None and
+                os.path.commonprefix([font.fname, directory]) != directory):
+                print directory, font.fname, os.path.commonprefix([font.fname, directory])
+                continue
             # Matching family should have highest priority, so it is multiplied
             # by 10.0
             score = \
@@ -1211,8 +1223,8 @@
 
         if best_font is None or best_score >= 10.0:
             verbose.report('findfont: Could not match %s. Returning %s' %
-                           (prop, self.defaultFont))
-            result = self.defaultFont
+                           (prop, self.defaultFont[fontext]))
+            result = self.defaultFont[fontext]
         else:
             verbose.report('findfont: Matching %s to %s (%s) with score of %f' %
                            (prop, best_font.name, best_font.fname, best_score))
@@ -1289,16 +1301,16 @@
 
     try:
         fontManager = pickle_load(_fmcache)
-        fontManager.default_size = None
-        verbose.report("Using fontManager instance from %s" % _fmcache)
+        if (not hasattr(fontManager, '_version') or
+            fontManager._version != FontManager.__version__):
+            _rebuild()
+        else:
+            fontManager.default_size = None
+            verbose.report("Using fontManager instance from %s" % _fmcache)
     except:
         _rebuild()
 
     def findfont(prop, **kw):
         global fontManager
         font = fontManager.findfont(prop, **kw)
-        if not os.path.exists(font):
-            verbose.report("%s returned by pickled fontManager does not exist" % font)
-            _rebuild()
-            font =  fontManager.findfont(prop, **kw)
         return font

Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py	2009-11-12 17:57:13 UTC (rev 7955)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py	2009-11-12 20:53:36 UTC (rev 7956)
@@ -1032,7 +1032,11 @@
         self.glyphd = {}
         self.fonts = {}
 
-        filename = findfont(default_font_prop, fontext='afm')
+        filename = findfont(default_font_prop, fontext='afm',
+                            directory=self.basepath)
+        if filename is None:
+            filename = findfont('Helvetica', fontext='afm',
+                                directory=self.basepath)
         default_font = AFM(file(filename, 'r'))
         default_font.fname = filename
 


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

SF.net SVN: matplotlib:[7955] trunk/matplotlib/lib/matplotlib/font_manager. py

[<jo...@us...>]

Revision: 7955
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7955&view=rev
Author:   jouni
Date:     2009-11-12 17:57:13 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
Fix previous EINTR fix in case fc-list cannot be run

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

Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py	2009-11-12 17:31:19 UTC (rev 7954)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py	2009-11-12 17:57:13 UTC (rev 7955)
@@ -295,8 +295,13 @@
     fontext = get_fontext_synonyms(fontext)
 
     fontfiles = {}
-    pipe = subprocess.Popen(['fc-list', '', 'file'], stdout=subprocess.PIPE)
-    output = pipe.communicate()[0]
+    try:
+        pipe = subprocess.Popen(['fc-list', '', 'file'], stdout=subprocess.PIPE)
+        output = pipe.communicate()[0]
+    except OSError:
+        # Calling fc-list did not work, so we'll just return nothing
+        return fontfiles
+    
     if pipe.returncode == 0:
         for line in output.split('\n'):
             fname = line.split(':')[0]
@@ -1242,8 +1247,11 @@
     def fc_match(pattern, fontext):
         fontexts = get_fontext_synonyms(fontext)
         ext = "." + fontext
-        pipe = subprocess.Popen(['fc-match', '-sv', pattern], stdout=subprocess.PIPE)
-        output = pipe.communicate()[0]
+        try:
+            pipe = subprocess.Popen(['fc-match', '-sv', pattern], stdout=subprocess.PIPE)
+            output = pipe.communicate()[0]
+        except OSError:
+            return None
         if pipe.returncode == 0:
             for match in _fc_match_regex.finditer(output):
                 file = match.group(1)


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

SF.net SVN: matplotlib:[7954] trunk/matplotlib

[<md...@us...>]

Revision: 7954
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7954&view=rev
Author:   mdboom
Date:     2009-11-12 17:31:19 +0000 (Thu, 12 Nov 2009)

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

........
  r7952 | mdboom | 2009-11-12 12:27:34 -0500 (Thu, 12 Nov 2009) | 2 lines
  
  [2853659] Patch to fix EMF backend
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backends/backend_emf.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_99_maint:1-7944
   + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7952
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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_emf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_emf.py	2009-11-12 17:28:22 UTC (rev 7953)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_emf.py	2009-11-12 17:31:19 UTC (rev 7954)
@@ -46,17 +46,20 @@
                               other.get_weight(),
                               other.get_stretch(),
                               other.get_size())
-        self.__angle=angle
+        self._angle=angle
 
     def __hash__(self):
-        return hash( (FontProperties.__hash__(self), self.__angle))
+        return hash( (FontProperties.__hash__(self), self._angle))
 
     def __str__(self):
-        return str( (FontProperties.__str__(self), self.__angle))
+        return str( (FontProperties.__str__(self), self._angle))
 
     def set_angle(self,angle):
-        self.__angle=angle
+        self._angle=angle
 
+    def get_angle(self):
+        return self._angle
+
 # Hashable pen (line style) properties.
 class EMFPen:
     def __init__(self,emf,gc):


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png: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


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

SF.net SVN: matplotlib:[7953] trunk/matplotlib

[<jo...@us...>]

Revision: 7953
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7953&view=rev
Author:   jouni
Date:     2009-11-12 17:28:22 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
Fix EINTR problem in font_manager.py

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/font_manager.py

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-11-12 17:27:34 UTC (rev 7952)
+++ trunk/matplotlib/CHANGELOG	2009-11-12 17:28:22 UTC (rev 7953)
@@ -1,3 +1,8 @@
+2009-11-12 font_manager.py should no longer cause EINTR on Python 2.6
+           (but will on the 2.5 version of subprocess). Also the
+           fc-list command in that file was fixed so now it should
+           actually find the list of fontconfig fonts. - JKS
+
 2009-11-10 Single images, and all images in renderers with
            option_image_nocomposite (i.e. agg, macosx and the svg
            backend when rcParams['svg.image_noscale'] is True), are

Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py	2009-11-12 17:27:34 UTC (rev 7952)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py	2009-11-12 17:28:22 UTC (rev 7953)
@@ -42,7 +42,7 @@
             see license/LICENSE_TTFQUERY.
 """
 
-import os, sys, glob
+import os, sys, glob, subprocess
 try:
     set
 except NameError:
@@ -292,16 +292,12 @@
     grab all of the fonts the user wants to be made available to
     applications, without needing knowing where all of them reside.
     """
-    try:
-        import commands
-    except ImportError:
-        return {}
-
     fontext = get_fontext_synonyms(fontext)
 
     fontfiles = {}
-    status, output = commands.getstatusoutput("fc-list file")
-    if status == 0:
+    pipe = subprocess.Popen(['fc-list', '', 'file'], stdout=subprocess.PIPE)
+    output = pipe.communicate()[0]
+    if pipe.returncode == 0:
         for line in output.split('\n'):
             fname = line.split(':')[0]
             if (os.path.splitext(fname)[1][1:] in fontext and
@@ -1244,11 +1240,11 @@
     import re
 
     def fc_match(pattern, fontext):
-        import commands
         fontexts = get_fontext_synonyms(fontext)
         ext = "." + fontext
-        status, output = commands.getstatusoutput('fc-match -sv "%s"' % pattern)
-        if status == 0:
+        pipe = subprocess.Popen(['fc-match', '-sv', pattern], stdout=subprocess.PIPE)
+        output = pipe.communicate()[0]
+        if pipe.returncode == 0:
             for match in _fc_match_regex.finditer(output):
                 file = match.group(1)
                 if os.path.splitext(file)[1][1:] in fontexts:


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

SF.net SVN: matplotlib:[7952] branches/v0_99_maint/lib/matplotlib/backends/ backend_emf.py

[<md...@us...>]

Revision: 7952
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7952&view=rev
Author:   mdboom
Date:     2009-11-12 17:27:34 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
[2853659] Patch to fix EMF backend

Modified Paths:
--------------
    branches/v0_99_maint/lib/matplotlib/backends/backend_emf.py

Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_emf.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_emf.py	2009-11-11 23:59:23 UTC (rev 7951)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_emf.py	2009-11-12 17:27:34 UTC (rev 7952)
@@ -42,17 +42,20 @@
                               other.get_weight(),
                               other.get_stretch(),
                               other.get_size())
-        self.__angle=angle
+        self._angle=angle
 
     def __hash__(self):
-        return hash( (FontProperties.__hash__(self), self.__angle))
+        return hash( (FontProperties.__hash__(self), self._angle))
 
     def __str__(self):
-        return str( (FontProperties.__str__(self), self.__angle))
+        return str( (FontProperties.__str__(self), self._angle))
 
     def set_angle(self,angle):
-        self.__angle=angle
+        self._angle=angle
 
+    def get_angle(self):
+        return self._angle
+
 # Hashable pen (line style) properties.
 class EMFPen:
     def __init__(self,emf,gc):


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

SF.net SVN: matplotlib:[7951] trunk/matplotlib/lib/matplotlib/axes.py

[<lee...@us...>]

Revision: 7951
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7951&view=rev
Author:   leejjoon
Date:     2009-11-11 23:59:23 +0000 (Wed, 11 Nov 2009)

Log Message:
-----------
drawing images respect zorder among images even for noncomposite backend

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

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009-11-10 21:03:51 UTC (rev 7950)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009-11-11 23:59:23 UTC (rev 7951)
@@ -1727,9 +1727,12 @@
             # make a composite image blending alpha
             # list of (mimage.Image, ox, oy)
 
+            zorder_images = [(im.zorder, im) for im in self.images \
+                             if im.get_visible()]
+            zorder_images.sort()
+            
             mag = renderer.get_image_magnification()
-            ims = [(im.make_image(mag),0,0)
-                   for im in self.images if im.get_visible()]
+            ims = [(im.make_image(mag),0,0) for z,im in zorder_images]
 
 
             l, b, r, t = self.bbox.extents


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

SF.net SVN: matplotlib:[7950] trunk/matplotlib

[<as...@us...>]

Revision: 7950
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7950&view=rev
Author:   astraw
Date:     2009-11-10 21:03:51 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
use image zorder when drawing

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

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-11-07 13:29:12 UTC (rev 7949)
+++ trunk/matplotlib/CHANGELOG	2009-11-10 21:03:51 UTC (rev 7950)
@@ -1,3 +1,12 @@
+2009-11-10 Single images, and all images in renderers with
+           option_image_nocomposite (i.e. agg, macosx and the svg
+           backend when rcParams['svg.image_noscale'] is True), are
+           now drawn respecting the zorder relative to other
+           artists. (Note that there may now be inconsistencies across
+           backends when more than one image is drawn at varying
+           zorders, but this change introduces correct behavior for
+           the backends in which it's easy to do so.)
+
 2009-10-21 Make AutoDateLocator more configurable by adding options
            to control the maximum and minimum number of ticks. Also
            add control of the intervals to be used for ticking. This

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009-11-07 13:29:12 UTC (rev 7949)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009-11-10 21:03:51 UTC (rev 7950)
@@ -1721,7 +1721,8 @@
 
         if len(self.images)<=1 or renderer.option_image_nocomposite():
             for im in self.images:
-                im.draw(renderer)
+                dsu.append( (im.zorder, len(dsu), im) )
+            dsu.sort() # re-sort with images now
         else:
             # make a composite image blending alpha
             # list of (mimage.Image, ox, oy)


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

SF.net SVN: matplotlib:[7949] trunk/toolkits/basemap/geos-2.2.3/

[<js...@us...>]

Revision: 7949
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7949&view=rev
Author:   jswhit
Date:     2009-11-07 13:29:12 +0000 (Sat, 07 Nov 2009)

Log Message:
-----------
obsolete - replaced by geos-3.1.1

Removed Paths:
-------------
    trunk/toolkits/basemap/geos-2.2.3/


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

SF.net SVN: matplotlib:[7948] trunk/matplotlib

[<lee...@us...>]

Revision: 7948
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7948&view=rev
Author:   leejjoon
Date:     2009-11-07 06:53:49 +0000 (Sat, 07 Nov 2009)

Log Message:
-----------
textpath.get_glyph_tex tries set the font charmap

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/textpath.py
    trunk/matplotlib/src/ft2font.cpp
    trunk/matplotlib/src/ft2font.h

Modified: trunk/matplotlib/lib/matplotlib/textpath.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/textpath.py	2009-11-06 22:33:34 UTC (rev 7947)
+++ trunk/matplotlib/lib/matplotlib/textpath.py	2009-11-07 06:53:49 UTC (rev 7948)
@@ -19,7 +19,7 @@
 
     FONT_SCALE = 50.
     DPI = 72
-    
+
     def __init__(self):
         """
         Initialization
@@ -44,7 +44,7 @@
 
     def _get_hinting_flag(self):
         return LOAD_NO_HINTING
-    
+
     def _get_char_id(self, font, ccode):
         """
         Return a unique id for the given font and character-code set.
@@ -64,7 +64,7 @@
 
     def glyph_to_path(self, glyph, currx=0.):
         """
-        convert the ft2font glyph to vertices and codes. 
+        convert the ft2font glyph to vertices and codes.
         """
         #Mostly copied from backend_svg.py.
 
@@ -102,14 +102,14 @@
 
         *s*
           text to be converted
-          
+
         *usetex*
           If True, use matplotlib usetex mode.
 
         *ismath*
           If True, use mathtext parser. Effective only if usetex == False.
 
-          
+
         """
         if usetex==False:
             if ismath == False:
@@ -121,26 +121,26 @@
             glyph_info, glyph_map, rects = self.get_glyphs_tex(prop, s)
 
         verts, codes = [], []
-        
+
         for glyph_id, xposition, yposition, scale in glyph_info:
             verts1, codes1 = glyph_map[glyph_id]
             if verts1:
-                verts1 = np.array(verts1)*scale + [xposition, yposition] 
+                verts1 = np.array(verts1)*scale + [xposition, yposition]
             verts.extend(verts1)
             codes.extend(codes1)
 
         for verts1, codes1 in rects:
             verts.extend(verts1)
             codes.extend(codes1)
-            
+
         return verts, codes
 
-            
+
     def get_glyphs_with_font(self, font, s, glyph_map=None,
                              return_new_glyphs_only=False):
         """
         convert the string *s* to vertices and codes using the
-        provided ttf font. 
+        provided ttf font.
         """
 
         # Mostly copied from backend_svg.py.
@@ -151,7 +151,7 @@
         currx = 0
         xpositions = []
         glyph_ids = []
-        
+
         if glyph_map is None:
             glyph_map = dict()
 
@@ -190,14 +190,14 @@
             glyph_ids.append(char_id)
 
             currx += horiz_advance
-            
+
             lastgind = gind
 
         ypositions = [0] * len(xpositions)
         sizes = [1.] * len(xpositions)
 
         rects = []
-        
+
         return zip(glyph_ids, xpositions, ypositions, sizes), glyph_map_new, rects
 
 
@@ -275,14 +275,14 @@
         """
 
         # codes are modstly borrowed from pdf backend.
-        
+
         texmanager = self.get_texmanager()
 
         if self.tex_font_map is None:
             self.tex_font_map = dviread.PsfontsMap(dviread.find_tex_file('pdftex.map'))
 
         fontsize = prop.get_size_in_points()
-        if hasattr(texmanager, "get_dvi"): # 
+        if hasattr(texmanager, "get_dvi"): #
             dvifilelike = texmanager.get_dvi(s, self.FONT_SCALE)
             dvi = dviread.DviFromFileLike(dvifilelike, self.DPI)
         else:
@@ -312,6 +312,10 @@
             if font_and_encoding is None:
                 font_bunch =  self.tex_font_map[dvifont.texname]
                 font = FT2Font(font_bunch.filename)
+                try:
+                    font.select_charmap(1094992451) # select ADOBE_CUSTOM
+                except ValueError:
+                    font.set_charmap(0)
                 if font_bunch.encoding:
                     enc = dviread.Encoding(font_bunch.encoding)
                 else:
@@ -322,25 +326,15 @@
                 font, enc = font_and_encoding
 
             ft2font_flag = LOAD_TARGET_LIGHT
-            if enc:
-                ng = font.get_name_index(enc.encoding[glyph])
-            else:
-                ng = glyph
 
-            char_id = self._get_char_id_ps(font, ng)
+            char_id = self._get_char_id_ps(font, glyph)
 
             if not char_id in glyph_map:
                 font.clear()
                 font.set_size(self.FONT_SCALE, self.DPI)
 
-                if ng == 0:
-                    # While 0 is a valid index (e.g., "-", "\Gamma"),
-                    # font.load_glyph(0) does not seem to work. This
-                    # may not be a general solution.
-                    glyph0 = font.load_glyph(128, flags=ft2font_flag)
-                else: 
-                    glyph0 = font.load_glyph(ng, flags=ft2font_flag)
-                    
+                glyph0 = font.load_char(glyph, flags=ft2font_flag)
+
                 glyph_map_new[char_id] = self.glyph_to_path(glyph0)
 
             glyph_ids.append(char_id)
@@ -349,7 +343,7 @@
             sizes.append(dvifont.size/self.FONT_SCALE)
 
         myrects = []
-        
+
         for ox, oy, h, w in page.boxes:
             vert1=[(ox, oy), (ox+w, oy), (ox+w, oy+h), (ox, oy+h), (ox, oy), (0,0)]
             code1 = [Path.MOVETO,
@@ -358,13 +352,14 @@
             myrects.append((vert1, code1))
 
 
-        return zip(glyph_ids, xpositions, ypositions, sizes), glyph_map, myrects
+        return zip(glyph_ids, xpositions, ypositions, sizes), \
+               glyph_map_new, myrects
 
 
 
 
-    
 
+
 from matplotlib.font_manager import FontProperties
 from matplotlib import rcParams
 from matplotlib.transforms import Affine2D
@@ -384,7 +379,7 @@
         it simply is a path, not an artist. You need to use the
         PathPatch (or other artists) to draw this path onto the
         canvas.
-        
+
         xy : position of the text.
         s : text
         size : font size
@@ -437,7 +432,7 @@
         Return the codes
         """
         return self._codes
-    
+
     vertices = property(_get_vertices)
     codes = property(_get_codes)
 
@@ -463,7 +458,7 @@
         Returns True if the given string *s* contains any mathtext.
         """
         # copied from Text.is_math_text -JJL
-        
+
         # Did we find an even number of non-escaped dollar signs?
         # If so, treat is as math text.
         dollar_count = s.count(r'$') - s.count(r'\$')
@@ -489,7 +484,7 @@
         else:
             clean_line, ismath = self.is_math_text(s)
             verts, codes = text_to_path.get_text_path(prop, clean_line, ismath=ismath)
-        
+
         return verts, codes
 
 

Modified: trunk/matplotlib/src/ft2font.cpp
===================================================================
--- trunk/matplotlib/src/ft2font.cpp	2009-11-06 22:33:34 UTC (rev 7947)
+++ trunk/matplotlib/src/ft2font.cpp	2009-11-07 06:53:49 UTC (rev 7948)
@@ -885,6 +885,24 @@
   return Py::Object();
 }
 
+char FT2Font::select_charmap__doc__[] =
+"select_charmap(i)\n"
+"\n"
+"select charmap i where i is one of the FT_Encoding number\n"
+;
+
+Py::Object
+FT2Font::select_charmap(const Py::Tuple & args) {
+  _VERBOSE("FT2Font::set_charmap");
+  args.verify_length(1);
+
+  unsigned long i = Py::Long(args[0]);
+  //if (FT_Select_Charmap( face, FT_ENCODING_ADOBE_CUSTOM ))
+  if (FT_Select_Charmap( face, (FT_Encoding) i ))
+    throw Py::ValueError("Could not set the charmap");
+  return Py::Object();
+}
+
 FT_BBox
 FT2Font::compute_string_bbox(  ) {
   _VERBOSE("FT2Font::compute_string_bbox");
@@ -1368,6 +1386,7 @@
   FT_UInt index;
   Py::Dict charmap;
 
+  //std::cout << "asd" << face->charmaps[1]->encoding << std::endl;
   FT_ULong code = FT_Get_First_Char(face, &index);
   while (index != 0) {
     charmap[Py::Long((long) code)] = Py::Int((int) index);
@@ -1841,6 +1860,8 @@
 		     FT2Font::set_size__doc__);
   add_varargs_method("set_charmap", &FT2Font::set_charmap,
 		     FT2Font::set_charmap__doc__);
+  add_varargs_method("select_charmap", &FT2Font::select_charmap,
+		     FT2Font::select_charmap__doc__);
 
   add_varargs_method("get_width_height", &FT2Font::get_width_height,
 		     FT2Font::get_width_height__doc__);

Modified: trunk/matplotlib/src/ft2font.h
===================================================================
--- trunk/matplotlib/src/ft2font.h	2009-11-06 22:33:34 UTC (rev 7947)
+++ trunk/matplotlib/src/ft2font.h	2009-11-07 06:53:49 UTC (rev 7948)
@@ -95,6 +95,7 @@
   Py::Object clear(const Py::Tuple & args);
   Py::Object set_size(const Py::Tuple & args);
   Py::Object set_charmap(const Py::Tuple & args);
+  Py::Object select_charmap(const Py::Tuple & args);
   Py::Object set_text(const Py::Tuple & args, const Py::Dict & kwargs);
   Py::Object get_kerning(const Py::Tuple & args);
   Py::Object get_num_glyphs(const Py::Tuple & args);
@@ -137,6 +138,7 @@
   static char clear__doc__ [];
   static char set_size__doc__ [];
   static char set_charmap__doc__ [];
+  static char select_charmap__doc__ [];
   static char set_text__doc__ [];
   static char get_glyph__doc__ [];
   static char get_num_glyphs__doc__ [];


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

SF.net SVN: matplotlib:[7947] trunk/matplotlib/lib/mpl_toolkits/axes_grid/ parasite_axes.py

[<lee...@us...>]

Revision: 7947
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7947&view=rev
Author:   leejjoon
Date:     2009-11-06 22:33:34 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
axes_grid: add HostAxes.get_tightbbox

Modified Paths:
--------------
    trunk/matplotlib/lib/mpl_toolkits/axes_grid/parasite_axes.py

Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/parasite_axes.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/parasite_axes.py	2009-11-06 21:54:57 UTC (rev 7946)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/parasite_axes.py	2009-11-06 22:33:34 UTC (rev 7947)
@@ -10,6 +10,8 @@
 from matplotlib.axes import subplot_class_factory
 from axislines import Axes
 
+from matplotlib.transforms import Bbox
+
 import numpy as np
 
 import matplotlib.cbook as cbook
@@ -238,6 +240,16 @@
         return self.legend_
 
 
+    def get_tightbbox(self, renderer):
+
+        bbs = [ax.get_tightbbox(renderer) for ax in self.parasites]
+        bbs.append(super(HostAxes, self).get_tightbbox(renderer))
+
+        _bbox = Bbox.union([b for b in bbs if b.width!=0 or b.height!=0])
+
+        return _bbox
+    
+
     def draw(self, renderer):
 
         orig_artists = list(self.artists)


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

SF.net SVN: matplotlib:[7946] trunk/matplotlib/lib/matplotlib/backend_bases .py

[<lee...@us...>]

Revision: 7946
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7946&view=rev
Author:   leejjoon
Date:     2009-11-06 21:54:57 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
do not check the visibility of bbox_extra_artists of savefig

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

Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py	2009-11-06 19:26:35 UTC (rev 7945)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py	2009-11-06 21:54:57 UTC (rev 7946)
@@ -1613,8 +1613,8 @@
                 renderer = self.figure._cachedRenderer
                 bbox_inches = self.figure.get_tightbbox(renderer)
 
-                bb = [a.get_window_extent(renderer) for a in kwargs.pop("bbox_extra_artists", []) \
-                      if a.get_visible()]
+                bb = [a.get_window_extent(renderer) for a \
+                      in kwargs.pop("bbox_extra_artists", [])]
                 if bb:
                     _bbox = Bbox.union([b for b in bb if b.width!=0 or b.height!=0])
 


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

SF.net SVN: matplotlib:[7945] trunk/matplotlib

[<md...@us...>]

Revision: 7945
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7945&view=rev
Author:   mdboom
Date:     2009-11-06 19:26:35 +0000 (Fri, 06 Nov 2009)

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

........
  r7944 | mdboom | 2009-11-06 14:24:55 -0500 (Fri, 06 Nov 2009) | 2 lines
  
  Add support for \widebar{} in mathtext (Thanks Sean Arms)
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/_mathtext_data.py
    trunk/matplotlib/lib/matplotlib/mathtext.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_99_maint:1-7942
   + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7944
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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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

Modified: trunk/matplotlib/lib/matplotlib/_mathtext_data.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/_mathtext_data.py	2009-11-06 19:24:55 UTC (rev 7944)
+++ trunk/matplotlib/lib/matplotlib/_mathtext_data.py	2009-11-06 19:26:35 UTC (rev 7945)
@@ -41,6 +41,7 @@
     r'\rangle'              : ('cmex10',  64),
     r'\widehat'             : ('cmex10',  15),
     r'\widetilde'           : ('cmex10',  52),
+    r'\widebar'             : ('cmr10',  131),
 
     r'\omega'               : ('cmmi10',  29),
     r'\varepsilon'          : ('cmmi10',  20),
@@ -1762,6 +1763,7 @@
 tex2uni = {
 'widehat': 0x0302,
 'widetilde': 0x0303,
+'widebar': 0x0305,
 'langle': 0x27e8,
 'rangle': 0x27e9,
 'perp': 0x27c2,

Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py	2009-11-06 19:24:55 UTC (rev 7944)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py	2009-11-06 19:26:35 UTC (rev 7945)
@@ -2481,7 +2481,7 @@
         r'overleftarrow'  : r'\leftarrow'
         }
 
-    _wide_accents = set(r"widehat widetilde".split())
+    _wide_accents = set(r"widehat widetilde widebar".split())
 
     def accent(self, s, loc, toks):
         assert(len(toks)==1)


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /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: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


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: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
   + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png: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


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

SF.net SVN: matplotlib:[7944] branches/v0_99_maint/lib/matplotlib

[<md...@us...>]

Revision: 7944
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7944&view=rev
Author:   mdboom
Date:     2009-11-06 19:24:55 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
Add support for \widebar{} in mathtext (Thanks Sean Arms)

Modified Paths:
--------------
    branches/v0_99_maint/lib/matplotlib/_mathtext_data.py
    branches/v0_99_maint/lib/matplotlib/mathtext.py

Modified: branches/v0_99_maint/lib/matplotlib/_mathtext_data.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/_mathtext_data.py	2009-11-06 15:06:28 UTC (rev 7943)
+++ branches/v0_99_maint/lib/matplotlib/_mathtext_data.py	2009-11-06 19:24:55 UTC (rev 7944)
@@ -41,6 +41,7 @@
     r'\rangle'              : ('cmex10',  64),
     r'\widehat'             : ('cmex10',  15),
     r'\widetilde'           : ('cmex10',  52),
+    r'\widebar'             : ('cmr10',  131),
 
     r'\omega'               : ('cmmi10',  29),
     r'\varepsilon'          : ('cmmi10',  20),
@@ -1762,6 +1763,7 @@
 tex2uni = {
 'widehat': 0x0302,
 'widetilde': 0x0303,
+'widebar': 0x0305,
 'langle': 0x27e8,
 'rangle': 0x27e9,
 'perp': 0x27c2,

Modified: branches/v0_99_maint/lib/matplotlib/mathtext.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/mathtext.py	2009-11-06 15:06:28 UTC (rev 7943)
+++ branches/v0_99_maint/lib/matplotlib/mathtext.py	2009-11-06 19:24:55 UTC (rev 7944)
@@ -2450,7 +2450,7 @@
         r'overleftarrow'  : r'\leftarrow'
         }
 
-    _wide_accents = set(r"widehat widetilde".split())
+    _wide_accents = set(r"widehat widetilde widebar".split())
 
     def accent(self, s, loc, toks):
         assert(len(toks)==1)


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

SF.net SVN: matplotlib:[7943] trunk/matplotlib/

[<jd...@us...>]

Revision: 7943
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7943&view=rev
Author:   jdh2358
Date:     2009-11-06 15:06:28 +0000 (Fri, 06 Nov 2009)

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

........
  r7942 | jdh2358 | 2009-11-06 09:04:33 -0600 (Fri, 06 Nov 2009) | 1 line
  
  backport afm fix to branch
........

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


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_99_maint:1-7929
   + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7942


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

SF.net SVN: matplotlib:[7942] branches/v0_99_maint/lib/matplotlib/afm.py

[<jd...@us...>]

Revision: 7942
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7942&view=rev
Author:   jdh2358
Date:     2009-11-06 15:04:33 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
backport afm fix to branch

Modified Paths:
--------------
    branches/v0_99_maint/lib/matplotlib/afm.py

Modified: branches/v0_99_maint/lib/matplotlib/afm.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/afm.py	2009-11-06 15:02:19 UTC (rev 7941)
+++ branches/v0_99_maint/lib/matplotlib/afm.py	2009-11-06 15:04:33 UTC (rev 7942)
@@ -37,8 +37,16 @@
 import sys, os, re
 from _mathtext_data import uni2type1
 
-#Convert string the a python type
-_to_int = int
+# Convert string the a python type
+# some afm files have floats where we are expecting ints -- there is
+# probably a better way to handle this (support floats, round rather
+# than truncate).  But I don't know what the best approach is now and
+# this change to _to_int should at least prevent mpl from crashing on
+# these JDH (2009-11-06)
+def _to_int(x):
+        return int(float(x))
+
+
 _to_float = float
 _to_str =  str
 


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

SF.net SVN: matplotlib:[7941] trunk/matplotlib/lib/matplotlib/afm.py

[<jd...@us...>]

Revision: 7941
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7941&view=rev
Author:   jdh2358
Date:     2009-11-06 15:02:19 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
fix to int in afm to not crash on floats

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

Modified: trunk/matplotlib/lib/matplotlib/afm.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/afm.py	2009-11-06 15:00:57 UTC (rev 7940)
+++ trunk/matplotlib/lib/matplotlib/afm.py	2009-11-06 15:02:19 UTC (rev 7941)
@@ -44,7 +44,10 @@
 # than truncate).  But I don't know what the best approach is now and
 # this change to _to_int should at least prevent mpl from crashing on
 # these JDH (2009-11-06)
-_to_int = lambda x: return int(float(x))
+
+def _to_int(x):
+    return int(float(x))
+
 _to_float = float
 _to_str =  str
 


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

SF.net SVN: matplotlib:[7940] trunk/matplotlib/lib/matplotlib/afm.py

[<jd...@us...>]

Revision: 7940
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7940&view=rev
Author:   jdh2358
Date:     2009-11-06 15:00:57 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
fix to int in afm to not crash on floats

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

Modified: trunk/matplotlib/lib/matplotlib/afm.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/afm.py	2009-11-06 13:05:13 UTC (rev 7939)
+++ trunk/matplotlib/lib/matplotlib/afm.py	2009-11-06 15:00:57 UTC (rev 7940)
@@ -38,7 +38,13 @@
 from _mathtext_data import uni2type1
 
 #Convert string the a python type
-_to_int = int
+
+# some afm files have floats where we are expecting ints -- there is
+# probably a better way to handle this (support floats, round rather
+# than truncate).  But I don't know what the best approach is now and
+# this change to _to_int should at least prevent mpl from crashing on
+# these JDH (2009-11-06)
+_to_int = lambda x: return int(float(x))
 _to_float = float
 _to_str =  str
 


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

SF.net SVN: matplotlib:[7939] trunk/toolkits/basemap

[<js...@us...>]

Revision: 7939
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7939&view=rev
Author:   jswhit
Date:     2009-11-06 13:05:13 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
patch for drawmapscale from Stephane Raynaud.

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

Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2009-11-04 20:22:35 UTC (rev 7938)
+++ trunk/toolkits/basemap/Changelog	2009-11-06 13:05:13 UTC (rev 7939)
@@ -1,4 +1,6 @@
 version 0.99.5 (not yet released)
+           * patch from Stephane Raynaud to pass format string to
+             drawmapscale, and allow units='m'.
            * updated proj4 source to version 4.7.0, pyproj to 1.8.6.
 	   * add "is_land" method to check whether a point is over land or
              water.

Modified: trunk/toolkits/basemap/README
===================================================================
--- trunk/toolkits/basemap/README	2009-11-04 20:22:35 UTC (rev 7938)
+++ trunk/toolkits/basemap/README	2009-11-06 13:05:13 UTC (rev 7939)
@@ -141,5 +141,6 @@
 Pierre Gerard-Marchant
 Christoph Gohlke
 Eric Bruning
+Stephane Raynaud
 
 for valuable contributions.

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2009-11-04 20:22:35 UTC (rev 7938)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2009-11-06 13:05:13 UTC (rev 7939)
@@ -3319,7 +3319,8 @@
 
     def drawmapscale(self,lon,lat,lon0,lat0,length,barstyle='simple',\
                      units='km',fontsize=9,yoffset=None,labelstyle='simple',\
-                     fontcolor='k',fillcolor1='w',fillcolor2='k',ax=None):
+                     fontcolor='k',fillcolor1='w',fillcolor2='k',ax=None,\
+                     format='%d'):
         """
         Draw a map scale at ``lon,lat`` of length ``length`` 
         representing distance in the map
@@ -3343,6 +3344,8 @@
                          displayed on the top of the scale bar. For 
                          ``simple``, just the units are display on top
                          and the distance below the scale bar.
+                         If equal to False, plot an empty label.
+        format           a string formatter to format numeric values
         yoffset          yoffset controls how tall the scale bar is,
                          and how far the annotations are offset from the
                          scale bar.  Default is 0.02 times the height of 
@@ -3360,17 +3363,15 @@
         if self.projection == 'cyl':
             raise ValueError("cannot draw map scale for projection='cyl'")
         # convert length to meters
+        lenlab = length
         if units == 'km':
-            lenlab = length
             length = length*1000 
         elif units == 'mi':
-            lenlab = length
             length = length*1609.344
         elif units == 'nmi':
-            lenlab = length
             length = length*1852
-        else:
-            msg = "units must be 'km' (kilometers), "\
+        elif units != 'm':
+            msg = "units must be 'm' (meters), 'km' (kilometers), "\
             "'mi' (miles) or 'nmi' (nautical miles)"
             raise KeyError(msg)
         # reference point and center of scale.
@@ -3411,6 +3412,8 @@
             labelstr = units
         elif labelstyle == 'fancy':
             labelstr = units+" (scale factor %4.2f at %s)"%(scalefact,lonlatstr)
+        elif labelstyle == False:
+            labelstr = ''
         else:
             raise KeyError("labelstyle must be 'simple' or 'fancy'")
         # default y offset is 2 percent of map height.
@@ -3456,15 +3459,15 @@
             rets.append(self.plot([xc,xc],[ytick,ybottom],color=fontcolor)[0])
             rets.append(self.plot([x4,x4],[ytick,ybottom],color=fontcolor)[0])
             #label 3 tick marks
-            rets.append(ax.text(x1,ytext,'%d' % (0),\
+            rets.append(ax.text(x1,ytext,format % (0),\
             horizontalalignment='center',\
             verticalalignment='top',\
             fontsize=fontsize,color=fontcolor))
-            rets.append(ax.text(xc,ytext,'%d' % (0.5*lenlab),\
+            rets.append(ax.text(xc,ytext,format % (0.5*lenlab),\
             horizontalalignment='center',\
             verticalalignment='top',\
             fontsize=fontsize,color=fontcolor))
-            rets.append(ax.text(x4,ytext,'%d' % (lenlab),\
+            rets.append(ax.text(x4,ytext,format % (lenlab),\
             horizontalalignment='center',\
             verticalalignment='top',\
             fontsize=fontsize,color=fontcolor))
@@ -3478,7 +3481,7 @@
             rets.append(self.plot([x1,x4],[yc,yc],color=fontcolor)[0])
             rets.append(self.plot([x1,x1],[yc-yoffset,yc+yoffset],color=fontcolor)[0])
             rets.append(self.plot([x4,x4],[yc-yoffset,yc+yoffset],color=fontcolor)[0])
-            rets.append(ax.text(xc,yc-yoffset,'%d' % lenlab,\
+            rets.append(ax.text(xc,yc-yoffset,format % lenlab,\
             verticalalignment='top',horizontalalignment='center',\
             fontsize=fontsize,color=fontcolor))
             #put units, scale factor on top


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

SF.net SVN: matplotlib:[7938] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap/__init__.py

[<js...@us...>]

Revision: 7938
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7938&view=rev
Author:   jswhit
Date:     2009-11-04 20:22:35 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
don't try to create _geoslib Polygon instances if resolution=None

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	2009-11-04 17:53:25 UTC (rev 7937)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2009-11-04 20:22:35 UTC (rev 7938)
@@ -805,15 +805,16 @@
         # currently only used in is_land method.
         self.landpolygons=[]
         self.lakepolygons=[]
-        #self.islandinlakepolygons=[]
-        #self.lakeinislandinlakepolygons=[]
-        x, y = zip(*self.coastpolygons)
-        for x,y,type in zip(x,y,self.coastpolygontypes):
-            b = np.asarray([x,y]).T
-            if type == 1: self.landpolygons.append(_geoslib.Polygon(b))
-            if type == 2: self.lakepolygons.append(_geoslib.Polygon(b))
-            #if type == 3: self.islandinlakepolygons.append(_geoslib.Polygon(b))
-            #if type == 4: self.lakeinislandinlakepolygons.append(_geoslib.Polygon(b))
+        if resolution is not None:
+            #self.islandinlakepolygons=[]
+            #self.lakeinislandinlakepolygons=[]
+            x, y = zip(*self.coastpolygons)
+            for x,y,type in zip(x,y,self.coastpolygontypes):
+                b = np.asarray([x,y]).T
+                if type == 1: self.landpolygons.append(_geoslib.Polygon(b))
+                if type == 2: self.lakepolygons.append(_geoslib.Polygon(b))
+                #if type == 3: self.islandinlakepolygons.append(_geoslib.Polygon(b))
+                #if type == 4: self.lakeinislandinlakepolygons.append(_geoslib.Polygon(b))
 
     # set __init__'s docstring
     __init__.__doc__ = _Basemap_init_doc
@@ -1558,6 +1559,7 @@
         the GSHHS coastline polygons associated with the class instance.
         Points over lakes inside land regions are not counted as land points.
         """
+        if resolution is None: return None
         landpt = False
         for poly in self.landpolygons:
             landpt = _geoslib.Point((xpt,ypt)).within(poly)


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

SF.net SVN: matplotlib:[7937] trunk/matplotlib/lib/matplotlib

[<lee...@us...>]

Revision: 7937
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7937&view=rev
Author:   leejjoon
Date:     2009-11-04 17:53:25 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
add bbox_extra_artists keyword for savefig

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backend_bases.py
    trunk/matplotlib/lib/matplotlib/figure.py

Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py	2009-11-04 17:30:12 UTC (rev 7936)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py	2009-11-04 17:53:25 UTC (rev 7937)
@@ -1536,11 +1536,26 @@
         *edgecolor*
             the edgecolor of the figure
 
-        *orientation*  '
+        *orientation*
             landscape' | 'portrait' (not supported on all backends)
 
         *format*
             when set, forcibly set the file format to save to
+
+
+        *bbox_inches*
+            Bbox in inches. Only the given portion of the figure is
+            saved. If 'tight', try to figure out the tight bbox of
+            the figure.
+
+        *pad_inches*
+            Amount of padding around the figure when bbox_inches is
+            'tight'.
+
+        *bbox_extra_artists*
+            A list of extra artists that will be considered when the
+            tight bbox is calculated.
+
         """
         if format is None:
             if cbook.is_string_like(filename):
@@ -1597,6 +1612,18 @@
                     **kwargs)
                 renderer = self.figure._cachedRenderer
                 bbox_inches = self.figure.get_tightbbox(renderer)
+
+                bb = [a.get_window_extent(renderer) for a in kwargs.pop("bbox_extra_artists", []) \
+                      if a.get_visible()]
+                if bb:
+                    _bbox = Bbox.union([b for b in bb if b.width!=0 or b.height!=0])
+
+                    bbox_inches1 = TransformedBbox(_bbox,
+                                                  Affine2D().scale(1./self.figure.dpi))
+
+                    bbox_inches = Bbox.union([bbox_inches, bbox_inches1])
+
+
                 pad = kwargs.pop("pad_inches", 0.1)
                 bbox_inches = bbox_inches.padded(pad)
 

Modified: trunk/matplotlib/lib/matplotlib/figure.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/figure.py	2009-11-04 17:30:12 UTC (rev 7936)
+++ trunk/matplotlib/lib/matplotlib/figure.py	2009-11-04 17:53:25 UTC (rev 7937)
@@ -1031,6 +1031,10 @@
             Amount of padding around the figure when bbox_inches is
             'tight'.
 
+          *bbox_extra_artists*:
+            A list of extra artists that will be considered when the
+            tight bbox is calculated.
+
         """
 
         for key in ('dpi', 'facecolor', 'edgecolor'):


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

SF.net SVN: matplotlib:[7936] trunk/matplotlib/lib/matplotlib

[<jd...@us...>]

Revision: 7936
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7936&view=rev
Author:   jdh2358
Date:     2009-11-04 17:30:12 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
added levels kwarg to contour

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/contour.py
    trunk/matplotlib/lib/matplotlib/mlab.py
    trunk/matplotlib/lib/matplotlib/widgets.py

Modified: trunk/matplotlib/lib/matplotlib/contour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/contour.py	2009-11-04 16:26:37 UTC (rev 7935)
+++ trunk/matplotlib/lib/matplotlib/contour.py	2009-11-04 17:30:12 UTC (rev 7936)
@@ -1066,6 +1066,11 @@
             scaling data values to colors. If *norm* is *None* and
             *colors* is *None*, the default linear scaling is used.
 
+          *levels* [level0, level1, ..., leveln]
+            A list of floating point numbers indicating the level
+            curves to draw; eg to draw just the zero contour pass
+            ``levels=[0]``
+
           *origin*: [ None | 'upper' | 'lower' | 'image' ]
             If *None*, the first value of *Z* will correspond to the
             lower left corner, location (0,0). If 'image', the rc

Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2009-11-04 16:26:37 UTC (rev 7935)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2009-11-04 17:30:12 UTC (rev 7936)
@@ -2576,6 +2576,10 @@
     *withheader*: if withheader is False, do not write the attribute
       names in the first row
 
+    for formatd type FormatFloat, we override the precision to store
+    full precision floats in the CSV file
+
+
     .. seealso::
 
         :func:`csv2rec`

Modified: trunk/matplotlib/lib/matplotlib/widgets.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/widgets.py	2009-11-04 16:26:37 UTC (rev 7935)
+++ trunk/matplotlib/lib/matplotlib/widgets.py	2009-11-04 17:30:12 UTC (rev 7936)
@@ -669,6 +669,8 @@
         self.vertOn = True
         self.useblit = useblit
 
+        if useblit:
+            lineprops['animated'] = True
         self.lineh = ax.axhline(ax.get_ybound()[0], visible=False, **lineprops)
         self.linev = ax.axvline(ax.get_xbound()[0], visible=False, **lineprops)
 
@@ -741,10 +743,14 @@
 
     """
     def __init__(self, canvas, axes, useblit=True, **lineprops):
+
         self.canvas = canvas
         self.axes = axes
         xmin, xmax = axes[-1].get_xlim()
         xmid = 0.5*(xmin+xmax)
+        if useblit:
+            lineprops['animated'] = True
+
         self.lines = [ax.axvline(xmid, visible=False, **lineprops) for ax in axes]
 
         self.visible = True


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