[Epydoc-commits] SF.net SVN: epydoc: [1616] trunk/epydoc/src/epydoc/docwriter/latex.py

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

Revision: 1616
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1616&view=rev
Author:   edloper
Date:     2007-09-23 07:31:24 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
- don't include the 'inputenc' package delclaration that is supplied by
  restructuredtext; it can conflict with our own.  (utf8x vs utf8 -- how
  do these actually differ?)

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/docwriter/latex.py

Modified: trunk/epydoc/src/epydoc/docwriter/latex.py
===================================================================
--- trunk/epydoc/src/epydoc/docwriter/latex.py	2007-09-23 14:08:40 UTC (rev 1615)
+++ trunk/epydoc/src/epydoc/docwriter/latex.py	2007-09-23 14:31:24 UTC (rev 1616)
@@ -279,7 +279,7 @@
         out('\n')
         
         # Set the encoding.
-        out('\\usepackage[%s]{inputenc}' % self.get_latex_encoding())
+        out('\\usepackage[%s]{inputenc}\n' % self.get_latex_encoding())
 
         # If we're generating hyperrefs, add the appropriate packages.
         if self._hyperref:
@@ -301,16 +301,17 @@
         if 'restructuredtext' in epydoc.markup.MARKUP_LANGUAGES_USED:
             from epydoc.markup import restructuredtext
             rst_head = restructuredtext.latex_head_prefix()
+            rst_head = ''.join(rst_head).split('\n')
             for line in rst_head[1:]:
                 m = re.match(r'\\usepackage(\[.*?\])?{(.*?)}', line)
                 if m and m.group(2) in (
                     'babel', 'hyperref', 'color', 'alltt', 'parskip',
                     'fancyhdr', 'boxedminipage', 'makeidx',
                     'multirow', 'longtable', 'tocbind', 'assymb',
-                    'fullpage'):
+                    'fullpage', 'inputenc'):
                     pass
                 else:
-                    out(line)
+                    out(line+'\n')
 
         
     #////////////////////////////////////////////////////////////


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