matplotlib-checkins Mailing List for matplotlib

Revision: 6453
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6453&view=rev
Author: jdh2358
Date: 2008年11月25日 21:43:36 +0000 (2008年11月25日)
Log Message:
-----------
added rc param axes.unicode_minus
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/lib/matplotlib/projections/polar.py
 trunk/matplotlib/lib/matplotlib/rcsetup.py
 trunk/matplotlib/lib/matplotlib/ticker.py
 trunk/matplotlib/matplotlibrc.template
Added Paths:
-----------
 trunk/matplotlib/examples/api/unicode_minus.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008年11月25日 21:14:13 UTC (rev 6452)
+++ trunk/matplotlib/CHANGELOG	2008年11月25日 21:43:36 UTC (rev 6453)
@@ -1,3 +1,6 @@
+2008年11月25日 Added rcParam axes.unicode_minus which allows plain hypen
+ for minus when False - JDH
+
 2008年11月25日 Added scatterpoints support in Legend. patch by Erik
 Tollerud - JJL
 
Added: trunk/matplotlib/examples/api/unicode_minus.py
===================================================================
--- trunk/matplotlib/examples/api/unicode_minus.py	 (rev 0)
+++ trunk/matplotlib/examples/api/unicode_minus.py	2008年11月25日 21:43:36 UTC (rev 6453)
@@ -0,0 +1,18 @@
+"""
+You can use the proper typesetting unicode minus (see
+http://en.wikipedia.org/wiki/Plus_sign#Plus_sign) or the ASCII hypen
+for minus, which some people prefer. The matplotlibrc param
+axes.unicode_minus controls the default behavior.
+
+The default is to use the unicode minus
+"""
+import numpy as np
+import matplotlib
+import matplotlib.pyplot as plt
+
+matplotlib.rcParams['axes.unicode_minus'] = False
+fig = plt.figure()
+ax = fig.add_subplot(111)
+ax.plot(10*np.random.randn(100), 10*np.random.randn(100), 'o')
+ax.set_title('Using hypen instead of unicode minus')
+plt.show()
Modified: trunk/matplotlib/lib/matplotlib/projections/polar.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/projections/polar.py	2008年11月25日 21:14:13 UTC (rev 6452)
+++ trunk/matplotlib/lib/matplotlib/projections/polar.py	2008年11月25日 21:43:36 UTC (rev 6453)
@@ -139,6 +139,11 @@
 if rcParams['text.usetex'] and not rcParams['text.latex.unicode']:
 return r"$%d^\circ$" % ((x / npy.pi) * 180.0)
 else:
+ # we use unicode, rather than mathtext with \circ, so
+ # that it will work correctly with any arbitrary font
+ # (assuming it has a degree sign), whereas 5ドル\circ$
+ # will only work correctly with one of the supported
+ # math fonts (Computer Modern and STIX)
 return u"%d\u00b0" % ((x / npy.pi) * 180.0)
 
 class RadialLocator(Locator):
Modified: trunk/matplotlib/lib/matplotlib/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/rcsetup.py	2008年11月25日 21:14:13 UTC (rev 6452)
+++ trunk/matplotlib/lib/matplotlib/rcsetup.py	2008年11月25日 21:43:36 UTC (rev 6453)
@@ -412,6 +412,7 @@
 # use scientific notation if log10
 # of the axis range is smaller than the
 # first or larger than the second
+ 'axes.unicode_minus' : [True, validate_bool],
 
 'polaraxes.grid' : [True, validate_bool], # display polar grid or not
 
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py	2008年11月25日 21:14:13 UTC (rev 6452)
+++ trunk/matplotlib/lib/matplotlib/ticker.py	2008年11月25日 21:43:36 UTC (rev 6453)
@@ -313,7 +313,7 @@
 
 def fix_minus(self, s):
 'use a unicode minus rather than hyphen'
- if rcParams['text.usetex']: return s
+ if rcParams['text.usetex'] or not rcParams['axes.unicode_minus']: return s
 else: return s.replace('-', u'\u2212')
 
 def __call__(self, x, pos=None):
Modified: trunk/matplotlib/matplotlibrc.template
===================================================================
--- trunk/matplotlib/matplotlibrc.template	2008年11月25日 21:14:13 UTC (rev 6452)
+++ trunk/matplotlib/matplotlibrc.template	2008年11月25日 21:43:36 UTC (rev 6453)
@@ -205,6 +205,8 @@
 #axes.formatter.limits : -7, 7 # use scientific notation if log10
 # of the axis range is smaller than the
 # first or larger than the second
+#axes.unicode_minus : True # use unicode for the minus symbol
+ # rather than hypen. See http://en.wikipedia.org/wiki/Plus_sign#Plus_sign
 
 #polaraxes.grid : True # display grid on polar axes
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6452
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6452&view=rev
Author: jdh2358
Date: 2008年11月25日 21:14:13 +0000 (2008年11月25日)
Log Message:
-----------
added a chance for polar with usetex to remove unicode symbol
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/projections/polar.py
Modified: trunk/matplotlib/lib/matplotlib/projections/polar.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/projections/polar.py	2008年11月25日 21:13:09 UTC (rev 6451)
+++ trunk/matplotlib/lib/matplotlib/projections/polar.py	2008年11月25日 21:14:13 UTC (rev 6452)
@@ -136,7 +136,7 @@
 """
 def __call__(self, x, pos=None):
 # \u00b0 : degree symbol
- if rcParams['text.usetex']:
+ if rcParams['text.usetex'] and not rcParams['text.latex.unicode']:
 return r"$%d^\circ$" % ((x / npy.pi) * 180.0)
 else:
 return u"%d\u00b0" % ((x / npy.pi) * 180.0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6451
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6451&view=rev
Author: jdh2358
Date: 2008年11月25日 21:13:09 +0000 (2008年11月25日)
Log Message:
-----------
added a chance for polar with usetex to remove unicode symbol
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/projections/polar.py
Modified: trunk/matplotlib/lib/matplotlib/projections/polar.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/projections/polar.py	2008年11月25日 19:56:39 UTC (rev 6450)
+++ trunk/matplotlib/lib/matplotlib/projections/polar.py	2008年11月25日 21:13:09 UTC (rev 6451)
@@ -136,7 +136,10 @@
 """
 def __call__(self, x, pos=None):
 # \u00b0 : degree symbol
- return u"%d\u00b0" % ((x / npy.pi) * 180.0)
+ if rcParams['text.usetex']:
+ return r"$%d^\circ$" % ((x / npy.pi) * 180.0)
+ else:
+ return u"%d\u00b0" % ((x / npy.pi) * 180.0)
 
 class RadialLocator(Locator):
 """
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6450
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6450&view=rev
Author: jdh2358
Date: 2008年11月25日 19:56:39 +0000 (2008年11月25日)
Log Message:
-----------
removed comment from invalid shared axis merge
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/mlab.py
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2008年11月25日 19:33:05 UTC (rev 6449)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2008年11月25日 19:56:39 UTC (rev 6450)
@@ -2460,8 +2460,10 @@
 
 # Get header and remove invalid characters
 needheader = names is None
+
 if needheader:
 for row in reader:
+ #print 'csv2rec', row
 if len(row) and row[0].startswith(comments):
 continue
 headers = row
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6449
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6449&view=rev
Author: mdboom
Date: 2008年11月25日 19:33:05 +0000 (2008年11月25日)
Log Message:
-----------
Remove code that was inadvertently merged from branch.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backend_bases.py
Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py	2008年11月25日 18:56:57 UTC (rev 6448)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py	2008年11月25日 19:33:05 UTC (rev 6449)
@@ -1883,14 +1883,7 @@
 for cur_xypress in self._xypress:
 x, y = event.x, event.y
 lastx, lasty, a, ind, lim, trans = cur_xypress
- # JDH: I don't know why this is here but I expect to be
- # able to zoomo on any axis that is shared. This was
- # breaking zoom-to-rect on sharex_axis_demo if the zoom
- # happened in ax2 or ax3 so i am replacing the continue
- # with a pass until this is sorted out
- if a._sharex or a._sharey:
- #continue
- pass
+
 # ignore singular clicks - 5 pixels is a threshold
 if abs(x-lastx)<5 or abs(y-lasty)<5:
 self._xypress = None
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6448
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6448&view=rev
Author: leejjoon
Date: 2008年11月25日 18:56:57 +0000 (2008年11月25日)
Log Message:
-----------
scatterpoints support in Legend. patch by Erik Tollerud
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/lib/matplotlib/legend.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008年11月25日 18:28:13 UTC (rev 6447)
+++ trunk/matplotlib/CHANGELOG	2008年11月25日 18:56:57 UTC (rev 6448)
@@ -1,3 +1,6 @@
+2008年11月25日 Added scatterpoints support in Legend. patch by Erik
+ Tollerud - JJL
+
 2008年11月24日 Fix crash in log ticking. - MGD
 
 2008年11月20日 Added static helper method BrokenHBarCollection.span_where
Modified: trunk/matplotlib/lib/matplotlib/legend.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/legend.py	2008年11月25日 18:28:13 UTC (rev 6447)
+++ trunk/matplotlib/lib/matplotlib/legend.py	2008年11月25日 18:56:57 UTC (rev 6448)
@@ -83,6 +83,7 @@
 def __init__(self, parent, handles, labels,
 loc = None,
 numpoints = None, # the number of points in the legend line
+ scatterpoints = 3, # TODO: may be an rcParam
 prop = None,
 pad = None, # the fractional whitespace inside the legend border
 borderpad = None,
@@ -101,6 +102,7 @@
 labels # a list of strings to label the legend
 loc # a location code
 numpoints = 4 # the number of points in the legend line
+ scatterpoints = 3 # the number of points for the scatterplot legend
 prop = FontProperties(size='smaller') # the font property
 pad = 0.2 # the fractional whitespace inside the legend border
 markerscale = 0.6 # the relative size of legend markers vs. original
@@ -118,10 +120,10 @@
 
 Artist.__init__(self)
 
- proplist=[numpoints, pad, borderpad, markerscale, labelsep,
+ proplist=[numpoints, scatterpoints, pad, borderpad, markerscale, labelsep,
 handlelen, handletextsep, axespad, shadow]
- propnames=['numpoints', 'pad', 'borderpad', 'markerscale', 'labelsep',
- 'handlelen', 'handletextsep', 'axespad', 'shadow']
+ propnames=['numpoints','scatterpoints', 'pad', 'borderpad', 'markerscale',
+ 'labelsep', 'handlelen', 'handletextsep', 'axespad', 'shadow']
 for name, value in safezip(propnames,proplist):
 if value is None:
 value=rcParams["legend."+name]
@@ -130,7 +132,9 @@
 warnings.warn("Use 'borderpad' instead of 'pad'.", DeprecationWarning)
 # 2008年10月04日
 if self.numpoints <= 0:
- raise ValueError("numpoints must be >= 0; it was %d"% numpoints)
+ raise ValueError("numpoints must be > 0; it was %d"% numpoints)
+ if self.scatterpoints <= 0:
+ raise ValueError("scatterpoints must be > 0; it was %d"% numpoints)
 if prop is None:
 self.prop=FontProperties(size=rcParams["legend.fontsize"])
 else:
@@ -142,8 +146,8 @@
 self._scatteryoffsets = np.array([4./8., 5./8., 3./8.])
 else:
 self._scatteryoffsets = np.asarray(scatteryoffsets)
- reps = int(self.numpoints / len(self._scatteryoffsets)) + 1
- self._scatteryoffsets = np.tile(self._scatteryoffsets, reps)[:self.numpoints]
+ reps = int(self.scatterpoints / len(self._scatteryoffsets)) + 1
+ self._scatteryoffsets = np.tile(self._scatteryoffsets, reps)[:self.scatterpoints]
 
 if isinstance(parent,Axes):
 self.isaxes = True
@@ -261,10 +265,14 @@
 # centered marker proxy
 
 for handle, label in safezip(handles, texts):
- if self.numpoints > 1:
- xdata = np.linspace(left, left + self.handlelen, self.numpoints)
+ if isinstance(handle, RegularPolyCollection):
+ npoints = self.scatterpoints
+ else:
+ npoints = self.numpoints
+ if npoints > 1:
+ xdata = np.linspace(left, left + self.handlelen, npoints)
 xdata_marker = xdata
- elif self.numpoints == 1:
+ elif npoints == 1:
 xdata = np.linspace(left, left + self.handlelen, 2)
 xdata_marker = [left + 0.5*self.handlelen]
 
@@ -326,8 +334,11 @@
 # we may need to scale these sizes by "markerscale"
 # attribute. But other handle types does not seem
 # to care about this attribute and it is currently ignored.
- sizes = [.5*(size_max+size_min), size_max,
- size_min]
+ if self.scatterpoints < 4:
+ sizes = [.5*(size_max+size_min), size_max,
+ size_min]
+ else:
+ sizes = size_max*np.linspace(0,1,self.scatterpoints)+size_min
 
 p = type(handle)(handle.get_numsides(),
 rotation=handle.get_rotation(),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6447
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6447&view=rev
Author: jdh2358
Date: 2008年11月25日 18:28:13 +0000 (2008年11月25日)
Log Message:
-----------
fixed a zoom bug in sharex axis
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backend_bases.py
Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py	2008年11月25日 15:23:28 UTC (rev 6446)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py	2008年11月25日 18:28:13 UTC (rev 6447)
@@ -269,7 +269,7 @@
 gc.set_alpha(rgbFace[-1])
 rgbFace = rgbFace[:3]
 gc.set_antialiased(antialiaseds[i % Naa])
- 
+
 if Nurls:
 gc.set_url(urls[i % Nurls])
 
@@ -527,7 +527,7 @@
 matlab format string, a html hex color string, or a rgb tuple
 """
 return self._rgb
- 
+
 def get_url(self):
 """
 returns a url if one is set, None otherwise
@@ -633,7 +633,7 @@
 raise ValueError('Unrecognized linestyle: %s' % style)
 self._linestyle = style
 self.set_dashes(offset, dashes)
- 
+
 def set_url(self, url):
 """
 Sets the url for links in compatible backends
@@ -1531,7 +1531,7 @@
 
 if event.key == 'f':
 self.full_screen_toggle()
- 
+
 # *h*ome or *r*eset mnemonic
 elif event.key == 'h' or event.key == 'r' or event.key == "home":
 self.canvas.toolbar.home()
@@ -1883,8 +1883,14 @@
 for cur_xypress in self._xypress:
 x, y = event.x, event.y
 lastx, lasty, a, ind, lim, trans = cur_xypress
+ # JDH: I don't know why this is here but I expect to be
+ # able to zoomo on any axis that is shared. This was
+ # breaking zoom-to-rect on sharex_axis_demo if the zoom
+ # happened in ax2 or ax3 so i am replacing the continue
+ # with a pass until this is sorted out
 if a._sharex or a._sharey:
- continue
+ #continue
+ pass
 # ignore singular clicks - 5 pixels is a threshold
 if abs(x-lastx)<5 or abs(y-lasty)<5:
 self._xypress = None
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6446
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6446&view=rev
Author: mdboom
Date: 2008年11月25日 15:23:28 +0000 (2008年11月25日)
Log Message:
-----------
Fix mathtext (bug has existed since r6400 11/12/2008)
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/font_manager.py
Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py	2008年11月25日 04:03:59 UTC (rev 6445)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py	2008年11月25日 15:23:28 UTC (rev 6446)
@@ -592,7 +592,7 @@
 verbose.report("Cannot handle unicode filenames")
 #print >> sys.stderr, 'Bad file is', fpath
 continue
- try: prop = ttfFontProperty(fpath, font)
+ try: prop = ttfFontProperty(font)
 except: continue
 
 fontlist.append(prop)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6445
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6445&view=rev
Author: jdh2358
Date: 2008年11月25日 04:03:59 +0000 (2008年11月25日)
Log Message:
-----------
point to the right url for the rc file
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/doc/_templates/gallery.html
 trunk/matplotlib/doc/_templates/indexsidebar.html
 trunk/matplotlib/doc/make.py
 trunk/matplotlib/doc/users/customizing.rst
 trunk/matplotlib/lib/matplotlib/__init__.py
 trunk/matplotlib/matplotlibrc.template
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008年11月24日 20:18:38 UTC (rev 6444)
+++ trunk/matplotlib/CHANGELOG	2008年11月25日 04:03:59 UTC (rev 6445)
@@ -1,9 +1,8 @@
 2008年11月24日 Fix crash in log ticking. - MGD
 
-2008年11月20日 Added some static helper methods
- BrokenHBarCollection.span_masked and
- PolyCollection.fill_between_where for visualizing logical
- regions. See examples/api/fill_where_demo.py - JDH
+2008年11月20日 Added static helper method BrokenHBarCollection.span_where
+ and Axes/pyplot method fill_between. See
+ examples/pylab/fill_between.py - JDH
 
 2008年11月12日 Add x_isdata and y_isdata attributes to Artist instances,
 and use them to determine whether either or both
Modified: trunk/matplotlib/doc/_templates/gallery.html
===================================================================
--- trunk/matplotlib/doc/_templates/gallery.html	2008年11月24日 20:18:38 UTC (rev 6444)
+++ trunk/matplotlib/doc/_templates/gallery.html	2008年11月25日 04:03:59 UTC (rev 6445)
@@ -49,6 +49,8 @@
 
 <a href="examples/api/scatter_piecharts.html"><img src="_static/plot_directive/mpl_examples/api/thumbnails/scatter_piecharts.png" border="0" alt="scatter_piecharts"/></a>
 
+<a href="examples/api/span_regions.html"><img src="_static/plot_directive/mpl_examples/api/thumbnails/span_regions.png" border="0" alt="span_regions"/></a>
+
 <a href="examples/api/two_scales.html"><img src="_static/plot_directive/mpl_examples/api/thumbnails/two_scales.png" border="0" alt="two_scales"/></a>
 
 <a href="examples/api/watermark_image.html"><img src="_static/plot_directive/mpl_examples/api/thumbnails/watermark_image.png" border="0" alt="watermark_image"/></a>
@@ -157,6 +159,8 @@
 
 <a href="examples/pylab_examples/csd_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/csd_demo.png" border="0" alt="csd_demo"/></a>
 
+<a href="examples/pylab_examples/custom_cmap.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/custom_cmap.png" border="0" alt="custom_cmap"/></a>
+
 <a href="examples/pylab_examples/custom_figure_class.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/custom_figure_class.png" border="0" alt="custom_figure_class"/></a>
 
 <a href="examples/pylab_examples/custom_ticker1.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/custom_ticker1.png" border="0" alt="custom_ticker1"/></a>
@@ -223,9 +227,9 @@
 
 <a href="examples/pylab_examples/figure_title.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/figure_title.png" border="0" alt="figure_title"/></a>
 
-<a href="examples/pylab_examples/fill_between.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/fill_between.png" border="0" alt="fill_between"/></a>
+<a href="examples/pylab_examples/fill_between.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/fill_between_00.png" border="0" alt="fill_between"/></a>
 
-<a href="examples/pylab_examples/fill_between_posneg.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/fill_between_posneg.png" border="0" alt="fill_between_posneg"/></a>
+<a href="examples/pylab_examples/fill_between.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/fill_between_01.png" border="0" alt="fill_between"/></a>
 
 <a href="examples/pylab_examples/fill_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/fill_demo.png" border="0" alt="fill_demo"/></a>
 
@@ -419,6 +423,8 @@
 
 <a href="examples/pylab_examples/psd_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/psd_demo.png" border="0" alt="psd_demo"/></a>
 
+<a href="examples/pylab_examples/psd_demo2.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/psd_demo2.png" border="0" alt="psd_demo2"/></a>
+
 <a href="examples/pylab_examples/pythonic_matplotlib.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/pythonic_matplotlib.png" border="0" alt="pythonic_matplotlib"/></a>
 
 <a href="examples/pylab_examples/quadmesh_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/quadmesh_demo.png" border="0" alt="quadmesh_demo"/></a>
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html	2008年11月24日 20:18:38 UTC (rev 6444)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html	2008年11月25日 04:03:59 UTC (rev 6445)
@@ -33,7 +33,7 @@
 
 <p>For details on what's new, see the detailed <a href="{{
 pathto('_static/CHANGELOG', 1) }}">changelog</a>. Anything that could
-required changes to your existing codes is logged in the <a href="{{
+require changes to your existing codes is logged in the <a href="{{
 pathto('api/api_changes.html', 1) }}">api changes</a> file.</p>
 
 <h3>Other stuff</h3>
Modified: trunk/matplotlib/doc/make.py
===================================================================
--- trunk/matplotlib/doc/make.py	2008年11月24日 20:18:38 UTC (rev 6444)
+++ trunk/matplotlib/doc/make.py	2008年11月25日 04:03:59 UTC (rev 6445)
@@ -17,9 +17,6 @@
 def sf():
 'push a copy to the sf site'
 shutil.copy('../CHANGELOG', 'build/html/_static/CHANGELOG')
- shutil.copy('../API_CHANGES', 'build/html/_static/API_CHANGES')
- shutil.copy('../MIGRATION.txt', 'build/html/_static/MIGRATION.txt')
-
 os.system('cd build/html; rsync -avz . jdh2358,mat...@we...:/home/groups/m/ma/matplotlib/htdocs/ -essh --cvs-exclude')
 
 def sfpdf():
@@ -44,6 +41,7 @@
 check_build()
 if not os.path.exists('examples/index.rst'):
 examples()
+ shutil.copy('mpl_data/matplotlibrc', '_static/matplotlibrc')
 #figs()
 if os.system('sphinx-build -b html -d build/doctrees . build/html'):
 raise SystemExit("Building HTML failed.")
Modified: trunk/matplotlib/doc/users/customizing.rst
===================================================================
--- trunk/matplotlib/doc/users/customizing.rst	2008年11月24日 20:18:38 UTC (rev 6444)
+++ trunk/matplotlib/doc/users/customizing.rst	2008年11月25日 04:03:59 UTC (rev 6445)
@@ -61,6 +61,10 @@
 .. _matplotlibrc-sample:
 
 A sample matplotlibrc file
---------------------------
+--------------------------------------------------------------------
 
+.. htmlonly::
+
+ `(download) <../_static/matplotlibrc>`__
+
 .. literalinclude:: ../mpl_data/matplotlibrc
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2008年11月24日 20:18:38 UTC (rev 6444)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2008年11月25日 04:03:59 UTC (rev 6445)
@@ -666,7 +666,7 @@
 Bad key "%s" on line %d in
 %s.
 You probably need to get an updated matplotlibrc file from
-http://matplotlib.sf.net/matplotlibrc or from the matplotlib source
+http://matplotlib.sf.net/_static/matplotlibrc or from the matplotlib source
 distribution""" % (key, cnt, fname)
 
 if ret['datapath'] is None:
Modified: trunk/matplotlib/matplotlibrc.template
===================================================================
--- trunk/matplotlib/matplotlibrc.template	2008年11月24日 20:18:38 UTC (rev 6444)
+++ trunk/matplotlib/matplotlibrc.template	2008年11月25日 04:03:59 UTC (rev 6445)
@@ -10,13 +10,16 @@
 # (win32 systems).
 #
 # This file is best viewed in a editor which supports python mode
-# syntax highlighting # Blank lines, or lines starting with a comment
+# syntax highlighting. Blank lines, or lines starting with a comment
 # symbol, are ignored, as are trailing comments. Other lines must
-# have the format # key : val # optional comment # Colors: for the
-# color values below, you can either use - a matplotlib color string,
-# such as r, k, or b - an rgb tuple, such as (1.0, 0.5, 0.0) - a hex
-# string, such as ff00ff or #ff00ff - a scalar grayscale intensity
-# such as 0.75 - a legal html color name, eg red, blue, darkslategray
+# have the format
+# key : val # optional comment
+#
+# Colors: for the color values below, you can either use - a
+# matplotlib color string, such as r, k, or b - an rgb tuple, such as
+# (1.0, 0.5, 0.0) - a hex string, such as ff00ff or #ff00ff - a scalar
+# grayscale intensity such as 0.75 - a legal html color name, eg red,
+# blue, darkslategray
 
 #### CONFIGURATION BEGINS HERE
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.