Merged revisions 6915-6916 via svnmerge from

mdboom · mdboom · commit 877cdd9b991c · 2009-02-16T14:24:56.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6915 | mdboom | 2009-02-16 09:12:13 -0500 (Mon, 16 Feb 2009) | 2 lines Move the mathmpl Sphinx extension to the installed tree so that other projects can take advantage of it. ........ r6916 | mdboom | 2009-02-16 09:18:36 -0500 (Mon, 16 Feb 2009) | 1 line Update CHANGELOG ........ svn path=/trunk/matplotlib/; revision=6917
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2009-02-16 Move mathmpl.py to the installed source tree so it is
+           available to other projects. - MGD
+
 2009-02-14 Added the legend title support - JJL
 
 2009-02-10 Fixed a bug in backend_pdf so it doesn't break when the setting
diff --git a/doc/conf.py b/doc/conf.py
@@ -27,9 +27,9 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['mathmpl', 'math_symbol_table', 'sphinx.ext.autodoc',
-              'only_directives', 'plot_directive', 'inheritance_diagram',
-              'gen_gallery', 'gen_rst']
+extensions = ['matplotlib.sphinxext.mathmpl', 'math_symbol_table',
+              'sphinx.ext.autodoc', 'matplotlib.sphinxext.only_directives',
+              'plot_directive', 'inheritance_diagram', 'gen_gallery', 'gen_rst']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/lib/matplotlib/sphinxext/__init__.py b/lib/matplotlib/sphinxext/__init__.py
@@ -0,0 +1 @@
+
diff --git a/lib/matplotlib/sphinxext/mathmpl.py b/lib/matplotlib/sphinxext/mathmpl.py
@@ -1,25 +1,3 @@
-"""matplotlib-based directive for math rendering in reST using sphinx.
-
-To use this extension, add ``mathmpl`` to the list of extensions in
-:file:`conf.py`.
-
-Note:
-
-Current SVN versions of Sphinx now include built-in support for math.
-There are two flavors:
-
-  - pngmath: uses dvipng to render the equation
-
-  - jsmath: renders the math in the browser using Javascript
-
-To use these extensions instead of the code in this module, add
-``sphinx.ext.pngmath`` or ``sphinx.ext.jsmath`` to the list of extensions in
-:file:`conf.py` instead of ``mathmpl``.
-
-All three of these options for math are designed to behave in the same
-way.
-"""
-
 import os
 import sys
 try:
diff --git a/lib/matplotlib/sphinxext/only_directives.py b/lib/matplotlib/sphinxext/only_directives.py
@@ -1,15 +1,11 @@
-"""Sphinx directives for selective inclusion of contents.
+#
+# A pair of directives for inserting content that will only appear in
+# either html or latex.
+#
 
-A pair of directives for inserting content that will only appear in
-either html or latex.
-"""
-
-# Required modules
 from docutils.nodes import Body, Element
 from docutils.parsers.rst import directives
 
-
-# Code begins
 class only_base(Body, Element):
     def dont_traverse(self, *args, **kwargs):
         return []
diff --git a/setup.py b/setup.py
@@ -58,7 +58,8 @@
     'matplotlib.numerix.npyma',
     'matplotlib.numerix.linear_algebra',
     'matplotlib.numerix.random_array',
-    'matplotlib.numerix.fft'
+    'matplotlib.numerix.fft',
+    'matplotlib.sphinxext'
     ]
 
 py_modules = ['pylab']

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@`
`58`	`58`	`'matplotlib.numerix.npyma',`
`59`	`59`	`'matplotlib.numerix.linear_algebra',`
`60`	`60`	`'matplotlib.numerix.random_array',`
`61`		`- 'matplotlib.numerix.fft'`
	`61`	`+ 'matplotlib.numerix.fft',`
	`62`	`+ 'matplotlib.sphinxext'`
`62`	`63`	`]`
`63`	`64`
`64`	`65`	`py_modules = ['pylab']`