[Epydoc-commits] SF.net SVN: epydoc: [1774] trunk/epydoc/src/epydoc/markup/doctest.py

[<ed...@us...>]

Revision: 1774
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1774&view=rev
Author:   edloper
Date:     2008-02-23 21:45:19 -0800 (Sat, 23 Feb 2008)

Log Message:
-----------
- Fixed bug that caused doctest blocks to sometimes omit newlines
  in latex rendered output.

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/markup/doctest.py

Modified: trunk/epydoc/src/epydoc/markup/doctest.py
===================================================================
--- trunk/epydoc/src/epydoc/markup/doctest.py	2008-02-24 05:44:32 UTC (rev 1773)
+++ trunk/epydoc/src/epydoc/markup/doctest.py	2008-02-24 05:45:19 UTC (rev 1774)
@@ -86,6 +86,9 @@
     #: Typically, this string ends a preformatted area.
     SUFFIX = None
 
+    #: The string used to divide lines
+    NEWLINE = '\n'
+
     #: A list of the names of all Python keywords.  ('as' is included
     #: even though it is technically not a keyword.)
     _KEYWORDS = ("and       del       for       is        raise"
@@ -191,21 +194,21 @@
             # Parse the doctest example:
             pysrc, want = m.group('source', 'want')
             # Pre-example text:
-            output.append(s[charno:m.start()])
+            output.append(self.NEWLINE.join(s[charno:m.start()].split('\n')))
             # Example source code:
             output.append(self.DOCTEST_RE.sub(self.subfunc, pysrc))
             # Example output:
             if want:
                 if self.EXCEPT_RE.match(want):
-                    output += '\n'.join([self.markup(line, 'except')
-                                         for line in want.split('\n')])
+                    output += self.NEWLINE.join([self.markup(line, 'except')
+                                                 for line in want.split('\n')])
                 else:
-                    output += '\n'.join([self.markup(line, 'output')
-                                         for line in want.split('\n')])
+                    output += self.NEWLINE.join([self.markup(line, 'output')
+                                                 for line in want.split('\n')])
             # Update charno
             charno = m.end()
         # Add any remaining post-example text.
-        output.append(s[charno:])
+        output.append(self.NEWLINE.join(s[charno:].split('\n')))
         
         return self.PREFIX + ''.join(output) + self.SUFFIX
     
@@ -213,8 +216,8 @@
         other, text = match.group(1, 2)
         #print 'M %20r %20r' % (other, text) # <- for debugging
         if other:
-            other = '\n'.join([self.markup(line, 'other')
-                               for line in other.split('\n')])
+            other = self.NEWLINE.join([self.markup(line, 'other')
+                                       for line in other.split('\n')])
             
         if match.group('PROMPT1'):
             return other + self.markup(text, 'prompt')
@@ -243,7 +246,7 @@
                     pieces.append(self.markup(line, 'string'))
                 else:
                     pieces.append('')
-            return other + '\n'.join(pieces)
+            return other + self.NEWLINE.join(pieces)
         elif match.group('DEFINE'):
             m = re.match('(?P<def>\w+)(?P<space>\s+)(?P<name>\w+)', text)
             return other + (self.markup(m.group('def'), 'keyword') +
@@ -302,6 +305,7 @@
     """A subclass of DoctestColorizer that generates LaTeX output."""
     PREFIX = '\\begin{alltt}\n'
     SUFFIX = '\\end{alltt}\n'
+    NEWLINE = '\\\\\n'
     def markup(self, s, tag):
         if tag == 'other':
             return plaintext_to_latex(s)


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