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

[<md...@us...>]

Revision: 6917
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6917&view=rev
Author:   mdboom
Date:     2009-02-16 14:24:56 +0000 (Mon, 16 Feb 2009)

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

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/doc/conf.py
    trunk/matplotlib/lib/matplotlib/sphinxext/__init__.py
    trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
    trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
    trunk/matplotlib/setup.py

Added Paths:
-----------
    trunk/matplotlib/lib/matplotlib/sphinxext/

Removed Paths:
-------------
    trunk/matplotlib/doc/sphinxext/mathmpl.py
    trunk/matplotlib/doc/sphinxext/only_directives.py

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README
    trunk/matplotlib/doc/sphinxext/gen_gallery.py
    trunk/matplotlib/doc/sphinxext/gen_rst.py


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6912
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6916
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-02-16 14:18:36 UTC (rev 6916)
+++ trunk/matplotlib/CHANGELOG	2009-02-16 14:24:56 UTC (rev 6917)
@@ -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

Modified: trunk/matplotlib/doc/conf.py
===================================================================
--- trunk/matplotlib/doc/conf.py	2009-02-16 14:18:36 UTC (rev 6916)
+++ trunk/matplotlib/doc/conf.py	2009-02-16 14:24:56 UTC (rev 6917)
@@ -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']


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916

Deleted: trunk/matplotlib/doc/sphinxext/mathmpl.py
===================================================================
--- trunk/matplotlib/doc/sphinxext/mathmpl.py	2009-02-16 14:18:36 UTC (rev 6916)
+++ trunk/matplotlib/doc/sphinxext/mathmpl.py	2009-02-16 14:24:56 UTC (rev 6917)
@@ -1,141 +0,0 @@
-"""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:
-    from hashlib import md5
-except ImportError:
-    from md5 import md5
-
-from docutils import nodes
-from docutils.parsers.rst import directives
-import warnings
-
-from matplotlib import rcParams
-from matplotlib.mathtext import MathTextParser
-rcParams['mathtext.fontset'] = 'cm'
-mathtext_parser = MathTextParser("Bitmap")
-
-# Define LaTeX math node:
-class latex_math(nodes.General, nodes.Element):
-    pass
-
-def fontset_choice(arg):
-    return directives.choice(arg, ['cm', 'stix', 'stixsans'])
-
-options_spec = {'fontset': fontset_choice}
-
-def math_role(role, rawtext, text, lineno, inliner,
-              options={}, content=[]):
-    i = rawtext.find('`')
-    latex = rawtext[i+1:-1]
-    node = latex_math(rawtext)
-    node['latex'] = latex
-    node['fontset'] = options.get('fontset', 'cm')
-    return [node], []
-math_role.options = options_spec
-
-def math_directive(name, arguments, options, content, lineno,
-                   content_offset, block_text, state, state_machine):
-    latex = ''.join(content)
-    node = latex_math(block_text)
-    node['latex'] = latex
-    node['fontset'] = options.get('fontset', 'cm')
-    return [node]
-
-# This uses mathtext to render the expression
-def latex2png(latex, filename, fontset='cm'):
-    latex = "$%s$" % latex
-    orig_fontset = rcParams['mathtext.fontset']
-    rcParams['mathtext.fontset'] = fontset
-    if os.path.exists(filename):
-        depth = mathtext_parser.get_depth(latex, dpi=100)
-    else:
-        try:
-            depth = mathtext_parser.to_png(filename, latex, dpi=100)
-        except:
-            warnings.warn("Could not render math expression %s" % latex,
-                          Warning)
-            depth = 0
-    rcParams['mathtext.fontset'] = orig_fontset
-    sys.stdout.write("#")
-    sys.stdout.flush()
-    return depth
-
-# LaTeX to HTML translation stuff:
-def latex2html(node, source):
-    inline = isinstance(node.parent, nodes.TextElement)
-    latex = node['latex']
-    name = 'math-%s' % md5(latex).hexdigest()[-10:]
-
-    destdir = os.path.join(setup.app.builder.outdir, '_images', 'mathmpl')
-    if not os.path.exists(destdir):
-        os.makedirs(destdir)
-    dest = os.path.join(destdir, '%s.png' % name)
-    path = os.path.join(setup.app.builder.imgpath, 'mathmpl')
-
-    depth = latex2png(latex, dest, node['fontset'])
-
-    if inline:
-        cls = ''
-    else:
-        cls = 'class="center" '
-    if inline and depth != 0:
-        style = 'style="position: relative; bottom: -%dpx"' % (depth + 1)
-    else:
-        style = ''
-
-    return '<img src="%s/%s.png" %s%s/>' % (path, name, cls, style)
-
-def setup(app):
-    setup.app = app
-
-    app.add_node(latex_math)
-    app.add_role('math', math_role)
-
-    # Add visit/depart methods to HTML-Translator:
-    def visit_latex_math_html(self, node):
-        source = self.document.attributes['source']
-        self.body.append(latex2html(node, source))
-    def depart_latex_math_html(self, node):
-        pass
-
-    # Add visit/depart methods to LaTeX-Translator:
-    def visit_latex_math_latex(self, node):
-        inline = isinstance(node.parent, nodes.TextElement)
-        if inline:
-            self.body.append('$%s$' % node['latex'])
-        else:
-            self.body.extend(['\\begin{equation}',
-                              node['latex'],
-                              '\\end{equation}'])
-    def depart_latex_math_latex(self, node):
-        pass
-
-    app.add_node(latex_math, html=(visit_latex_math_html,
-                                   depart_latex_math_html))
-    app.add_node(latex_math, latex=(visit_latex_math_latex,
-                                    depart_latex_math_latex))
-    app.add_role('math', math_role)
-    app.add_directive('math', math_directive,
-                      True, (0, 0, 0), **options_spec)

Deleted: trunk/matplotlib/doc/sphinxext/only_directives.py
===================================================================
--- trunk/matplotlib/doc/sphinxext/only_directives.py	2009-02-16 14:18:36 UTC (rev 6916)
+++ trunk/matplotlib/doc/sphinxext/only_directives.py	2009-02-16 14:24:56 UTC (rev 6917)
@@ -1,67 +0,0 @@
-"""Sphinx directives for selective inclusion of contents.
-
-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 []
-
-class html_only(only_base):
-    pass
-
-class latex_only(only_base):
-    pass
-
-def run(content, node_class, state, content_offset):
-    text = '\n'.join(content)
-    node = node_class(text)
-    state.nested_parse(content, content_offset, node)
-    return [node]
-
-def html_only_directive(name, arguments, options, content, lineno,
-                        content_offset, block_text, state, state_machine):
-    return run(content, html_only, state, content_offset)
-
-def latex_only_directive(name, arguments, options, content, lineno,
-                         content_offset, block_text, state, state_machine):
-    return run(content, latex_only, state, content_offset)
-
-def builder_inited(app):
-    if app.builder.name == 'html':
-        latex_only.traverse = only_base.dont_traverse
-    else:
-        html_only.traverse = only_base.dont_traverse
-
-def setup(app):
-    app.add_directive('htmlonly', html_only_directive, True, (0, 0, 0))
-    app.add_directive('latexonly', latex_only_directive, True, (0, 0, 0))
-    app.add_node(html_only)
-    app.add_node(latex_only)
-
-    # This will *really* never see the light of day As it turns out,
-    # this results in "broken" image nodes since they never get
-    # processed, so best not to do this.
-    # app.connect('builder-inited', builder_inited)
-
-    # Add visit/depart methods to HTML-Translator:
-    def visit_perform(self, node):
-        pass
-    def depart_perform(self, node):
-        pass
-    def visit_ignore(self, node):
-        node.children = []
-    def depart_ignore(self, node):
-        node.children = []
-
-    app.add_node(html_only, html=(visit_perform, depart_perform))
-    app.add_node(html_only, latex=(visit_ignore, depart_ignore))
-    app.add_node(latex_only, latex=(visit_perform, depart_perform))
-    app.add_node(latex_only, html=(visit_ignore, depart_ignore))

Modified: trunk/matplotlib/setup.py
===================================================================
--- trunk/matplotlib/setup.py	2009-02-16 14:18:36 UTC (rev 6916)
+++ trunk/matplotlib/setup.py	2009-02-16 14:24:56 UTC (rev 6917)
@@ -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']


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