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

[<jd...@us...>]

Revision: 5524
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5524&view=rev
Author:   jdh2358
Date:     2008-06-13 13:54:18 -0700 (Fri, 13 Jun 2008)

Log Message:
-----------
tried some svg and ps extensions but bailing for now because of usetex issues

Modified Paths:
--------------
    trunk/matplotlib/Makefile
    trunk/matplotlib/doc/sphinxext/plot_directive.py
    trunk/matplotlib/doc/users/customizing.rst
    trunk/matplotlib/doc/users/pyplot_tutorial.rst

Modified: trunk/matplotlib/Makefile
===================================================================
--- trunk/matplotlib/Makefile	2008-06-13 20:40:36 UTC (rev 5523)
+++ trunk/matplotlib/Makefile	2008-06-13 20:54:18 UTC (rev 5524)
@@ -37,7 +37,9 @@
 	python setup.py install --prefix=~/dev;\
 	cd doc;\
 	rm -rf build;\
-	python make.py clean html latex sf;
+	python make.py clean;\
+	svn up;\
+	python make.py html latex sf;
 
 
 

Modified: trunk/matplotlib/doc/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/doc/sphinxext/plot_directive.py	2008-06-13 20:40:36 UTC (rev 5523)
+++ trunk/matplotlib/doc/sphinxext/plot_directive.py	2008-06-13 20:54:18 UTC (rev 5524)
@@ -45,7 +45,7 @@
 
    [ `<../%(srcdir)s/%(reference)s>`__,
     `png <../%(srcdir)s/%(basename)s.hires.png>`__,
-    `pdf <../%(srcdir)s/%(basename)s.pdf>`__ ]
+    `pdf <../%(srcdir)s/%(basename)s.pdf>`__]
 
    .. image:: ../%(srcdir)s/%(basename)s.png
 %(options)s
@@ -64,7 +64,7 @@
 
    [ `py <../%(srcdir)s/%(reference)s>`__,
    `png <../%(srcdir)s/%(basename)s.hires.png>`__,
-   `pdf <../%(srcdir)s/%(basename)s.pdf>`__ ]
+   `pdf <../%(srcdir)s/%(basename)s.pdf>`__]
 
    .. image:: ../%(srcdir)s/%(basename)s.png
 %(options)s
@@ -83,7 +83,8 @@
     fullpath = str(fullpath)  # todo, why is unicode breaking this
     formats = [('png', 100),
                ('hires.png', 200),
-               ('pdf', 72)]
+               ('pdf', 72),
+               ]
 
     basedir, fname = os.path.split(fullpath)
     basename, ext = os.path.splitext(fname)
@@ -105,8 +106,10 @@
     mplshell.magic_run(fullpath)
     for format, dpi in formats:
         outname = os.path.join(outdir, '%s.%s' % (basename, format))
+        if os.path.exists(outname): continue
         plt.savefig(outname, dpi=dpi)
 
+
 def run(arguments, options, state_machine, lineno):
     reference = directives.uri(arguments[0])
     basename, ext = os.path.splitext(reference)

Modified: trunk/matplotlib/doc/users/customizing.rst
===================================================================
--- trunk/matplotlib/doc/users/customizing.rst	2008-06-13 20:40:36 UTC (rev 5523)
+++ trunk/matplotlib/doc/users/customizing.rst	2008-06-13 20:54:18 UTC (rev 5524)
@@ -6,8 +6,8 @@
 
 .. _customizing-with-matplotlibrc-files:
 
-The matplotlibrc File
-=====================
+The :file:`matplotlibrc` file
+=============================
 
 matplotlib uses :file:`matplotlibrc` configuration files to customize all kinds
 of properties, which we call `rc settings` or `rc parameters`. You can control

Modified: trunk/matplotlib/doc/users/pyplot_tutorial.rst
===================================================================
--- trunk/matplotlib/doc/users/pyplot_tutorial.rst	2008-06-13 20:40:36 UTC (rev 5523)
+++ trunk/matplotlib/doc/users/pyplot_tutorial.rst	2008-06-13 20:54:18 UTC (rev 5524)
@@ -5,7 +5,7 @@
 ***************
 
 :mod:`matplotlib.pyplot` is a collection of command style functions
-that make matplotlib work like matlab.  Each ``pyplot`` function makes
+that make matplotlib  work like matlab.  Each ``pyplot`` function makes
 some change to a figure: eg, create a figure, create a plotting area
 in a figure, plot some lines in a plotting area, decorate the plot
 with labels, etc....  :mod:`matplotlib.pyplot` is stateful, in that it


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