Changed printing subsystem interface to allow direct output to

[clinton/parenscript.git] / docs / pbook.py

diff --git a/docs/pbook.py b/docs/pbook.py
index 3c17267..183f575 100644 (file)
--- a/docs/pbook.py
+++ b/docs/pbook.py
@@ -66,10 +66,7 @@ class TexFile(TxtFile):
     def beginning(self):
         return '\n\\documentclass[notitlepage,a4paper,makeidx]{' + self.style + '}\n' + \
                '\\usepackage{fancyvrb,color,palatino,makeidx}\n' + \
-               "\\newif\\ifpdf\n\\ifx\\pdfoutput\\undefined\n\\pdffalse\n" + \
-               "\\else\n\\pdfoutput=1\n\\pdftrue\n\\fi\n" + \
-               "\\ifpdf\n\\usepackage[pdftex]{graphicx}\n" + \
-               "\\else\n\\usepackage{graphicx}\n\\fi\n" + \
+               "\\usepackage{graphicx}\n" + \
                '\\definecolor{gray}{gray}{0.6}\n' + \
                '\\title{' + TexFile.escapeString(self.title) + '}\n' +  \
                (self.author and ('\\author{' + self.author + '}\n') or '') + \
@@ -221,14 +218,14 @@ class Pbook:
                     lines.pop(0)
                     self.lineCounter += 1
                     continue
-               elif self.figureRe.match(line):
+                elif self.figureRe.match(line):
                     line = lines.pop(0)
                     self.doFigure(line)
-                   self.lineCounter += 1
-               elif self.escapeRe.match(line):
+                    self.lineCounter += 1
+                elif self.escapeRe.match(line):
                     line = lines.pop(0)
                     self.doEscape(line)
-                   self.lineCounter += 1
+                    self.lineCounter += 1
                 elif self.headingRe.match(line):
                     line = lines.pop(0)
                     self.doHeading(line)