IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge with 1.0

Browse Source
This commit is contained in:
Georg Brandl 2011-09-22 13:56:16 +02:00
commit ca2bf2f626
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -112,6 +112,8 @@ Features added
Release 1.0.8 (in development) Release 1.0.8 (in development)
============================== ==============================
* #720: Add dummy visitors for graphviz nodes for text and man.
* #704: Fix image file duplication bug. * #704: Fix image file duplication bug.
* #677: Fix parsing of multiple signatures in C++ domain. * #677: Fix parsing of multiple signatures in C++ domain.

18
sphinx/ext/graphviz.py
View File

@ -25,6 +25,7 @@ from docutils import nodes
from docutils.parsers.rst import directives from docutils.parsers.rst import directives
from sphinx.errors import SphinxError from sphinx.errors import SphinxError
from sphinx.locale import _
from sphinx.util.osutil import ensuredir, ENOENT, EPIPE, EINVAL from sphinx.util.osutil import ensuredir, ENOENT, EPIPE, EINVAL
from sphinx.util.compat import Directive from sphinx.util.compat import Directive
@ -294,11 +295,26 @@ def texinfo_visit_graphviz(self, node):
render_dot_texinfo(self, node, node['code'], node['options']) render_dot_texinfo(self, node, node['code'], node['options'])
def text_visit_graphviz(self, node):
if 'alt' in node.attributes:
self.add_text(_('[graph: %s]') % node['alt'])
self.add_text(_('[graph]'))
def man_visit_graphviz(self, node):
if 'alt' in node.attributes:
self.body.append(_('[graph: %s]') % node['alt'] + '\n')
self.body.append(_('[graph]'))
raise nodes.SkipNode
def setup(app): def setup(app):
app.add_node(graphviz, app.add_node(graphviz,
html=(html_visit_graphviz, None), html=(html_visit_graphviz, None),
latex=(latex_visit_graphviz, None), latex=(latex_visit_graphviz, None),
texinfo=(texinfo_visit_graphviz, None)) texinfo=(texinfo_visit_graphviz, None),
text=(text_visit_graphviz, None),
man=(man_visit_graphviz, None))
app.add_directive('graphviz', Graphviz) app.add_directive('graphviz', Graphviz)
app.add_directive('graph', GraphvizSimple) app.add_directive('graph', GraphvizSimple)
app.add_directive('digraph', GraphvizSimple) app.add_directive('digraph', GraphvizSimple)

4
sphinx/writers/manpage.py
View File

@ -230,8 +230,8 @@ class ManualPageTranslator(BaseTranslator):
# overwritten -- don't emit a warning for images # overwritten -- don't emit a warning for images
def visit_image(self, node): def visit_image(self, node):
if 'alt' in node.attributes: if 'alt' in node.attributes:
self.body.append('[image: %s]\n' % node['alt']) self.body.append(_('[image: %s]') % node['alt'] + '\n')
self.body.append('[image]\n') self.body.append(_('[image]') + '\n')
raise nodes.SkipNode raise nodes.SkipNode
# overwritten -- don't visit inner marked up nodes # overwritten -- don't visit inner marked up nodes

2
sphinx/writers/text.py
View File

@ -434,6 +434,8 @@ class TextTranslator(nodes.NodeVisitor):
raise nodes.SkipNode raise nodes.SkipNode
def visit_image(self, node): def visit_image(self, node):
if 'alt' in node.attributes:
self.add_text(_('[image: %s]') % node['alt'])
self.add_text(_('[image]')) self.add_text(_('[image]'))
raise nodes.SkipNode raise nodes.SkipNode