Thread: [Epydoc-commits] SF.net SVN: epydoc: [1343] trunk/epydoc/src/epydoc/markup/restructuredtext. py
Brought to you by:
edloper
From: <ed...@us...> - 2006-09-02 01:23:25
|
Revision: 1343 http://svn.sourceforge.net/epydoc/?rev=1343&view=rev Author: edloper Date: 2006-09-01 18:23:23 -0700 (Fri, 01 Sep 2006) Log Message: ----------- - Optimizations to make parsing rst a little faster: - Reuse docutils 'settings' objects, rather than re-creating them every time we translate a docstring to html or latex - Replace the reporter with one that ignores all debug statements. (Docutils isn't very fast about processing its own debug statements.) Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2006-09-02 00:54:33 UTC (rev 1342) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2006-09-02 01:23:23 UTC (rev 1343) @@ -132,6 +132,12 @@ 'warning_stream':None}) return ParsedRstDocstring(writer.document) +class OptimizedReporter(docutils.utils.Reporter): + """A reporter that ignores all debug messages. This is used to + shave a couple seconds off of epydoc's run time, since docutils + isn't very fast about processing its own debug messages.""" + def debug(self, *args, **kwargs): pass + class ParsedRstDocstring(ParsedDocstring): """ An encoded version of a ReStructuredText docstring. The contents @@ -150,7 +156,7 @@ # The default document reporter and transformer are not # pickle-able; so replace them with stubs that are. - document.reporter = docutils.utils.Reporter( + document.reporter = OptimizedReporter( document.reporter.source, 'SEVERE', 'SEVERE', '') document.transformer = docutils.transforms.Transformer(document) @@ -460,10 +466,13 @@ return translator.head_prefix class _EpydocLaTeXTranslator(LaTeXTranslator): + settings = None def __init__(self, document, docstring_linker): # Set the document's settings. - settings = OptionParser([LaTeXWriter()]).get_default_values() - document.settings = settings + if self.settings is None: + settings = OptionParser([LaTeXWriter()]).get_default_values() + self.__class__.settings = settings + document.settings = self.settings LaTeXTranslator.__init__(self, document) self._linker = docstring_linker @@ -495,6 +504,7 @@ raise SkipNode() class _EpydocHTMLTranslator(HTMLTranslator): + settings = None def __init__(self, document, docstring_linker, directory, docindex, context): self._linker = docstring_linker @@ -503,8 +513,10 @@ self._context = context # Set the document's settings. - settings = OptionParser([HTMLWriter()]).get_default_values() - document.settings = settings + if self.settings is None: + settings = OptionParser([HTMLWriter()]).get_default_values() + self.__class__.settings = settings + document.settings = self.settings # Call the parent constructor. HTMLTranslator.__init__(self, document) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dva...@us...> - 2006-09-11 12:34:44
|
Revision: 1383 http://svn.sourceforge.net/epydoc/?rev=1383&view=rev Author: dvarrazzo Date: 2006-09-11 05:34:31 -0700 (Mon, 11 Sep 2006) Log Message: ----------- - Fixed docutils version check. E.g. when docutils.__version__ == '0.4' => [ 0, 4 ] < [ 0, 4, 0 ] == True => Deprecation warnings are raised. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2006-09-10 22:43:51 UTC (rev 1382) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2006-09-11 12:34:31 UTC (rev 1383) @@ -215,7 +215,9 @@ # depending on the version of docutils that's being used, because # the default_transforms attribute was deprecated & replaced by # get_transforms(). - if [int(v) for v in docutils.__version__.split('.')] < [0,4,0]: + version = [int(v) for v in docutils.__version__.split('.')] + version += [ 0 ] * (3 - len(version)) + if version < [0,4,0]: default_transforms = list(StandaloneReader.default_transforms) try: default_transforms.remove(docutils.transforms.frontmatter.DocInfo) except ValueError: pass @@ -223,6 +225,7 @@ def get_transforms(self): return [t for t in StandaloneReader.get_transforms(self) if t != docutils.transforms.frontmatter.DocInfo] + del version def __init__(self, errors): self._errors = errors This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2007-01-17 23:45:22
|
Revision: 1418 http://svn.sourceforge.net/epydoc/?rev=1418&view=rev Author: edloper Date: 2007-01-17 15:45:21 -0800 (Wed, 17 Jan 2007) Log Message: ----------- In response to feedback from the folks at scipy, I modified the syntax for consolidated fields slightly. Now, the argument names are no longer required to be marked by backticks. I.e., instead of: :Arguments: `x` : int Description of x... you can now just write: :Arguments: x : int Description of x... Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-01-17 21:41:59 UTC (rev 1417) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-01-17 23:45:21 UTC (rev 1418) @@ -314,6 +314,14 @@ @ivar fields: The fields of the most recently walked document. @type fields: C{list} of L{Field<markup.Field>} """ + + ALLOW_UNMARKED_ARG_IN_CONSOLIDATED_FIELD = True + """If true, then consolidated fields are not required to mark + arguments with C{`backticks`}. (This is currently only + implemented for consolidated fields expressed as definition lists; + consolidated fields expressed as unordered lists still require + backticks for now.""" + def __init__(self, document, errors): NodeVisitor.__init__(self, document) self._errors = errors @@ -425,7 +433,7 @@ child = fbody[0][0] if child.data[:1] in ':-': child.data = child.data[1:].lstrip() - elif child.data[:2] == ' -': + elif child.data[:2] in (' -', ' :'): child.data = child.data[2:].lstrip() # Wrap the field body, and add a new field @@ -446,7 +454,9 @@ raise ValueError('bad definition list (bad child %d).' % n) if len(item) > 3: raise ValueError(_BAD_ITEM % n) - if item[0][0].tagname != 'title_reference': + if not ((item[0][0].tagname == 'title_reference') or + (self.ALLOW_UNMARKED_ARG_IN_CONSOLIDATED_FIELD and + isinstance(item[0][0], docutils.nodes.Text))): raise ValueError(_BAD_ITEM % n) for child in item[0][1:]: if child.astext() != '': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dva...@us...> - 2007-01-28 20:14:56
|
Revision: 1423 http://svn.sourceforge.net/epydoc/?rev=1423&view=rev Author: dvarrazzo Date: 2007-01-28 12:14:50 -0800 (Sun, 28 Jan 2007) Log Message: ----------- - dotgraph directives work again. they were broken probably after the docutils r4667 checkin, where some assertions about directives return values were added. Tested against docutils snapshot 2007-01-28, r4897 Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-01-28 15:31:10 UTC (rev 1422) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-01-28 20:14:50 UTC (rev 1423) @@ -669,8 +669,8 @@ """ if arguments: title = arguments[0] else: title = '' - return dotgraph(_construct_digraph, title, options.get('caption'), - '\n'.join(content)) + return [ dotgraph(_construct_digraph, title, options.get('caption'), + '\n'.join(content)) ] digraph_directive.arguments = (0, 1, True) digraph_directive.options = {'caption': directives.unchanged} digraph_directive.content = True @@ -698,7 +698,7 @@ - C{:dir:} -- Specifies the orientation of the graph. One of C{down}, C{right} (default), C{left}, C{up}. """ - return dotgraph(_construct_classtree, arguments, options) + return [ dotgraph(_construct_classtree, arguments, options) ] classtree_directive.arguments = (0, 1, True) classtree_directive.options = {'dir': _dir_option} classtree_directive.content = False @@ -734,7 +734,7 @@ - C{:dir:} -- Specifies the orientation of the graph. One of C{down}, C{right} (default), C{left}, C{up}. """ - return dotgraph(_construct_packagetree, arguments, options) + return [ dotgraph(_construct_packagetree, arguments, options) ] packagetree_directive.arguments = (0, 1, True) packagetree_directive.options = { 'dir': _dir_option, @@ -759,8 +759,7 @@ def importgraph_directive(name, arguments, options, content, lineno, content_offset, block_text, state, state_machine): - return dotgraph(_construct_importgraph, arguments, options) -importgraph_directive.arguments = None + return [ dotgraph(_construct_importgraph, arguments, options) ] importgraph_directive.options = {'dir': _dir_option} importgraph_directive.content = False directives.register_directive('importgraph', importgraph_directive) @@ -772,7 +771,7 @@ def callgraph_directive(name, arguments, options, content, lineno, content_offset, block_text, state, state_machine): - return dotgraph(_construct_callgraph, arguments, options) + return [ dotgraph(_construct_callgraph, arguments, options) ] callgraph_directive.arguments = (0, 1, True) callgraph_directive.options = {'dir': _dir_option, 'add_callers': directives.flag, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2007-02-11 04:34:54
|
Revision: 1453 http://svn.sourceforge.net/epydoc/?rev=1453&view=rev Author: edloper Date: 2007-02-10 20:34:52 -0800 (Sat, 10 Feb 2007) Log Message: ----------- - Changed the 'python' code directive to be implemented via a function rather than a class. Even though classes are the officially preferred mechanism for defining directives in docutils 0.5, they are not backwards compatible with docutils 0.3.7, which is still fairly widely used. The new version is compatible with docutils 0.3.7+. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-02-11 04:23:35 UTC (rev 1452) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-02-11 04:34:52 UTC (rev 1453) @@ -77,7 +77,7 @@ from docutils.nodes import NodeVisitor, Text, SkipChildren from docutils.nodes import SkipNode, TreeCopyVisitor from docutils.frontend import OptionParser -from docutils.parsers.rst import directives, Directive +from docutils.parsers.rst import directives import docutils.nodes import docutils.transforms.frontmatter import docutils.transforms @@ -628,22 +628,29 @@ raise SkipNode() -class PythonCodeDirective(Directive): +def python_code_directive(name, arguments, options, content, lineno, + content_offset, block_text, state, state_machine): + """ + A custom restructuredtext directive which can be used to display + syntax-highlighted Python code blocks. This directive takes no + arguments, and the body should contain only Python code. This + directive can be used instead of doctest blocks when it is + inconvenient to list prompts on each line, or when you would + prefer that the output not contain prompts (e.g., to make + copy/paste easier). + """ required_arguments = 0 optional_arguments = 0 - has_content = True - def run(self): - self.assert_has_content() - text = '\n'.join(self.content) + text = '\n'.join(content) + node = docutils.nodes.doctest_block(text, text, codeblock=True) + return [ node ] + +python_code_directive.arguments = (0, 0, 0) +python_code_directive.content = True - #node = docutils.nodes.doctest_block(rawsource=text) - #self.state.nested_parse(self.content, self.content_offset, node) - node = docutils.nodes.doctest_block(text, text, codeblock=True) - return [ node ] +directives.register_directive('python', python_code_directive) -directives.register_directive('python', PythonCodeDirective) - ###################################################################### #{ Graph Generation Directives ###################################################################### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dva...@us...> - 2007-02-14 12:00:34
|
Revision: 1504 http://svn.sourceforge.net/epydoc/?rev=1504&view=rev Author: dvarrazzo Date: 2007-02-14 04:00:32 -0800 (Wed, 14 Feb 2007) Log Message: ----------- - Don't barf with non-ascii chars in reST doctest blocks. Thanks to Nicola Larosa and David Mugnai for pointing this bug. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-02-14 08:40:29 UTC (rev 1503) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-02-14 12:00:32 UTC (rev 1504) @@ -526,7 +526,7 @@ raise SkipNode() def visit_doctest_block(self, node): - self.body.append(doctest_to_latex(str(node[0]))) + self.body.append(doctest_to_latex(node[0].astext())) raise SkipNode() class _EpydocHTMLTranslator(HTMLTranslator): @@ -620,11 +620,11 @@ raise SkipNode() def visit_doctest_block(self, node): - pysrc = str(node[0]) + pysrc = node[0].astext() if node.get('codeblock'): self.body.append(HTMLDoctestColorizer().colorize_codeblock(pysrc)) else: - self.body.append(doctest_to_html(str(node[0]))) + self.body.append(doctest_to_html(pysrc)) raise SkipNode() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dva...@us...> - 2007-07-11 00:47:32
|
Revision: 1596 http://svn.sourceforge.net/epydoc/?rev=1596&view=rev Author: dvarrazzo Date: 2007-07-10 17:47:31 -0700 (Tue, 10 Jul 2007) Log Message: ----------- - Fixed error in _SplitFieldsTranslator error reporting. Fixes SF bug 1738406. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-07-11 00:23:30 UTC (rev 1595) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-07-11 00:47:31 UTC (rev 1596) @@ -165,6 +165,7 @@ def split_fields(self, errors=None): # Inherit docs + if errors is None: errors = [] visitor = _SplitFieldsTranslator(self._document, errors) self._document.walk(visitor) if len(self._document.children) > 0: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2007-09-23 14:33:10
|
Revision: 1617 http://epydoc.svn.sourceforge.net/epydoc/?rev=1617&view=rev Author: edloper Date: 2007-09-23 07:33:08 -0700 (Sun, 23 Sep 2007) Log Message: ----------- - Manually set the rst 'output_encoding' option to 'utf-8'. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-09-23 14:31:24 UTC (rev 1616) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-09-23 14:33:08 UTC (rev 1617) @@ -545,6 +545,7 @@ # Set the document's settings. if self.settings is None: settings = OptionParser([LaTeXWriter()]).get_default_values() + settings.output_encoding = 'utf-8' self.__class__.settings = settings document.settings = self.settings This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dva...@us...> - 2007-09-24 15:54:46
|
Revision: 1633 http://epydoc.svn.sourceforge.net/epydoc/?rev=1633&view=rev Author: dvarrazzo Date: 2007-09-24 08:53:48 -0700 (Mon, 24 Sep 2007) Log Message: ----------- - Generate anchors for index terms. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-09-24 15:52:11 UTC (rev 1632) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-09-24 15:53:48 UTC (rev 1633) @@ -676,7 +676,17 @@ self.body.append(doctest_to_html(pysrc)) raise SkipNode() + def visit_emphasis(self, node): + # Generate a corrent index term anchor + if 'term' in node.get('classes') and node.children: + doc = self.document.copy() + doc[:] = [node.children[0].copy()] + self.body.append( + self._linker.translate_indexterm(ParsedRstDocstring(doc))) + raise SkipNode() + HTMLTranslator.visit_emphasis(self, node) + def python_code_directive(name, arguments, options, content, lineno, content_offset, block_text, state, state_machine): """ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dva...@us...> - 2007-11-07 12:59:35
|
Revision: 1661 http://epydoc.svn.sourceforge.net/epydoc/?rev=1661&view=rev Author: dvarrazzo Date: 2007-11-07 04:59:34 -0800 (Wed, 07 Nov 2007) Log Message: ----------- - The importgraph directive takes a packages list argument as advertised by docs. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-10-20 16:48:44 UTC (rev 1660) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2007-11-07 12:59:34 UTC (rev 1661) @@ -868,13 +868,20 @@ def importgraph_directive(name, arguments, options, content, lineno, content_offset, block_text, state, state_machine): return [ dotgraph(_construct_importgraph, arguments, options) ] +importgraph_directive.arguments = (0, 1, True) importgraph_directive.options = {'dir': _dir_option} importgraph_directive.content = False directives.register_directive('importgraph', importgraph_directive) def _construct_importgraph(docindex, context, linker, arguments, options): """Graph generator for L{importgraph_directive}""" - modules = [d for d in docindex.root if isinstance(d, ModuleDoc)] + if len(arguments) == 1: + modules = [ docindex.find(name, context) + for name in arguments[0].replace(',',' ').split() ] + modules = [d for d in modules if isinstance(d, ModuleDoc)] + else: + modules = [d for d in docindex.root if isinstance(d, ModuleDoc)] + return import_graph(modules, docindex, linker, context, **options) def callgraph_directive(name, arguments, options, content, lineno, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-15 01:01:11
|
Revision: 1720 http://epydoc.svn.sourceforge.net/epydoc/?rev=1720&view=rev Author: edloper Date: 2008-02-14 17:01:08 -0800 (Thu, 14 Feb 2008) Log Message: ----------- - Added support for the syntax `name <target>` in rst interpreted text roles. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-15 01:00:39 UTC (rev 1719) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-15 01:01:08 UTC (rev 1720) @@ -539,6 +539,8 @@ translator = _EpydocLaTeXTranslator(document, None) return translator.head_prefix +_TARGET_RE = re.compile(r'^(.*?)\s*<(?:URI:|URL:)?([^<>]+)>$') + class _EpydocLaTeXTranslator(LaTeXTranslator): settings = None def __init__(self, document, docstring_linker): @@ -560,8 +562,10 @@ # Handle interpreted text (crossreferences) def visit_title_reference(self, node): - target = self.encode(node.astext()) - xref = self._linker.translate_identifier_xref(target, target) + m = _TARGET_RE.match(node.astext()) + if m: text, target = m.groups() + else: target = text = node.astext() + xref = self._linker.translate_identifier_xref(target, text) self.body.append(xref) raise SkipNode() @@ -598,8 +602,10 @@ # Handle interpreted text (crossreferences) def visit_title_reference(self, node): - target = self.encode(node.astext()) - xref = self._linker.translate_identifier_xref(target, target) + m = _TARGET_RE.match(node.astext()) + if m: text, target = m.groups() + else: target = text = node.astext() + xref = self._linker.translate_identifier_xref(target, text) self.body.append(xref) raise SkipNode() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-23 00:52:24
|
Revision: 1733 http://epydoc.svn.sourceforge.net/epydoc/?rev=1733&view=rev Author: edloper Date: 2008-02-22 16:52:21 -0800 (Fri, 22 Feb 2008) Log Message: ----------- - Fixed minor bug in handling of markup like `foo <bar>` Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-20 21:14:12 UTC (rev 1732) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-23 00:52:21 UTC (rev 1733) @@ -89,6 +89,7 @@ from epydoc.apidoc import ModuleDoc, ClassDoc from epydoc.docwriter.dotgraph import * from epydoc.docwriter.xlink import ApiLinkReader +from epydoc.util import wordwrap, plaintext_to_html, plaintext_to_latex from epydoc.markup.doctest import doctest_to_html, doctest_to_latex, \ HTMLDoctestColorizer @@ -201,7 +202,7 @@ # Inherit docs visitor = _EpydocLaTeXTranslator(self._document, docstring_linker) self._document.walkabout(visitor) - return ''.join(visitor.body) + return ''.join(visitor.body).strip()+'\n' def to_plaintext(self, docstring_linker, **options): # This is should be replaced by something better: @@ -565,6 +566,7 @@ m = _TARGET_RE.match(node.astext()) if m: text, target = m.groups() else: target = text = node.astext() + text = plaintext_to_latex(text) xref = self._linker.translate_identifier_xref(target, text) self.body.append(xref) raise SkipNode() @@ -605,6 +607,7 @@ m = _TARGET_RE.match(node.astext()) if m: text, target = m.groups() else: target = text = node.astext() + text = plaintext_to_latex(text) xref = self._linker.translate_identifier_xref(target, text) self.body.append(xref) raise SkipNode() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-23 05:19:32
|
Revision: 1744 http://epydoc.svn.sourceforge.net/epydoc/?rev=1744&view=rev Author: edloper Date: 2008-02-22 21:19:30 -0800 (Fri, 22 Feb 2008) Log Message: ----------- - Use custom admonition environment for reStructuredText admonitions (warning, note, etc) Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-23 05:00:43 UTC (rev 1743) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-23 05:19:30 UTC (rev 1744) @@ -584,6 +584,13 @@ self.body.append(doctest_to_latex(node[0].astext())) raise SkipNode() + def visit_admonition(self, node, name=''): + self.body.append('\\begin{reSTadmonition}[%s]\n' % + self.language.labels[name]) + + def depart_admonition(self, node=None): + self.body.append('\\end{reSTadmonition}\n'); + class _EpydocHTMLTranslator(HTMLTranslator): settings = None def __init__(self, document, docstring_linker, directory, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-24 05:44:35
|
Revision: 1773 http://epydoc.svn.sourceforge.net/epydoc/?rev=1773&view=rev Author: edloper Date: 2008-02-23 21:44:32 -0800 (Sat, 23 Feb 2008) Log Message: ----------- - Fixed bug that caused latex writer to use the wrong colorization method for doctests containing codeblocks (not marked w/ prompts) Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-24 03:43:33 UTC (rev 1772) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-24 05:44:32 UTC (rev 1773) @@ -91,7 +91,8 @@ from epydoc.docwriter.xlink import ApiLinkReader from epydoc.util import wordwrap, plaintext_to_html, plaintext_to_latex from epydoc.markup.doctest import doctest_to_html, doctest_to_latex, \ - HTMLDoctestColorizer + HTMLDoctestColorizer, \ + LaTeXDoctestColorizer #: A dictionary whose keys are the "consolidated fields" that are #: recognized by epydoc; and whose values are the corresponding epydoc @@ -605,7 +606,11 @@ raise SkipNode() def visit_doctest_block(self, node): - self.body.append(doctest_to_latex(node[0].astext())) + pysrc = node[0].astext() + if node.get('codeblock'): + self.body.append(LaTeXDoctestColorizer().colorize_codeblock(pysrc)) + else: + self.body.append(doctest_to_latex(pysrc)) raise SkipNode() def visit_admonition(self, node, name=''): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-27 00:29:04
|
Revision: 1802 http://epydoc.svn.sourceforge.net/epydoc/?rev=1802&view=rev Author: edloper Date: 2008-02-26 16:28:32 -0800 (Tue, 26 Feb 2008) Log Message: ----------- - Fixed silly typo Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/restructuredtext.py Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-27 00:20:24 UTC (rev 1801) +++ trunk/epydoc/src/epydoc/markup/restructuredtext.py 2008-02-27 00:28:32 UTC (rev 1802) @@ -601,7 +601,7 @@ if graph is None: raise SkipNode() # Write the graph. - self.body.append(graph.to_latex(self._directory) + self.body.append(graph.to_latex(self._directory)) raise SkipNode() def visit_doctest_block(self, node): @@ -707,7 +707,7 @@ if graph is None: raise SkipNode() # Write the graph. - self.body.append(graph.to_html(self._directory) + self.body.append(graph.to_html(self._directory)) raise SkipNode() def visit_doctest_block(self, node): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |