Revision: 5518
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5518&view=rev
Author: jdh2358
Date: 2008-06-13 12:23:21 -0700 (Fri, 13 Jun 2008)
Log Message:
-----------
updates to rc and scaling for docs to get nice sizes for html and pdf
Modified Paths:
--------------
trunk/matplotlib/doc/devel/documenting_mpl.rst
trunk/matplotlib/doc/matplotlibrc
trunk/matplotlib/doc/sphinxext/plot_directive.py
trunk/matplotlib/doc/users/annotations.rst
trunk/matplotlib/doc/users/artists.rst
trunk/matplotlib/doc/users/mathtext.rst
trunk/matplotlib/doc/users/navigation_toolbar.rst
trunk/matplotlib/doc/users/pyplot_tutorial.rst
trunk/matplotlib/doc/users/text_intro.rst
trunk/matplotlib/doc/users/text_props.rst
Modified: trunk/matplotlib/doc/devel/documenting_mpl.rst
===================================================================
--- trunk/matplotlib/doc/devel/documenting_mpl.rst 2008-06-13 19:13:50 UTC
(rev 5517)
+++ trunk/matplotlib/doc/devel/documenting_mpl.rst 2008-06-13 19:23:21 UTC
(rev 5518)
@@ -115,12 +115,13 @@
html or a pdf for latex::
.. plot:: pyplot_simple.py
- :scale: 75
:include-source:
-The ``:scale:`` directive rescales the image to some percentage of the original
-size. ``:include-source:`` will present the contents of the file, marked up as
-source code.
+The ``:scale:`` directive rescales the image to some percentage of the
+original size, though we don't recommend using this in most cases
+since it is probably better to choose the correct figure size and dpi
+in mpl and let it handle the scaling. ``:include-source:`` will
+present the contents of the file, marked up as source code.
Static figures
--------------
Modified: trunk/matplotlib/doc/matplotlibrc
===================================================================
--- trunk/matplotlib/doc/matplotlibrc 2008-06-13 19:13:50 UTC (rev 5517)
+++ trunk/matplotlib/doc/matplotlibrc 2008-06-13 19:23:21 UTC (rev 5518)
@@ -233,7 +233,7 @@
### FIGURE
# See http://matplotlib.sourceforge.net/matplotlib.figure.html#Figure
-#figure.figsize : 8, 6 # figure size in inches
+figure.figsize : 6, 4 # figure size in inches
#figure.dpi : 80 # figure dots per inch
#figure.facecolor : 0.75 # figure facecolor; 0.75 is scalar gray
#figure.edgecolor : white # figure edgecolor
Modified: trunk/matplotlib/doc/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/doc/sphinxext/plot_directive.py 2008-06-13 19:13:50 UTC
(rev 5517)
+++ trunk/matplotlib/doc/sphinxext/plot_directive.py 2008-06-13 19:23:21 UTC
(rev 5518)
@@ -43,12 +43,13 @@
template_no_source = """
.. htmlonly::
+ [ `<../%(srcdir)s/%(reference)s>`__,
+ `png <../%(srcdir)s/%(basename)s.hires.png>`__,
+ `pdf <../%(srcdir)s/%(basename)s.pdf>`__ ]
+
.. image:: ../%(srcdir)s/%(basename)s.png
%(options)s
- `[%(basename)s source py] <../%(srcdir)s/%(reference)s>`_
- `[%(basename)s highres png] <../%(srcdir)s/%(basename)s.hires.png>`_
- `[%(basename)s pdf] <../%(srcdir)s/%(basename)s.pdf>`_
.. latexonly::
.. image:: ../%(srcdir)s/%(basename)s.pdf
@@ -61,13 +62,13 @@
.. htmlonly::
+ [ `py <../%(srcdir)s/%(reference)s>`__,
+ `png <../%(srcdir)s/%(basename)s.hires.png>`__,
+ `pdf <../%(srcdir)s/%(basename)s.pdf>`__ ]
+
.. image:: ../%(srcdir)s/%(basename)s.png
%(options)s
- `[%(basename)s source py] <../%(srcdir)s/%(reference)s>`_
- `[%(basename)s highres png] <../%(srcdir)s/%(basename)s.hires.png>`_
- `[%(basename)s pdf] <../%(srcdir)s/%(basename)s.pdf>`_
-
.. latexonly::
.. image:: ../%(srcdir)s/%(basename)s.pdf
%(options)s
@@ -103,15 +104,11 @@
mplshell.magic_run(fullpath)
for format, dpi in formats:
- #print 'saving', outdir, basename, format
outname = os.path.join(outdir, '%s.%s' % (basename, format))
plt.savefig(outname, dpi=dpi)
print ' all figures made'
def run(arguments, options, state_machine, lineno):
- #print 'arguments', arguments
- #print 'options', options
-
reference = directives.uri(arguments[0])
basename, ext = os.path.splitext(reference)
Modified: trunk/matplotlib/doc/users/annotations.rst
===================================================================
--- trunk/matplotlib/doc/users/annotations.rst 2008-06-13 19:13:50 UTC (rev
5517)
+++ trunk/matplotlib/doc/users/annotations.rst 2008-06-13 19:23:21 UTC (rev
5518)
@@ -14,8 +14,8 @@
.. plot:: annotation_basic.py
:include-source:
- :scale: 75
+
In this example, both the ``xy`` (arrow tip) and ``xytext`` locations
(text location) are in data coordinates. There are a variety of other
coordinate systems one can choose -- you can specify the coordinate
@@ -73,7 +73,6 @@
``Text`` instance
.. plot:: annotation_polar.py
- :scale: 75
:include-source:
See the `annotations demo
Modified: trunk/matplotlib/doc/users/artists.rst
===================================================================
--- trunk/matplotlib/doc/users/artists.rst 2008-06-13 19:13:50 UTC (rev
5517)
+++ trunk/matplotlib/doc/users/artists.rst 2008-06-13 19:23:21 UTC (rev
5518)
@@ -136,7 +136,6 @@
Try creating the figure below.
.. plot:: fig_axes_labels_simple.py
- :scale: 75
.. _customizing-artists:
@@ -327,7 +326,6 @@
In [195]: fig.canvas.draw()
.. plot:: fig_x.py
- :scale: 75
Here is a summary of the Artists the figure contains
@@ -605,7 +603,6 @@
the axes and tick properties
.. plot:: fig_axes_customize_simple.py
- :scale: 75
:include-source:
@@ -643,5 +640,4 @@
dollar signs and colors them green on the right side of the yaxis
.. plot:: dollar_ticks.py
- :scale: 75
:include-source:
Modified: trunk/matplotlib/doc/users/mathtext.rst
===================================================================
--- trunk/matplotlib/doc/users/mathtext.rst 2008-06-13 19:13:50 UTC (rev
5517)
+++ trunk/matplotlib/doc/users/mathtext.rst 2008-06-13 19:23:21 UTC (rev
5518)
@@ -272,7 +272,6 @@
Here is an example illustrating many of these features in context.
.. plot:: pyplot_mathtext.py
- :scale: 75
:include-source:
Modified: trunk/matplotlib/doc/users/navigation_toolbar.rst
===================================================================
--- trunk/matplotlib/doc/users/navigation_toolbar.rst 2008-06-13 19:13:50 UTC
(rev 5517)
+++ trunk/matplotlib/doc/users/navigation_toolbar.rst 2008-06-13 19:23:21 UTC
(rev 5518)
@@ -4,20 +4,16 @@
======================
.. image:: ../_static/toolbar.png
- :scale: 100
All figure windows come with a navigation toolbar, which can be used
to navigate through the data set. Here is a description of each of
the buttons at the bottom of the toolbar
.. image:: ../mpl_data/images/home.png
- :scale: 100
.. image:: ../mpl_data/images/back.png
- :scale: 100
.. image:: ../mpl_data/images/forward.png
- :scale: 100
The ``Forward`` and ``Back`` buttons
These are akin to the web browser forward and back buttons. They
@@ -31,7 +27,6 @@
the pan and zoom to rectangle to define new views.
.. image:: ../mpl_data/images/move.png
- :scale: 100
The ``Pan/Zoom`` button
This button has two modes: pan and zoom. Click the toolbar button
@@ -56,7 +51,6 @@
right mouse button.
.. image:: ../mpl_data/images/zoom_to_rect.png
- :scale: 100
The ``Zoom-to-rectangle`` button
Click this toolbar button to activate this mode. Put your mouse
@@ -68,7 +62,6 @@
region defined by the zoom out rectangle.
.. image:: ../mpl_data/images/subplots.png
- :scale: 100
The ``Subplot-configuration`` button
Use this tool to configure the parameters of the subplot: the
@@ -76,7 +69,6 @@
the columns.
.. image:: ../mpl_data/images/filesave.png
- :scale: 100
The ``Save`` button
Click this button to launch a file save dialog. You can save
Modified: trunk/matplotlib/doc/users/pyplot_tutorial.rst
===================================================================
--- trunk/matplotlib/doc/users/pyplot_tutorial.rst 2008-06-13 19:13:50 UTC
(rev 5517)
+++ trunk/matplotlib/doc/users/pyplot_tutorial.rst 2008-06-13 19:23:21 UTC
(rev 5518)
@@ -13,7 +13,6 @@
functions are directed to the current axes
.. plot:: pyplot_simple.py
- :scale: 75
:include-source:
You may be wondering why the x-axis ranges from 0-3 and the y-axis
@@ -38,7 +37,6 @@
example, to plot the above with red circles, you would issue
.. plot:: pyplot_formatstr.py
- :scale: 75
:include-source:
See the :func:`~matplotlib.pyplot.plot` documentation for a complete
@@ -55,7 +53,6 @@
using arrays.
.. plot:: pyplot_three.py
- :scale: 75
:include-source:
.. _controlling-line-properties:
@@ -161,7 +158,6 @@
scenes. Below is an script to create two subplots.
.. plot:: pyplot_two_subplots.py
- :scale: 75
:include-source:
The :func:`~matplotlib.pyplot.figure` command here is optional because
@@ -221,9 +217,9 @@
for a more detailed example)
.. plot:: pyplot_text.py
- :scale: 75
:include-source:
+
All of the :func:`~matplotlib.pyplot.text` commands return an
:class:`matplotlib.text.Text` instance. Just as with with lines
above, you can customize the properties by passing keyword arguments
@@ -265,9 +261,8 @@
two points to consider: the location being annotated represented by
the argument ``xy`` and the location of the text ``xytext``. Both of
these arguments are ``(x,y)`` tuples.
-
+
.. plot:: pyplot_annotate.py
- :scale: 75
:include-source:
In this basic example, both the ``xy`` (arrow tip) and ``xytext``
Modified: trunk/matplotlib/doc/users/text_intro.rst
===================================================================
--- trunk/matplotlib/doc/users/text_intro.rst 2008-06-13 19:13:50 UTC (rev
5517)
+++ trunk/matplotlib/doc/users/text_intro.rst 2008-06-13 19:23:21 UTC (rev
5518)
@@ -56,5 +56,4 @@
these commands in action.
.. plot:: text_commands.py
- :scale: 75
:include-source:
Modified: trunk/matplotlib/doc/users/text_props.rst
===================================================================
--- trunk/matplotlib/doc/users/text_props.rst 2008-06-13 19:13:50 UTC (rev
5517)
+++ trunk/matplotlib/doc/users/text_props.rst 2008-06-13 19:23:21 UTC (rev
5518)
@@ -58,5 +58,4 @@
upper right.
.. plot:: text_layout.py
- :scale: 75
:include-source:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
