matplotlib-checkins Mailing List for matplotlib (Page 2)

Revision: 7968
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7968&view=rev
Author: mdehoon
Date: 2009年11月15日 14:07:11 +0000 (2009年11月15日)
Log Message:
-----------
Fixing the order of transformations; see bug #2896668 on sourceforge.
The master transformation was moved to backend_macosx.py.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backends/backend_macosx.py
 trunk/matplotlib/src/_macosx.m
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_macosx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_macosx.py	2009年11月15日 03:31:26 UTC (rev 7967)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_macosx.py	2009年11月15日 14:07:11 UTC (rev 7968)
@@ -63,12 +63,15 @@
 linewidths, linestyles, antialiaseds, urls):
 cliprect = gc.get_clip_rectangle()
 clippath, clippath_transform = gc.get_clip_path()
- gc.draw_path_collection(master_transform,
- cliprect,
+ if all_transforms:
+ transforms = [numpy.dot(master_transform, t) for t in all_transforms]
+ else:
+ transforms = [master_transform]
+ gc.draw_path_collection(cliprect,
 clippath,
 clippath_transform,
 paths,
- all_transforms,
+ transforms,
 offsets,
 offsetTrans,
 facecolors,
Modified: trunk/matplotlib/src/_macosx.m
===================================================================
--- trunk/matplotlib/src/_macosx.m	2009年11月15日 03:31:26 UTC (rev 7967)
+++ trunk/matplotlib/src/_macosx.m	2009年11月15日 14:07:11 UTC (rev 7968)
@@ -1165,7 +1165,6 @@
 static PyObject*
 GraphicsContext_draw_path_collection (GraphicsContext* self, PyObject* args)
 {
- PyObject* master_transform;
 PyObject* cliprect;
 PyObject* clippath;
 PyObject* clippath_transform;
@@ -1187,19 +1186,18 @@
 return NULL;
 }
 
- if(!PyArg_ParseTuple(args, "OOOOOOOOOOOOO", &master_transform,
- &cliprect,
- &clippath,
- &clippath_transform,
- &paths,
- &transforms,
- &offsets,
- &offset_transform,
- &facecolors,
- &edgecolors,
- &linewidths,
- &linestyles,
- &antialiaseds))
+ if(!PyArg_ParseTuple(args, "OOOOOOOOOOOO", &cliprect,
+ &clippath,
+ &clippath_transform,
+ &paths,
+ &transforms,
+ &offsets,
+ &offset_transform,
+ &facecolors,
+ &edgecolors,
+ &linewidths,
+ &linestyles,
+ &antialiaseds))
 return NULL;
 
 int ok = 1;
@@ -1235,43 +1233,22 @@
 PyErr_SetString(PyExc_ValueError, "transforms must be a sequence object");
 return NULL;
 }
- Py_ssize_t Ntransforms = PySequence_Size(transforms);
-
- CGContextSaveGState(cr);
- /* ------------------- Set master transform --------------------------- */
-
- if (Ntransforms)
+ const Py_ssize_t Ntransforms = PySequence_Size(transforms);
+ if (Ntransforms==0)
 {
- CGAffineTransform master;
- double a, b, c, d, tx, ty;
- PyObject* values = PyObject_CallMethod(master_transform, "to_values", "");
- if (!values)
- {
- ok = 0;
- goto exit;
- }
- if (!PyTuple_Check(values))
- {
- Py_DECREF(values);
- ok = 0;
- goto exit;
- }
- /* CGAffineTransform contains CGFloat; cannot use master directly */
- ok = PyArg_ParseTuple(values, "dddddd", &a, &b, &c, &d, &tx, &ty);
- Py_DECREF(values);
- master.a = a;
- master.b = b;
- master.c = c;
- master.d = d;
- master.tx = tx;
-	master.ty = ty;
- if (!ok) goto exit;
- CGContextConcatCTM(cr, master);
+ PyErr_SetString(PyExc_ValueError, "transforms should contain at least one item");
+ return NULL;
 }
 
- /* ------------------- Check offsets array ---------------------------- */
+ /* ------------------- Read drawing arrays ---------------------------- */
 
+ CGContextSaveGState(cr);
 offsets = PyArray_FromObject(offsets, NPY_DOUBLE, 0, 2);
+ facecolors = PyArray_FromObject(facecolors, NPY_DOUBLE, 1, 2);
+ edgecolors = PyArray_FromObject(edgecolors, NPY_DOUBLE, 1, 2);
+
+ /* ------------------- Check offsets array ---------------------------- */
+
 if (!offsets ||
 (PyArray_NDIM(offsets)==2 && PyArray_DIM(offsets, 1)!=2) ||
 (PyArray_NDIM(offsets)==1 && PyArray_DIM(offsets, 0)!=0))
@@ -1282,11 +1259,36 @@
 }
 const Py_ssize_t Noffsets = PyArray_DIM(offsets, 0);
 
+ /* ------------------- Check facecolors array ------------------------- */
+
+ if (!facecolors ||
+ (PyArray_NDIM(facecolors)==1 && PyArray_DIM(facecolors, 0)!=0) ||
+ (PyArray_NDIM(facecolors)==2 && PyArray_DIM(facecolors, 1)!=4))
+ {
+ PyErr_SetString(PyExc_ValueError, "Facecolors must by a Nx4 numpy array or empty");
+ ok = 0;
+ goto exit;
+ }
+
+ /* ------------------- Check edgecolors array ------------------------- */
+
+ if (!edgecolors ||
+ (PyArray_NDIM(edgecolors)==1 && PyArray_DIM(edgecolors, 0)!=0) ||
+ (PyArray_NDIM(edgecolors)==2 && PyArray_DIM(edgecolors, 1)!=4))
+ {
+ PyErr_SetString(PyExc_ValueError, "Edgecolors must by a Nx4 numpy array or empty");
+ ok = 0;
+ goto exit;
+ }
+
 /* -------------------------------------------------------------------- */
 
+ if (Npaths==0) goto exit; /* Nothing to do */
+
+ /* -------------------------------------------------------------------- */
+
 Np = Npaths > Ntransforms ? Npaths : Ntransforms;
 N = Np > Noffsets ? Np : Noffsets;
- if (N < Ntransforms) Ntransforms = N;
 
 p = malloc(Np*sizeof(CGMutablePathRef));
 if (!p)
@@ -1305,35 +1307,22 @@
 ok = 0;
 goto exit;
 }
- if (Ntransforms)
+ transform = PySequence_ITEM(transforms, i % Ntransforms);
+ if (!transform)
 {
- transform = PySequence_ITEM(transforms, i % Ntransforms);
- if (!transform)
- {
- PyErr_SetString(PyExc_RuntimeError,
- "failed to obtain transform");
- ok = 0;
- goto exit;
- }
- iterator = get_path_iterator(path,
- transform,
- 1,
- 0,
- rect,
- mode,
- 0);
- Py_DECREF(transform);
+ PyErr_SetString(PyExc_RuntimeError, "failed to obtain transform");
+ Py_DECREF(path);
+ ok = 0;
+ goto exit;
 }
- else
- {
- iterator = get_path_iterator(path,
- master_transform,
- 1,
- 0,
- rect,
- mode,
- 0);
- }
+ iterator = get_path_iterator(path,
+ transform,
+ 1,
+ 0,
+ rect,
+ mode,
+ 0);
+ Py_DECREF(transform);
 Py_DECREF(path);
 if (!iterator)
 {
@@ -1381,30 +1370,6 @@
 if (n > 0) CGContextClip(cr);
 }
 
- /* ------------------- Check facecolors array ------------------------- */
-
- facecolors = PyArray_FromObject(facecolors, NPY_DOUBLE, 1, 2);
- if (!facecolors ||
- (PyArray_NDIM(facecolors)==1 && PyArray_DIM(facecolors, 0)!=0) ||
- (PyArray_NDIM(facecolors)==2 && PyArray_DIM(facecolors, 1)!=4))
- {
- PyErr_SetString(PyExc_ValueError, "Facecolors must by a Nx4 numpy array or empty");
- ok = 0;
- goto exit;
- }
-
- /* ------------------- Check edgecolors array ------------------------- */
-
- edgecolors = PyArray_FromObject(edgecolors, NPY_DOUBLE, 1, 2);
- if (!edgecolors ||
- (PyArray_NDIM(edgecolors)==1 && PyArray_DIM(edgecolors, 0)!=0) ||
- (PyArray_NDIM(edgecolors)==2 && PyArray_DIM(edgecolors, 1)!=4))
- {
- PyErr_SetString(PyExc_ValueError, "Edgecolors must by a Nx4 numpy array or empty");
- ok = 0;
- goto exit;
- }
-
 /* ------------------- Check the other arguments ---------------------- */
 
 if (!PySequence_Check(linewidths))
@@ -1610,7 +1575,6 @@
 free(p);
 }
 if (!ok) return NULL;
-
 Py_INCREF(Py_None);
 return Py_None;
 }
@@ -2390,7 +2354,6 @@
 PyErr_SetString(PyExc_RuntimeError, "ATSUDrawText failed");
 return NULL;
 }
-
 Py_INCREF(Py_None);
 return Py_None;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7967
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7967&view=rev
Author: astraw
Date: 2009年11月15日 03:31:26 +0000 (2009年11月15日)
Log Message:
-----------
add README
Added Paths:
-----------
 trunk/toolkits/mplsizer/README.rst
Added: trunk/toolkits/mplsizer/README.rst
===================================================================
--- trunk/toolkits/mplsizer/README.rst	 (rev 0)
+++ trunk/toolkits/mplsizer/README.rst	2009年11月15日 03:31:26 UTC (rev 7967)
@@ -0,0 +1,25 @@
+mplsizer
+********
+
+mplsizer is a layout engine for matplotlib_ based on wxPython model. It
+is released under the MIT license.
+
+.. _matplotlib: http://matplotlib.sourceforge.net/
+
+svn access
+==========
+
+The official svn repository is at
+https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/toolkits/mplsizer/
+
+unofficial git mirror
+=====================
+
+An un-official git mirror is made of the source code repository at
+http://github.com/astraw/mplsizer. You can make a copy of this
+repository with::
+
+ git clone --origin svn gi...@gi...:astraw/mplsizer.git
+ cd mplsizer/
+ git svn init --trunk=trunk/toolkits/mplsizer --prefix=svn/ https://matplotlib.svn.sourceforge.net/svnroot/matplotlib
+ git svn rebase -l
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7966
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7966&view=rev
Author: jswhit
Date: 2009年11月14日 15:58:16 +0000 (2009年11月14日)
Log Message:
-----------
make sure data points are plotted on top of filled contours.
Modified Paths:
--------------
 trunk/matplotlib/examples/pylab_examples/griddata_demo.py
Modified: trunk/matplotlib/examples/pylab_examples/griddata_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/griddata_demo.py	2009年11月14日 15:57:46 UTC (rev 7965)
+++ trunk/matplotlib/examples/pylab_examples/griddata_demo.py	2009年11月14日 15:58:16 UTC (rev 7966)
@@ -11,15 +11,15 @@
 z = x*np.exp(-x**2-y**2)
 # define grid.
 xi = np.linspace(-2.1,2.1,100)
-yi = np.linspace(-2.1,2.1,100)
+yi = np.linspace(-2.1,2.1,200)
 # grid the data.
-zi = griddata(x,y,z,xi,yi)
+zi = griddata(x,y,z,xi,yi,interp='linear')
 # contour the gridded data, plotting dots at the nonuniform data points.
 CS = plt.contour(xi,yi,zi,15,linewidths=0.5,colors='k')
 CS = plt.contourf(xi,yi,zi,15,cmap=plt.cm.jet)
 plt.colorbar() # draw colorbar
 # plot data points.
-plt.scatter(x,y,marker='o',c='b',s=5)
+plt.scatter(x,y,marker='o',c='b',s=5,zorder=10)
 plt.xlim(-2,2) 
 plt.ylim(-2,2) 
 plt.title('griddata test (%d points)' % npts)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7965
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7965&view=rev
Author: jswhit
Date: 2009年11月14日 15:57:46 +0000 (2009年11月14日)
Log Message:
-----------
fix bug in griddata that occurs when mask is a scalar boolean (found by James Conners)
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/mlab.py
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2009年11月13日 19:22:52 UTC (rev 7964)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2009年11月14日 15:57:46 UTC (rev 7965)
@@ -2687,9 +2687,11 @@
 raise TypeError("inputs x,y,z must all be 1D arrays of the same length")
 # remove masked points.
 if hasattr(z,'mask'):
- x = x.compress(z.mask == False)
- y = y.compress(z.mask == False)
- z = z.compressed()
+ # make sure mask is not a scalar boolean array.
+ if a.mask.ndim: 
+ x = x.compress(z.mask == False)
+ y = y.compress(z.mask == False)
+ z = z.compressed()
 if _use_natgrid: # use natgrid toolkit if available.
 if interp != 'nn':
 raise ValueError("only natural neighor interpolation"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7964
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7964&view=rev
Author: jouni
Date: 2009年11月13日 19:22:52 +0000 (2009年11月13日)
Log Message:
-----------
Expose the pdf information dictionary
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/doc/api/api_changes.rst
 trunk/matplotlib/examples/pylab_examples/multipage_pdf.py
 trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
Property Changed:
----------------
 trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009年11月13日 00:44:11 UTC (rev 7963)
+++ trunk/matplotlib/CHANGELOG	2009年11月13日 19:22:52 UTC (rev 7964)
@@ -1,3 +1,6 @@
+2009年11月13日 The pdf backend now allows changing the contents of
+ a pdf file's information dictionary via PdfPages.infodict. - JKS
+
 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
Modified: trunk/matplotlib/doc/api/api_changes.rst
===================================================================
--- trunk/matplotlib/doc/api/api_changes.rst	2009年11月13日 00:44:11 UTC (rev 7963)
+++ trunk/matplotlib/doc/api/api_changes.rst	2009年11月13日 19:22:52 UTC (rev 7964)
@@ -10,7 +10,8 @@
 Changes beyond 0.99.x
 =====================
 
-* You can now print several figures to one pdf file. See the docstrings
+* You can now print several figures to one pdf file and modify the 
+ document information dictionary of a pdf file. See the docstrings
 of the class :class:`matplotlib.backends.backend_pdf.PdfPages` for
 more information.
 
Modified: trunk/matplotlib/examples/pylab_examples/multipage_pdf.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/multipage_pdf.py	2009年11月13日 00:44:11 UTC (rev 7963)
+++ trunk/matplotlib/examples/pylab_examples/multipage_pdf.py	2009年11月13日 19:22:52 UTC (rev 7964)
@@ -1,5 +1,6 @@
 # This is a demo of creating a pdf file with several pages.
 
+import datetime
 import numpy as np
 import matplotlib
 from matplotlib.backends.backend_pdf import PdfPages
@@ -29,5 +30,14 @@
 pdf.savefig(fig) # or you can pass a Figure object to pdf.savefig
 close()
 
+# We can also set the file's metadata via the PdfPages object:
+d = pdf.infodict()
+d['Title'] = 'Multipage PDF Example'
+d['Author'] = u'Jouni K. Sepp\xe4nen'
+d['Subject'] = 'How to create a multipage pdf file and set its metadata'
+d['Keywords'] = 'PdfPages multipage keywords author title subject'
+d['CreationDate'] = datetime.datetime(2009,11,13)
+d['ModDate'] = datetime.datetime.today()
+
 # Remember to close the object - otherwise the file will not be usable
 pdf.close()
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py	2009年11月13日 00:44:11 UTC (rev 7963)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py	2009年11月13日 19:22:52 UTC (rev 7964)
@@ -5,6 +5,7 @@
 """
 from __future__ import division
 
+import codecs
 import os
 import re
 import sys
@@ -149,6 +150,16 @@
 elif isinstance(obj, (int, long)):
 return "%d" % obj
 
+ # Unicode strings are encoded in UTF-16BE with byte-order mark.
+ elif isinstance(obj, unicode):
+ try:
+ # But maybe it's really ASCII?
+ s = obj.encode('ASCII')
+ return pdfRepr(s)
+ except UnicodeEncodeError:
+ s = codecs.BOM_UTF16_BE + obj.encode('UTF-16BE')
+ return pdfRepr(s)
+
 # Strings are written in parentheses, with backslashes and parens
 # escaped. Actually balanced parens are allowed, but it is
 # simpler to escape them all. TODO: cut long strings into lines;
@@ -374,7 +385,6 @@
 fh.write("%254円334円 253円272円\n")
 
 self.rootObject = self.reserveObject('root')
- self.infoObject = self.reserveObject('info')
 self.pagesObject = self.reserveObject('pages')
 self.pageList = []
 self.fontObject = self.reserveObject('fonts')
@@ -388,14 +398,13 @@
 'Pages': self.pagesObject }
 self.writeObject(self.rootObject, root)
 
- info = { 'Creator': 'matplotlib ' + __version__ \
- + ', http://matplotlib.sf.net',
- 'Producer': 'matplotlib pdf backend',
- 'CreationDate': datetime.today() }
+ revision = '$Rev$'.strip('$').split(':')[1].strip()
+ self.infoDict = {
+ 'Creator': 'matplotlib %s, http://matplotlib.sf.net' % __version__,
+ 'Producer': 'matplotlib pdf backend r%s' % revision,
+ 'CreationDate': datetime.today()
+ }
 
- # Possible TODO: Title, Author, Subject, Keywords
- self.writeObject(self.infoObject, info)
-
 self.fontNames = {} # maps filenames to internal font names
 self.nextFont = 1 # next free internal font name
 self.dviFontInfo = {} # information on dvi fonts
@@ -471,6 +480,7 @@
 { 'Type': Name('Pages'),
 'Kids': self.pageList,
 'Count': len(self.pageList) })
+ self.writeInfoDict()
 
 # Finalize the file
 self.writeXref()
@@ -1280,6 +1290,31 @@
 if borken:
 raise AssertionError, 'Indirect object does not exist'
 
+ def writeInfoDict(self):
+ """Write out the info dictionary, checking it for good form"""
+
+ is_date = lambda x: isinstance(x, datetime)
+ check_trapped = lambda x: isinstance(x, Name) and x.name in \
+ ('True', 'False', 'Unknown')
+ keywords = {'Title': is_string_like,
+ 'Author': is_string_like,
+ 'Subject': is_string_like,
+ 'Keywords': is_string_like,
+ 'Creator': is_string_like,
+ 'Producer': is_string_like,
+ 'CreationDate': is_date,
+ 'ModDate': is_date,
+ 'Trapped': check_trapped}
+ for k in self.infoDict.keys():
+ if k not in keywords:
+ warnings.warn('Unknown infodict keyword: %s' % k)
+ else:
+ if not keywords[k](self.infoDict[k]):
+ warnings.warn('Bad value for infodict keyword %s' % k)
+
+ self.infoObject = self.reserveObject('info')
+ self.writeObject(self.infoObject, self.infoDict)
+
 def writeTrailer(self):
 """Write out the PDF trailer."""
 
@@ -2052,6 +2087,14 @@
 self._file.close()
 self._file = None
 
+ def infodict(self):
+ """
+ Return a modifiable information dictionary object
+ (see PDF reference section 10.2.1 'Document Information
+ Dictionary').
+ """
+ return self._file.infoDict
+
 def savefig(self, figure=None, **kwargs):
 """
 Save the Figure instance *figure* to this file as a new page.
Property changes on: trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
___________________________________________________________________
Added: svn:keywords
 + Rev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7963
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7963&view=rev
Author: astraw
Date: 2009年11月13日 00:44:11 +0000 (2009年11月13日)
Log Message:
-----------
testing bugfix: buildbot postmortem uses new file locations from r7830
Modified Paths:
--------------
 trunk/matplotlib/test/_buildbot_test_postmortem.py
Modified: trunk/matplotlib/test/_buildbot_test_postmortem.py
===================================================================
--- trunk/matplotlib/test/_buildbot_test_postmortem.py	2009年11月13日 00:44:03 UTC (rev 7962)
+++ trunk/matplotlib/test/_buildbot_test_postmortem.py	2009年11月13日 00:44:11 UTC (rev 7963)
@@ -81,9 +81,13 @@
 # new matplotlib.testing infrastructure
 
 os.chdir('test')
- for fname in glob.glob('*.png'):
- absdiff_fname = diff_basename + fname
- expected_fname = expected_basename + fname
+ for fname in get_recursive_filelist(['result_images']):
+ # only images
+ if not fname.endswith('.png'): continue
+
+ result_dir, result_fname = os.path.split(fname)
+ absdiff_fname = os.path.join( result_dir, diff_basename + result_fname)
+ expected_fname = os.path.join( result_dir, expected_basename + result_fname)
 if not os.path.exists(absdiff_fname):
 continue
 if not os.path.exists(expected_fname):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7962
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7962&view=rev
Author: astraw
Date: 2009年11月13日 00:44:03 +0000 (2009年11月13日)
Log Message:
-----------
testing bugfix: don't save test results to site-packages
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/testing/decorators.py
Modified: trunk/matplotlib/lib/matplotlib/testing/decorators.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/testing/decorators.py	2009年11月12日 23:07:36 UTC (rev 7961)
+++ trunk/matplotlib/lib/matplotlib/testing/decorators.py	2009年11月13日 00:44:03 UTC (rev 7962)
@@ -1,6 +1,6 @@
 from matplotlib.testing.noseclasses import KnownFailureTest, \
 KnownFailureDidNotFailTest, ImageComparisonFailure
-import os, sys
+import os, sys, shutil
 import nose
 import matplotlib
 import matplotlib.tests
@@ -85,7 +85,11 @@
 
 def compare_images_generator():
 for extension in extensions:
- expected_fnames = [os.path.join(baseline_dir,fname) + '.' + extension for fname in baseline_images]
+ orig_expected_fnames = [os.path.join(baseline_dir,fname) + '.' + extension for fname in baseline_images]
+ expected_fnames = [os.path.join(result_dir,'expected-'+fname) + '.' + extension for fname in baseline_images]
+ for src,dst in zip( orig_expected_fnames, expected_fnames ):
+ if not os.path.exists(dst):
+ shutil.copyfile(src,dst)
 actual_fnames = [os.path.join(result_dir, fname) + '.' + extension for fname in baseline_images]
 have_baseline_images = [os.path.exists(expected) for expected in expected_fnames]
 have_baseline_image = np.all(have_baseline_images)
@@ -148,15 +152,10 @@
 basedir = os.path.dirname(matplotlib.tests.__file__)
 
 baseline_dir = os.path.join(basedir,'baseline_images',subdir)
- result_dir = os.path.join(basedir,'current_images',subdir)
+ result_dir = os.path.abspath(os.path.join('result_images',subdir))
 
 if not os.path.exists(result_dir):
- try:
- # make the current_images directory first
- os.mkdir(os.path.join(basedir,'current_images'))
- except OSError:
- pass # probably exists already
- os.mkdir(result_dir)
+ os.makedirs(result_dir)
 
 return baseline_dir, result_dir
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7961
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7961&view=rev
Author: astraw
Date: 2009年11月12日 23:07:36 +0000 (2009年11月12日)
Log Message:
-----------
examples/pylab_examples/dolphin.py: fix zorder issue
Modified Paths:
--------------
 trunk/matplotlib/examples/pylab_examples/dolphin.py
Modified: trunk/matplotlib/examples/pylab_examples/dolphin.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/dolphin.py	2009年11月12日 23:05:45 UTC (rev 7960)
+++ trunk/matplotlib/examples/pylab_examples/dolphin.py	2009年11月12日 23:07:36 UTC (rev 7961)
@@ -20,7 +20,7 @@
 im = plt.imshow(np.random.random((100, 100)),
 origin='lower', cmap=cm.winter,
 interpolation='spline36',
- extent=([-1, 1, -1, 1]), zorder=1000)
+ extent=([-1, 1, -1, 1]))
 im.set_clip_path(circle)
 
 plt.plot(x, y, 'o', color=(0.9, 0.9, 1.0), alpha=0.8)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7960
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7960&view=rev
Author: astraw
Date: 2009年11月12日 23:05:45 +0000 (2009年11月12日)
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.

Revision: 7959
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7959&view=rev
Author: astraw
Date: 2009年11月12日 22:49:37 +0000 (2009年11月12日)
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.

Revision: 7958
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7958&view=rev
Author: astraw
Date: 2009年11月12日 22:47:43 +0000 (2009年11月12日)
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.

Revision: 7957
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7957&view=rev
Author: astraw
Date: 2009年11月12日 22:17:24 +0000 (2009年11月12日)
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.

Revision: 7956
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7956&view=rev
Author: mdboom
Date: 2009年11月12日 20:53:36 +0000 (2009年11月12日)
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.

Revision: 7955
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7955&view=rev
Author: jouni
Date: 2009年11月12日 17:57:13 +0000 (2009年11月12日)
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.

Revision: 7954
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7954&view=rev
Author: mdboom
Date: 2009年11月12日 17:31:19 +0000 (2009年11月12日)
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 (2009年11月12日) | 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.

Revision: 7953
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7953&view=rev
Author: jouni
Date: 2009年11月12日 17:28:22 +0000 (2009年11月12日)
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.

Revision: 7952
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7952&view=rev
Author: mdboom
Date: 2009年11月12日 17:27:34 +0000 (2009年11月12日)
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.

Revision: 7951
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7951&view=rev
Author: leejjoon
Date: 2009年11月11日 23:59:23 +0000 (2009年11月11日)
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.

Revision: 7950
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7950&view=rev
Author: astraw
Date: 2009年11月10日 21:03:51 +0000 (2009年11月10日)
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.

Revision: 7949
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7949&view=rev
Author: jswhit
Date: 2009年11月07日 13:29:12 +0000 (2009年11月07日)
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.

Revision: 7948
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7948&view=rev
Author: leejjoon
Date: 2009年11月07日 06:53:49 +0000 (2009年11月07日)
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.

Revision: 7947
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7947&view=rev
Author: leejjoon
Date: 2009年11月06日 22:33:34 +0000 (2009年11月06日)
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.

Revision: 7946
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7946&view=rev
Author: leejjoon
Date: 2009年11月06日 21:54:57 +0000 (2009年11月06日)
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.

Revision: 7945
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7945&view=rev
Author: mdboom
Date: 2009年11月06日 19:26:35 +0000 (2009年11月06日)
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 (2009年11月06日) | 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.

Revision: 7944
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7944&view=rev
Author: mdboom
Date: 2009年11月06日 19:24:55 +0000 (2009年11月06日)
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.