Add more document Builders: PDF and PostScript.

7 files changed, 872 insertions, 11 deletions

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 29a6ed6..51d7c91 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -651,8 +651,8 @@ env.CXXFile(target = 'bar', source = 'bar.yy')   # builds bar.cc
 
 .IP DVI
 Builds a .dvi file from a .tex, .ltx or .latex input file.
-The suffix specified by the $DVISUFFIX construction variable
-(.dvi by default)
+The suffix .dvi
+(hard-coded within TeX itself)
 is automatically added to the target
 if it is not already present. Example:
 
@@ -661,6 +661,32 @@ env.DVI(target = 'aaa.dvi', source = 'aaa.tex')   # builds from aaa.tex
 env.DVI(target = 'bbb', source = 'bbb.ltx')       # builds bbb.dvi
 env.DVI(target = 'ccc.dvi', source = 'ccc.latex') # builds from ccc.latex
 .EE
+
+.IP PDF
+Builds a .pdf file from a .dvi input file
+(or, by extension, a .tex, .ltx, or .latex input file).
+The suffix specified by the $PDFSUFFIX construction variable
+(.pdf by default)
+is added automatically to the target
+if it is not already present.  Example:
+
+.ES
+env.PDF(target = 'aaa.pdf', source = 'aaa.tex')   # builds from aaa.tex
+env.PDF(target = 'bbb', source = 'bbb.dvi')       # builds bbb.dvi
+.EE
+
+.IP PostScript
+Builds a .ps file from a .dvi input file
+(or, by extension, a .tex, .ltx, or .latex input file).
+The suffix specified by the $PSSUFFIX construction variable
+(.ps by default)
+is added automatically to the target
+if it is not already present.  Example:
+
+.ES
+env.PostScript(target = 'aaa.ps', source = 'aaa.tex')   # builds from aaa.tex
+env.PostScript(target = 'bbb', source = 'bbb.dvi')      # builds bbb.dvi
+.EE
 .LP
 C/C++ source files are automatically scanned for dependencies by 
 .B scons
@@ -818,7 +844,7 @@ The command line used to generate a static library from object files.
 
 .IP BUILDERS
 A list of the available builders.
-[Alias, CFile, CXXFile, DVI, Library, Object, Program] by default.
+[Alias, CFile, CXXFile, DVI, Library, Object, PDF, PostScript, Program] by default.
 
 .IP CC 
 The C compiler.
@@ -877,6 +903,18 @@ General options that are passed to the C++ compiler.
 .IP CXXCOM
 The command line used to compile a C++ source file to an object file.
 
+.IP DVIPDF
+The TeX DVI file to PDF file converter.
+
+.IP DVIPDFFLAGS
+General options passed to the TeX DVI file to PDF file converter.
+
+.IP DVIPS
+The TeX DVI file to PostScript converter.
+
+.IP DVIPSFLAGS
+General options passed to the TeX DVI file to PostScript converter.
+
 .IP ENV
 A dictionary of environment variables
 to use when invoking commands.
@@ -931,6 +969,15 @@ line.
 The suffix used to specify an include directory on the C compiler command
 line.
 
+.IP LATEX
+The LaTeX structured formatter and typesetter.
+
+.IP LATEXCOM
+The command line used to call the LaTeX structured formatter and typesetter.
+
+.IP LATEXFLAGS
+General options passed to the LaTeX structured formatter and typesetter.
+
 .IP LEX
 The lexical analyzer generator.
 
@@ -1005,12 +1052,30 @@ The prefix used for object file names.
 .IP OBJSUFFIX 
 The suffix used for object file names.
 
+.IP PDFCOM
+The command line used to convert TeX DVI files into a PDF file.
+
+.IP PDFPREFIX
+The prefix used for PDF file names.
+
+.IP PDFSUFFIX
+The suffix used for PDF file names.
+
 .IP PROGPREFIX
 The prefix used for executable file names.
 
 .IP PROGSUFFIX
 The suffix used for executable file names.
 
+.IP PSCOM
+The command line used to convert TeX DVI files into a PostScript file.
+
+.IP PSPREFIX
+The prefix used for PostScript file names.
+
+.IP PSSUFFIX
+The prefix used for PostScript file names.
+
 .IP RANLIB
 The archive indexer.
 
@@ -1020,16 +1085,25 @@ General options passed to the archive indexer.
 .IP SCANNERS
 A list of the available implicit dependency scanners. [CScan] by default.
 
+.IP TEX
+The TeX formatter and typesetter.
+
+.IP TEXCOM
+The command line used to call the TeX formatter and typesetter.
+
+.IP TEXFLAGS
+General options passed to the TeX formatter and typesetter.
+
 .IP YACC
 The parser generator.
 
-.IP YACCFLAGS
-General options passed to the parser generator.
-
 .IP YACCCOM
 The command line used to call the parser generator
 to generate a source file.
 
+.IP YACCFLAGS
+General options passed to the parser generator.
+
 .LP
 Construction variables can be retrieved and set using the 
 .B Dictionary 
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 9225510..5986cf0 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -33,7 +33,7 @@ RELEASE 0.06 -
 
   - Add .zip files to the packages we build.
 
-  - Man page:  document LIBS, fix a typo.
+  - Man page:  document LIBS, fix a typo, document ARGUMENTS.
 
   - Added RANLIB and RANLIBFLAGS construction variables.  Only use them
     in ARCOM if there's a "ranlib" program on the system.
@@ -59,6 +59,8 @@ RELEASE 0.06 -
 
   - Add a WhereIs() method for searching for path names to executables.
 
+  - Add PDF and PostScript document builders.
+
   From Steve Leblanc:
 
   - Add support for the -U option.
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index 6dedb52..e0763b2 100644
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -107,6 +107,20 @@ DVI = SCons.Builder.Builder(name = 'DVI',
 			    # hard-coded within TeX.
                             suffix = '.dvi')
 
+PDF = SCons.Builder.Builder(name = 'PDF',
+                            action = '$PDFCOM',
+                            prefix = '$PDFPREFIX',
+                            suffix = '$PDFSUFFIX',
+                            src_suffix = '.dvi',
+                            src_builder = DVI)
+
+PostScript = SCons.Builder.Builder(name = 'PostScript',
+                                   action = '$PSCOM',
+                                   prefix = '$PSPREFIX',
+                                   suffix = '$PSSUFFIX',
+                                   src_suffix = '.dvi',
+                                   src_builder = DVI)
+
 CScan = SCons.Scanner.C.CScan()
 
 def alias_builder(env, target, source):
@@ -243,8 +257,18 @@ def make_win32_env_from_paths(include, lib, path):
         'LATEX'      : 'latex',
         'LATEXFLAGS' : '',
         'LATEXCOM'   : '$LATEX $LATEXFLAGS $SOURCES',
-        'DVISUFFIX'  : '.dvi',
-        'BUILDERS'   : [Alias, CFile, CXXFile, DVI, Object, Program, Library],
+        'DVIPDF'     : 'dvipdf',
+        'DVIPDFFLAGS' : '',
+        'PDFCOM'     : '$DVIPDF $DVIPDFFLAGS $SOURCES $TARGET',
+        'PDFPREFIX'  : '',
+        'PDFSUFFIX'  : '.pdf',
+        'DVIPS'      : 'dvips',
+        'DVIPSFLAGS' : '',
+        'PSCOM'      : '$DVIPS $DVIPSFLAGS -o $TARGET $SOURCES',
+        'PSPREFIX'   : '',
+        'PSSUFFIX'   : '.ps',
+        'BUILDERS'   : [Alias, CFile, CXXFile, DVI, Library, Object,
+                        PDF, PostScript, Program],
         'SCANNERS'   : [CScan],
         'OBJPREFIX'  : '',
         'OBJSUFFIX'  : '.obj',
@@ -313,8 +337,16 @@ if os.name == 'posix':
         'LATEX'      : 'latex',
         'LATEXFLAGS' : '',
         'LATEXCOM'   : '$LATEX $LATEXFLAGS $SOURCES',
-        'DVISUFFIX'  : '.dvi',
-        'BUILDERS'   : [Alias, CFile, CXXFile, DVI, Object, Program, Library],
+        'DVIPDF'     : 'dvipdf',
+        'PDFCOM'     : '$DVIPDF $DVIPDFFLAGS $SOURCES $TARGET',
+        'PDFPREFIX'  : '',
+        'PDFSUFFIX'  : '.pdf',
+        'DVIPS'      : 'dvips',
+        'PSCOM'      : '$DVIPS $DVIPSFLAGS -o $TARGET $SOURCES',
+        'PSPREFIX'   : '',
+        'PSSUFFIX'   : '.ps',
+        'BUILDERS'   : [Alias, CFile, CXXFile, DVI, Library, Object,
+                        PDF, PostScript, Program],
         'SCANNERS'   : [CScan],
         'OBJPREFIX'  : '',
         'OBJSUFFIX'  : '.o',
diff --git a/test/DVIPDF.py b/test/DVIPDF.py
new file mode 100644
index 0000000..cb924af
--- /dev/null
+++ b/test/DVIPDF.py
@@ -0,0 +1,185 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import os.path
+import string
+import sys
+import TestSCons
+
+python = sys.executable
+
+if sys.platform == 'win32':
+    _exe = '.exe'
+else:
+    _exe = ''
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mytex.py', r"""
+import os
+import sys
+base_name = os.path.splitext(sys.argv[1])[0]
+infile = open(sys.argv[1], 'rb')
+out_file = open(base_name+'.dvi', 'wb')
+for l in infile.readlines():
+    if l[:4] != '#tex':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('mylatex.py', r"""
+import os
+import sys
+base_name = os.path.splitext(sys.argv[1])[0]
+infile = open(sys.argv[1], 'rb')
+out_file = open(base_name+'.dvi', 'wb')
+for l in infile.readlines():
+    if l[:6] != '#latex':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('mydvipdf.py', r"""
+import os
+import sys
+infile = open(sys.argv[1], 'rb')
+out_file = open(sys.argv[2], 'wb')
+for l in infile.readlines():
+    if l[:7] != '#dvipdf':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(TEX = r'%s mytex.py',
+                  LATEX = r'%s mylatex.py',
+                  DVIPDF = r'%s mydvipdf.py')
+dvi = env.DVI(target = 'test1.dvi', source = 'test1.tex')
+env.PDF(target = 'test1.pdf', source = dvi)
+env.PDF(target = 'test2.pdf', source = 'test2.tex')
+env.PDF(target = 'test3.pdf', source = 'test3.ltx')
+env.PDF(target = 'test4.pdf', source = 'test4.latex')
+""" % (python, python, python))
+
+test.write('test1.tex', r"""This is a .dvi test.
+#tex
+#dvipdf
+""")
+
+test.write('test2.tex', r"""This is a .tex test.
+#tex
+#dvipdf
+""")
+
+test.write('test3.ltx', r"""This is a .ltx test.
+#latex
+#dvipdf
+""")
+
+test.write('test4.latex', r"""This is a .latex test.
+#latex
+#dvipdf
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1.pdf') != "This is a .dvi test.\n")
+
+test.fail_test(test.read('test2.pdf') != "This is a .tex test.\n")
+
+test.fail_test(test.read('test3.pdf') != "This is a .ltx test.\n")
+
+test.fail_test(test.read('test4.pdf') != "This is a .latex test.\n")
+
+
+
+dvipdf = None
+for dir in string.split(os.environ['PATH'], os.pathsep):
+    l = os.path.join(dir, 'dvipdf' + _exe)
+    if os.path.exists(l):
+        dvipdf = l
+        break
+
+if dvipdf:
+
+    test.write("wrapper.py", """import os
+import string
+import sys
+cmd = string.join(sys.argv[1:], " ")
+open('%s', 'ab').write("%%s\\n" %% cmd)
+os.system(cmd)
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+    test.write('SConstruct', """
+foo = Environment()
+dvipdf = foo.Dictionary('DVIPDF')
+bar = Environment(DVIPDF = r'%s wrapper.py ' + dvipdf)
+foo.PDF(target = 'foo.pdf', source = 'foo.tex')
+bar.PDF(target = 'bar1', source = 'bar1.tex')
+bar.PDF(target = 'bar2', source = 'bar2.ltx')
+bar.PDF(target = 'bar3', source = 'bar3.latex')
+""" % python)
+
+    tex = r"""
+This is the %s TeX file.
+\end
+"""
+
+    latex = r"""
+\documentclass{letter}
+\begin{document}
+This is the %s LaTeX file.
+\end{document}
+"""
+
+    test.write('foo.tex', tex % 'foo.tex')
+    test.write('bar1.tex', tex % 'bar1.tex')
+    test.write('bar2.ltx', latex % 'bar2.ltx')
+    test.write('bar3.latex', latex % 'bar3.latex')
+
+    test.run(arguments = 'foo.dvi', stderr = None)
+
+    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+    test.fail_test(not os.path.exists(test.workpath('foo.dvi')))
+
+    test.run(arguments = 'bar1.pdf bar2.pdf bar3.pdf', stderr = None)
+
+    expect = """dvipdf bar1.dvi bar1.pdf
+dvipdf bar2.dvi bar2.pdf
+dvipdf bar3.dvi bar3.pdf
+"""
+
+    test.fail_test(test.read('wrapper.out') != expect)
+
+    test.fail_test(not os.path.exists(test.workpath('bar1.pdf')))
+    test.fail_test(not os.path.exists(test.workpath('bar2.pdf')))
+    test.fail_test(not os.path.exists(test.workpath('bar3.pdf')))
+
+test.pass_test()
diff --git a/test/DVIPDFFLAGS.py b/test/DVIPDFFLAGS.py
new file mode 100644
index 0000000..8f8cf0e
--- /dev/null
+++ b/test/DVIPDFFLAGS.py
@@ -0,0 +1,191 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import os.path
+import string
+import sys
+import TestSCons
+
+python = sys.executable
+
+if sys.platform == 'win32':
+    _exe = '.exe'
+else:
+    _exe = ''
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mytex.py', r"""
+import os
+import sys
+base_name = os.path.splitext(sys.argv[1])[0]
+infile = open(sys.argv[1], 'rb')
+out_file = open(base_name+'.dvi', 'wb')
+for l in infile.readlines():
+    if l[:4] != '#tex':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('mylatex.py', r"""
+import os
+import sys
+base_name = os.path.splitext(sys.argv[1])[0]
+infile = open(sys.argv[1], 'rb')
+out_file = open(base_name+'.dvi', 'wb')
+for l in infile.readlines():
+    if l[:6] != '#latex':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('mydvipdf.py', r"""
+import getopt
+import os
+import sys
+cmd_opts, args = getopt.getopt(sys.argv[1:], 'x', [])
+opt_string = ''
+for opt, arg in cmd_opts:
+    opt_string = opt_string + ' ' + opt
+infile = open(args[0], 'rb')
+out_file = open(args[1], 'wb')
+out_file.write(opt_string + "\n")
+for l in infile.readlines():
+    if l[:7] != '#dvipdf':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(TEX = r'%s mytex.py',
+                  LATEX = r'%s mylatex.py',
+                  DVIPDF = r'%s mydvipdf.py', DVIPDFFLAGS = '-x')
+dvi = env.DVI(target = 'test1.dvi', source = 'test1.tex')
+env.PDF(target = 'test1.pdf', source = dvi)
+env.PDF(target = 'test2.pdf', source = 'test2.tex')
+env.PDF(target = 'test3.pdf', source = 'test3.ltx')
+env.PDF(target = 'test4.pdf', source = 'test4.latex')
+""" % (python, python, python))
+
+test.write('test1.tex', r"""This is a .dvi test.
+#tex
+#dvipdf
+""")
+
+test.write('test2.tex', r"""This is a .tex test.
+#tex
+#dvipdf
+""")
+
+test.write('test3.ltx', r"""This is a .ltx test.
+#latex
+#dvipdf
+""")
+
+test.write('test4.latex', r"""This is a .latex test.
+#latex
+#dvipdf
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1.pdf') != " -x\nThis is a .dvi test.\n")
+
+test.fail_test(test.read('test2.pdf') != " -x\nThis is a .tex test.\n")
+
+test.fail_test(test.read('test3.pdf') != " -x\nThis is a .ltx test.\n")
+
+test.fail_test(test.read('test4.pdf') != " -x\nThis is a .latex test.\n")
+
+
+
+dvipdf = None
+for dir in string.split(os.environ['PATH'], os.pathsep):
+    l = os.path.join(dir, 'dvipdf' + _exe)
+    if os.path.exists(l):
+        dvipdf = l
+        break
+
+if dvipdf:
+
+    test.write("wrapper.py", """import os
+import string
+import sys
+cmd = string.join(sys.argv[1:], " ")
+open('%s', 'ab').write("%%s\\n" %% cmd)
+os.system(cmd)
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+    test.write('SConstruct', """
+foo = Environment(DVIPDFFLAGS = '-N')
+dvipdf = foo.Dictionary('DVIPDF')
+bar = Environment(DVIPDF = r'%s wrapper.py ' + dvipdf)
+foo.PDF(target = 'foo.pdf', source = 'foo.tex')
+bar.PDF(target = 'bar1', source = 'bar1.tex')
+bar.PDF(target = 'bar2', source = 'bar2.ltx')
+bar.PDF(target = 'bar3', source = 'bar3.latex')
+""" % python)
+
+    tex = r"""
+This is the %s TeX file.
+\end
+"""
+
+    latex = r"""
+\documentclass{letter}
+\begin{document}
+This is the %s LaTeX file.
+\end{document}
+"""
+
+    test.write('foo.tex', tex % 'foo.tex')
+    test.write('bar1.tex', tex % 'bar1.tex')
+    test.write('bar2.ltx', latex % 'bar2.ltx')
+    test.write('bar3.latex', latex % 'bar3.latex')
+
+    test.run(arguments = 'foo.dvi', stderr = None)
+
+    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+    test.fail_test(not os.path.exists(test.workpath('foo.dvi')))
+
+    test.run(arguments = 'bar1.pdf bar2.pdf bar3.pdf', stderr = None)
+
+    expect = """dvipdf bar1.dvi bar1.pdf
+dvipdf bar2.dvi bar2.pdf
+dvipdf bar3.dvi bar3.pdf
+"""
+
+    test.fail_test(test.read('wrapper.out') != expect)
+
+    test.fail_test(not os.path.exists(test.workpath('bar1.pdf')))
+    test.fail_test(not os.path.exists(test.workpath('bar2.pdf')))
+    test.fail_test(not os.path.exists(test.workpath('bar3.pdf')))
+
+test.pass_test()
diff --git a/test/DVIPS.py b/test/DVIPS.py
new file mode 100644
index 0000000..91900be
--- /dev/null
+++ b/test/DVIPS.py
@@ -0,0 +1,185 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import os.path
+import string
+import sys
+import TestSCons
+
+python = sys.executable
+
+if sys.platform == 'win32':
+    _exe = '.exe'
+else:
+    _exe = ''
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mytex.py', r"""
+import os
+import sys
+base_name = os.path.splitext(sys.argv[1])[0]
+infile = open(sys.argv[1], 'rb')
+out_file = open(base_name+'.dvi', 'wb')
+for l in infile.readlines():
+    if l[:4] != '#tex':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('mylatex.py', r"""
+import os
+import sys
+base_name = os.path.splitext(sys.argv[1])[0]
+infile = open(sys.argv[1], 'rb')
+out_file = open(base_name+'.dvi', 'wb')
+for l in infile.readlines():
+    if l[:6] != '#latex':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('mydvips.py', r"""
+import os
+import sys
+infile = open(sys.argv[3], 'rb')
+out_file = open(sys.argv[2], 'wb')
+for l in infile.readlines():
+    if l[:6] != '#dvips':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(TEX = r'%s mytex.py',
+                  LATEX = r'%s mylatex.py',
+                  DVIPS = r'%s mydvips.py')
+dvi = env.DVI(target = 'test1.dvi', source = 'test1.tex')
+env.PostScript(target = 'test1.ps', source = dvi)
+env.PostScript(target = 'test2.ps', source = 'test2.tex')
+env.PostScript(target = 'test3.ps', source = 'test3.ltx')
+env.PostScript(target = 'test4.ps', source = 'test4.latex')
+""" % (python, python, python))
+
+test.write('test1.tex', r"""This is a .dvi test.
+#tex
+#dvips
+""")
+
+test.write('test2.tex', r"""This is a .tex test.
+#tex
+#dvips
+""")
+
+test.write('test3.ltx', r"""This is a .ltx test.
+#latex
+#dvips
+""")
+
+test.write('test4.latex', r"""This is a .latex test.
+#latex
+#dvips
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1.ps') != "This is a .dvi test.\n")
+
+test.fail_test(test.read('test2.ps') != "This is a .tex test.\n")
+
+test.fail_test(test.read('test3.ps') != "This is a .ltx test.\n")
+
+test.fail_test(test.read('test4.ps') != "This is a .latex test.\n")
+
+
+
+dvips = None
+for dir in string.split(os.environ['PATH'], os.pathsep):
+    l = os.path.join(dir, 'dvips' + _exe)
+    if os.path.exists(l):
+        dvips = l
+        break
+
+if dvips:
+
+    test.write("wrapper.py", """import os
+import string
+import sys
+cmd = string.join(sys.argv[1:], " ")
+open('%s', 'ab').write("%%s\\n" %% cmd)
+os.system(cmd)
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+    test.write('SConstruct', """
+foo = Environment()
+dvips = foo.Dictionary('DVIPS')
+bar = Environment(DVIPS = r'%s wrapper.py ' + dvips)
+foo.PostScript(target = 'foo.ps', source = 'foo.tex')
+bar.PostScript(target = 'bar1', source = 'bar1.tex')
+bar.PostScript(target = 'bar2', source = 'bar2.ltx')
+bar.PostScript(target = 'bar3', source = 'bar3.latex')
+""" % python)
+
+    tex = r"""
+This is the %s TeX file.
+\end
+"""
+
+    latex = r"""
+\documentclass{letter}
+\begin{document}
+This is the %s LaTeX file.
+\end{document}
+"""
+
+    test.write('foo.tex', tex % 'foo.tex')
+    test.write('bar1.tex', tex % 'bar1.tex')
+    test.write('bar2.ltx', latex % 'bar2.ltx')
+    test.write('bar3.latex', latex % 'bar3.latex')
+
+    test.run(arguments = 'foo.dvi', stderr = None)
+
+    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+    test.fail_test(not os.path.exists(test.workpath('foo.dvi')))
+
+    test.run(arguments = 'bar1.ps bar2.ps bar3.ps', stderr = None)
+
+    expect = """dvips -o bar1.ps bar1.dvi
+dvips -o bar2.ps bar2.dvi
+dvips -o bar3.ps bar3.dvi
+"""
+
+    test.fail_test(test.read('wrapper.out') != expect)
+
+    test.fail_test(not os.path.exists(test.workpath('bar1.ps')))
+    test.fail_test(not os.path.exists(test.workpath('bar2.ps')))
+    test.fail_test(not os.path.exists(test.workpath('bar3.ps')))
+
+test.pass_test()
diff --git a/test/DVIPSFLAGS.py b/test/DVIPSFLAGS.py
new file mode 100644
index 0000000..e043e75
--- /dev/null
+++ b/test/DVIPSFLAGS.py
@@ -0,0 +1,192 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import os.path
+import string
+import sys
+import TestSCons
+
+python = sys.executable
+
+if sys.platform == 'win32':
+    _exe = '.exe'
+else:
+    _exe = ''
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mytex.py', r"""
+import os
+import sys
+base_name = os.path.splitext(sys.argv[1])[0]
+infile = open(sys.argv[1], 'rb')
+out_file = open(base_name+'.dvi', 'wb')
+for l in infile.readlines():
+    if l[:4] != '#tex':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('mylatex.py', r"""
+import os
+import sys
+base_name = os.path.splitext(sys.argv[1])[0]
+infile = open(sys.argv[1], 'rb')
+out_file = open(base_name+'.dvi', 'wb')
+for l in infile.readlines():
+    if l[:6] != '#latex':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('mydvips.py', r"""
+import getopt
+import os
+import sys
+cmd_opts, args = getopt.getopt(sys.argv[1:], 'o:x', [])
+opt_string = ''
+for opt, arg in cmd_opts:
+    if opt == '-o': outfile = arg
+    else: opt_string = opt_string + ' ' + opt
+infile = open(args[0], 'rb')
+out_file = open(outfile, 'wb')
+out_file.write(opt_string + "\n")
+for l in infile.readlines():
+    if l[:6] != '#dvips':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(TEX = r'%s mytex.py',
+                  LATEX = r'%s mylatex.py',
+                  DVIPS = r'%s mydvips.py', DVIPSFLAGS = '-x')
+dvi = env.DVI(target = 'test1.dvi', source = 'test1.tex')
+env.PostScript(target = 'test1.ps', source = dvi)
+env.PostScript(target = 'test2.ps', source = 'test2.tex')
+env.PostScript(target = 'test3.ps', source = 'test3.ltx')
+env.PostScript(target = 'test4.ps', source = 'test4.latex')
+""" % (python, python, python))
+
+test.write('test1.tex', r"""This is a .dvi test.
+#tex
+#dvips
+""")
+
+test.write('test2.tex', r"""This is a .tex test.
+#tex
+#dvips
+""")
+
+test.write('test3.ltx', r"""This is a .ltx test.
+#latex
+#dvips
+""")
+
+test.write('test4.latex', r"""This is a .latex test.
+#latex
+#dvips
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1.ps') != " -x\nThis is a .dvi test.\n")
+
+test.fail_test(test.read('test2.ps') != " -x\nThis is a .tex test.\n")
+
+test.fail_test(test.read('test3.ps') != " -x\nThis is a .ltx test.\n")
+
+test.fail_test(test.read('test4.ps') != " -x\nThis is a .latex test.\n")
+
+
+
+dvips = None
+for dir in string.split(os.environ['PATH'], os.pathsep):
+    l = os.path.join(dir, 'dvips' + _exe)
+    if os.path.exists(l):
+        dvips = l
+        break
+
+if dvips:
+
+    test.write("wrapper.py", """import os
+import string
+import sys
+cmd = string.join(sys.argv[1:], " ")
+open('%s', 'ab').write("%%s\\n" %% cmd)
+os.system(cmd)
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+    test.write('SConstruct', """
+foo = Environment(DVIPSFLAGS = '-N')
+dvips = foo.Dictionary('DVIPS')
+bar = Environment(DVIPS = r'%s wrapper.py ' + dvips)
+foo.PostScript(target = 'foo.ps', source = 'foo.tex')
+bar.PostScript(target = 'bar1', source = 'bar1.tex')
+bar.PostScript(target = 'bar2', source = 'bar2.ltx')
+bar.PostScript(target = 'bar3', source = 'bar3.latex')
+""" % python)
+
+    tex = r"""
+This is the %s TeX file.
+\end
+"""
+
+    latex = r"""
+\documentclass{letter}
+\begin{document}
+This is the %s LaTeX file.
+\end{document}
+"""
+
+    test.write('foo.tex', tex % 'foo.tex')
+    test.write('bar1.tex', tex % 'bar1.tex')
+    test.write('bar2.ltx', latex % 'bar2.ltx')
+    test.write('bar3.latex', latex % 'bar3.latex')
+
+    test.run(arguments = 'foo.dvi', stderr = None)
+
+    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+    test.fail_test(not os.path.exists(test.workpath('foo.dvi')))
+
+    test.run(arguments = 'bar1.ps bar2.ps bar3.ps', stderr = None)
+
+    expect = """dvips -o bar1.ps bar1.dvi
+dvips -o bar2.ps bar2.dvi
+dvips -o bar3.ps bar3.dvi
+"""
+
+    test.fail_test(test.read('wrapper.out') != expect)
+
+    test.fail_test(not os.path.exists(test.workpath('bar1.ps')))
+    test.fail_test(not os.path.exists(test.workpath('bar2.ps')))
+    test.fail_test(not os.path.exists(test.workpath('bar3.ps')))
+
+test.pass_test()