Thread: [Epydoc-commits] SF.net SVN: epydoc: [1171] trunk/epydoc/src/epydoc/markup/epytext.py
Brought to you by:
edloper
From: <ed...@us...> - 2006-04-05 17:12:22
|
Revision: 1171 Author: edloper Date: 2006-04-05 10:12:13 -0700 (Wed, 05 Apr 2006) ViewCVS: http://svn.sourceforge.net/epydoc/?rev=1171&view=rev Log Message: ----------- - for callgraphs, if no doc is specified, then use the context. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/epytext.py Modified: trunk/epydoc/src/epydoc/markup/epytext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/epytext.py 2006-04-05 17:11:38 UTC (rev 1170) +++ trunk/epydoc/src/epydoc/markup/epytext.py 2006-04-05 17:12:13 UTC (rev 1171) @@ -1873,8 +1873,11 @@ return import_graph(modules, docindex, linker, context) elif graph_type == 'callgraph': - docs = [docindex.find(name, context) for name in graph_args] - docs = [doc for doc in docs if doc is not None] + if graph_args: + docs = [docindex.find(name, context) for name in graph_args] + docs = [doc for doc in docs if doc is not None] + else: + docs = [context] return call_graph(docs, docindex, linker, context) else: log.warning("Unknown graph type %s" % graph_type) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2006-04-09 18:10:36
|
Revision: 1193 Author: edloper Date: 2006-04-09 11:10:28 -0700 (Sun, 09 Apr 2006) ViewCVS: http://svn.sourceforge.net/epydoc/?rev=1193&view=rev Log Message: ----------- - When rendering a link as plaintext, render the label, not the target Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/epytext.py Modified: trunk/epydoc/src/epydoc/markup/epytext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/epytext.py 2006-04-07 23:40:05 UTC (rev 1192) +++ trunk/epydoc/src/epydoc/markup/epytext.py 2006-04-09 18:10:28 UTC (rev 1193) @@ -1325,7 +1325,7 @@ else: return '%r<%s>' % (variables[0], variables[1]) elif tree.tagName == 'link': if len(variables) != 2: raise ValueError('Bad Link') - return '%s' % variables[1] + return '%s' % variables[0] elif tree.tagName in ('olist', 'ulist'): # [xx] always use condensed lists. ## Use a condensed list if each list item is 1 line long. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2007-02-26 23:12:44
|
Revision: 1552 http://svn.sourceforge.net/epydoc/?rev=1552&view=rev Author: edloper Date: 2007-02-26 15:12:41 -0800 (Mon, 26 Feb 2007) Log Message: ----------- - Added missing import statements (SF bug 1669525) Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/epytext.py Modified: trunk/epydoc/src/epydoc/markup/epytext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/epytext.py 2007-02-25 16:13:17 UTC (rev 1551) +++ trunk/epydoc/src/epydoc/markup/epytext.py 2007-02-26 23:12:41 UTC (rev 1552) @@ -1861,6 +1861,7 @@ from epydoc.docwriter.dotgraph import class_tree_graph return class_tree_graph(bases, linker, context) elif graph_type == 'packagetree': + from epydoc.apidoc import ModuleDoc if graph_args: packages = [docindex.find(name, context) for name in graph_args] @@ -1873,6 +1874,7 @@ from epydoc.docwriter.dotgraph import package_tree_graph return package_tree_graph(packages, linker, context) elif graph_type == 'importgraph': + from epydoc.apidoc import ModuleDoc modules = [d for d in docindex.root if isinstance(d, ModuleDoc)] from epydoc.docwriter.dotgraph import import_graph return import_graph(modules, docindex, linker, context) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2006-09-06 19:29:33
|
Revision: 1357 http://svn.sourceforge.net/epydoc/?rev=1357&view=rev Author: edloper Date: 2006-09-06 12:29:30 -0700 (Wed, 06 Sep 2006) Log Message: ----------- - Changed definition of _FIELD_BULLET, so now there is no longer a required space after the ':'. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/epytext.py Modified: trunk/epydoc/src/epydoc/markup/epytext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/epytext.py 2006-09-06 19:25:54 UTC (rev 1356) +++ trunk/epydoc/src/epydoc/markup/epytext.py 2006-09-06 19:29:30 UTC (rev 1357) @@ -615,7 +615,7 @@ # a docstring. _ULIST_BULLET = '[-]( +|$)' _OLIST_BULLET = '(\d+[.])+( +|$)' -_FIELD_BULLET = '@\w+( [^{}:\n]+)?:( +|$)' +_FIELD_BULLET = '@\w+( [^{}:\n]+)?:' _BULLET_RE = re.compile(_ULIST_BULLET + '|' + _OLIST_BULLET + '|' + _FIELD_BULLET) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2007-01-17 20:43:14
|
Revision: 1412 http://svn.sourceforge.net/epydoc/?rev=1412&view=rev Author: edloper Date: 2007-01-17 12:43:08 -0800 (Wed, 17 Jan 2007) Log Message: ----------- Fixed sourceforge bug #1636352: <ol> start attribute wasn't getting rendered correctly. Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/epytext.py Modified: trunk/epydoc/src/epydoc/markup/epytext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/epytext.py 2006-12-02 22:26:09 UTC (rev 1411) +++ trunk/epydoc/src/epydoc/markup/epytext.py 2007-01-17 20:43:08 UTC (rev 1412) @@ -1797,7 +1797,7 @@ return '%s<ul>\n%s%s</ul>\n' % (indent*' ', childstr, indent*' ') elif tree.tag == 'olist': start = tree.attribs.get('start') or '' - return ('%s<ol%s>\n%s%s</ol>\n' % + return ('%s<ol start="%s">\n%s%s</ol>\n' % (indent*' ', start, childstr, indent*' ')) elif tree.tag == 'li': return indent*' '+'<li>\n%s%s</li>\n' % (childstr, indent*' ') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2007-06-29 12:11:40
|
Revision: 1590 http://svn.sourceforge.net/epydoc/?rev=1590&view=rev Author: edloper Date: 2007-06-29 05:11:38 -0700 (Fri, 29 Jun 2007) Log Message: ----------- fixed import bug Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/epytext.py Modified: trunk/epydoc/src/epydoc/markup/epytext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/epytext.py 2007-05-10 17:45:21 UTC (rev 1589) +++ trunk/epydoc/src/epydoc/markup/epytext.py 2007-06-29 12:11:38 UTC (rev 1590) @@ -1851,6 +1851,7 @@ docindex, context): # Generate the graph if graph_type == 'classtree': + from epydoc.apidoc import ClassDoc if graph_args: bases = [docindex.find(name, context) for name in graph_args] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2007-09-23 05:58:58
|
Revision: 1612 http://epydoc.svn.sourceforge.net/epydoc/?rev=1612&view=rev Author: edloper Date: 2007-09-22 22:58:51 -0700 (Sat, 22 Sep 2007) Log Message: ----------- added "inline" option Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/epytext.py Modified: trunk/epydoc/src/epydoc/markup/epytext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/epytext.py 2007-09-23 05:32:29 UTC (rev 1611) +++ trunk/epydoc/src/epydoc/markup/epytext.py 2007-09-23 05:58:51 UTC (rev 1612) @@ -1623,7 +1623,7 @@ Currently, no extra options are defined. @rtype: L{ParsedDocstring} """ - return ParsedEpytextDocstring(parse(docstring, errors)) + return ParsedEpytextDocstring(parse(docstring, errors), **options) class ParsedEpytextDocstring(ParsedDocstring): SYMBOL_TO_HTML = { @@ -1726,11 +1726,15 @@ r'\(\prod\)', '<=': r'\(\le\)', '>=': r'\(\ge\)', } - def __init__(self, dom_tree): + def __init__(self, dom_tree, **options): self._tree = dom_tree # Caching: self._html = self._latex = self._plaintext = None self._terms = None + # inline option -- mark top-level children as inline. + if options.get('inline'): + for elt in self._tree.children: + elt.attribs['inline'] = True def __str__(self): return str(self._tree) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2007-09-24 01:36:58
|
Revision: 1631 http://epydoc.svn.sourceforge.net/epydoc/?rev=1631&view=rev Author: edloper Date: 2007-09-23 18:36:56 -0700 (Sun, 23 Sep 2007) Log Message: ----------- - Fixed bug in parsedEpytextDocstring constructor if the given dom_tree is None. (caused when there's a parse error) Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/epytext.py Modified: trunk/epydoc/src/epydoc/markup/epytext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/epytext.py 2007-09-24 01:01:14 UTC (rev 1630) +++ trunk/epydoc/src/epydoc/markup/epytext.py 2007-09-24 01:36:56 UTC (rev 1631) @@ -1732,7 +1732,7 @@ self._html = self._latex = self._plaintext = None self._terms = None # inline option -- mark top-level children as inline. - if options.get('inline'): + if options.get('inline') and self._tree is not None: for elt in self._tree.children: elt.attribs['inline'] = True This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-27 01:01:31
|
Revision: 1803 http://epydoc.svn.sourceforge.net/epydoc/?rev=1803&view=rev Author: edloper Date: 2008-02-26 16:32:35 -0800 (Tue, 26 Feb 2008) Log Message: ----------- - Added missing global SCRWIDTH Modified Paths: -------------- trunk/epydoc/src/epydoc/markup/epytext.py Modified: trunk/epydoc/src/epydoc/markup/epytext.py =================================================================== --- trunk/epydoc/src/epydoc/markup/epytext.py 2008-02-27 00:28:32 UTC (rev 1802) +++ trunk/epydoc/src/epydoc/markup/epytext.py 2008-02-27 00:32:35 UTC (rev 1803) @@ -1502,6 +1502,7 @@ ################################################## ## Top-Level Wrapper function ################################################## +SCRWIDTH = 75 def pparse(str, show_warnings=1, show_errors=1, stream=sys.stderr): """ Pretty-parse the string. This parses the string, and catches any This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |