|
From: <lee...@us...> - 2010-06-20 23:31:55
|
Revision: 8447
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8447&view=rev
Author: leejjoon
Date: 2010-06-20 23:31:49 +0000 (Sun, 20 Jun 2010)
Log Message:
-----------
revert r8445,8446 and fix plot_directive.py to support sphinx 1.0
Modified Paths:
--------------
trunk/matplotlib/doc/faq/howto_faq.rst
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
Modified: trunk/matplotlib/doc/faq/howto_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/howto_faq.rst 2010-06-20 20:55:42 UTC (rev 8446)
+++ trunk/matplotlib/doc/faq/howto_faq.rst 2010-06-20 23:31:49 UTC (rev 8447)
@@ -178,6 +178,9 @@
of each of the labels and uses it to move the left of the subplots
over so that the tick labels fit in the figure
+.. plot:: pyplots/auto_subplots_adjust.py
+ :include-source:
+
.. _howto-ticks:
Configure the tick linewidths
@@ -218,6 +221,9 @@
below shows the default behavior in the left subplots, and the manual
setting in the right subplots.
+.. plot:: pyplots/align_ylabels.py
+ :include-source:
+
.. _date-index-plots:
Skip dates where there is no data
Modified: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2010-06-20 20:55:42 UTC (rev 8446)
+++ trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2010-06-20 23:31:49 UTC (rev 8447)
@@ -366,8 +366,13 @@
if options.has_key('include-source'):
if plot_code is None:
+ if sphinx_version > (1,):
+ include_prefix = '/'
+ else:
+ include_prefix = setup.app.builder.srcdir
+
lines.extend(
- ['.. include:: %s' % os.path.join(setup.app.builder.srcdir, plot_path),
+ ['.. include:: %s' % os.path.join(include_prefix, plot_path),
' :literal:'])
if options.has_key('encoding'):
lines.append(' :encoding: %s' % options['encoding'])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|