revert r8445,8446 and fix plot_directive.py to support sphinx 1.0

leejjoon · leejjoon · commit a6a2844d19bc · 2010-06-20T23:31:49.000Z
svn path=/trunk/matplotlib/; revision=8447
diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
@@ -178,6 +178,9 @@ Here is that gets a bounding box in relative figure coordinates (0..1)
 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 @@ behavior by specifying the coordinates of the label.  The example
 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
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -366,8 +366,13 @@ def _plot_directive(plot_path, basedir, function_name, plot_code, caption,
 
     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'])
