Merged revisions 7880 via svnmerge from

leejjoon · leejjoon · commit 0cc6af6081a2 · 2009-10-13T05:10:26.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7880 | leejjoon | 2009-10-12 19:02:27 -0400 (Mon, 12 Oct 2009) | 1 line fix plot_directive.py that generated incorrect links for some cases ........ svn path=/trunk/matplotlib/; revision=7881
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -291,12 +291,10 @@ def _plot_directive(plot_path, basedir, function_name, plot_code, caption,
     # the temporary directory, and then sphinx moves the file to
     # build/html/_images for us later.
     rstdir, rstfile = os.path.split(state_machine.document.attributes['source'])
-    reldir = rstdir[len(setup.confdir)+1:]
-    relparts = [p for p in os.path.split(reldir) if p.strip()]
-    nparts = len(relparts)
     outdir = os.path.join('plot_directive', basedir)
-    linkdir = ('../' * nparts) + outdir
-
+    reldir = relpath(setup.confdir, rstdir)
+    linkdir = os.path.join(reldir, outdir)
+    
     # tmpdir is where we build all the output files.  This way the
     # plots won't have to be redone when generating latex after html.
 
