[Epydoc-commits] SF.net SVN: epydoc: [1756] trunk/epydoc/src/epydoc/cli.py

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

Revision: 1756
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1756&view=rev
Author:   edloper
Date:     2008-02-23 09:47:49 -0800 (Sat, 23 Feb 2008)

Log Message:
-----------
- Moved code that resolves 'auto' pdfdriver to the write_latex
  function.
- 'auto' pdfdriver now selects 'latex' if 'dvi' or 'ps' output are
  requested
- if pdfdriver is set to 'pdflatex' and the dvi or ps output are
  requested, then signal an error

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/cli.py

Modified: trunk/epydoc/src/epydoc/cli.py
===================================================================
--- trunk/epydoc/src/epydoc/cli.py	2008-02-23 17:34:49 UTC (rev 1755)
+++ trunk/epydoc/src/epydoc/cli.py	2008-02-23 17:47:49 UTC (rev 1756)
@@ -534,17 +534,16 @@
             optparser.error("Invalid graph type %s.  Expected one of: %s." %
                             (graph_type, ', '.join(GRAPH_TYPES + ('all',))))
 
-    # If pdfdriver is 'auto', then pick a pdf driver.
+    # Check the value of the pdfdriver option; and check for conflicts
+    # between pdfdriver & actions
     options.pdfdriver = options.pdfdriver.lower()
     if options.pdfdriver not in PDFDRIVERS:
         optparser.error("Invalid pdf driver %r.  Expected one of: %s" %
                         (options.pdfdriver, ', '.join(PDF_DRIVERS)))
-    if 'pdf' in options.actions and options.pdfdriver=='auto':
-        try:
-            run_subprocess('pdflatex --version')
-            options.pdfdriver = 'pdflatex'
-        except RunSubprocessError, e:
-            options.pdfdriver = 'latex'
+    if (options.pdfdriver == 'pdflatex' and
+        ('dvi' in options.actions or 'ps' in options.actions)):
+        optparser.error("Use of the pdflatex driver is incompatible "
+                        "with generating dvi or ps output.")
 
     # Calculate verbosity.
     verbosity = getattr(options, 'verbosity', 0)
@@ -953,10 +952,23 @@
         latex_target = options.target['latex']
     else:
         latex_target = tempfile.mkdtemp()
-        
+
+    log.start_progress('Writing LaTeX docs')
+    
+    # Choose a pdfdriver if we're generating pdf output.
+    if 'pdf' in options.actions and options.pdfdriver=='auto':
+        if 'dvi' in options.actions or 'ps' in options.actions:
+            options.pdfdriver = 'latex'
+        else:
+            try:
+                run_subprocess('pdflatex --version')
+                options.pdfdriver = 'pdflatex'
+            except RunSubprocessError, e:
+                options.pdfdriver = 'latex'
+    log.info('%r pdfdriver selected' % options.pdfdriver)
+    
     from epydoc.docwriter.latex import LatexWriter
     latex_writer = LatexWriter(docindex, **options.__dict__)
-    log.start_progress('Writing LaTeX docs')
     latex_writer.write(latex_target)
     log.end_progress()
 


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