SF.net SVN: matplotlib:[7881] trunk/matplotlib

[<lee...@us...>]

Revision: 7881
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7881&view=rev
Author:   leejjoon
Date:     2009-10-13 05:10:26 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
Merged revisions 7880 via svnmerge from 
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
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_99_maint:1-7875
   + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7880

Modified: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py	2009-10-12 23:02:27 UTC (rev 7880)
+++ trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py	2009-10-13 05:10:26 UTC (rev 7881)
@@ -291,12 +291,10 @@
     # 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.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.