summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-11-19 17:20:59 (GMT)
committerSteven Knight <knight@baldmt.com>2005-11-19 17:20:59 (GMT)
commit0c644faf2f067e30c4c9070f02b7f48887d79c94 (patch)
tree010b047e107ac36aa450941ffa6e4a42e9f58ebd /src/engine/SCons
parent70a70c501294fcb6ce2a3a002260715c365cb00e (diff)
downloadSCons-0c644faf2f067e30c4c9070f02b7f48887d79c94.zip
SCons-0c644faf2f067e30c4c9070f02b7f48887d79c94.tar.gz
SCons-0c644faf2f067e30c4c9070f02b7f48887d79c94.tar.bz2
Fixes to the LaTeX scanner for Python version differences.
Diffstat (limited to 'src/engine/SCons')
-rw-r--r--src/engine/SCons/Scanner/LaTeX.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py
index 9451023..22a5e87 100644
--- a/src/engine/SCons/Scanner/LaTeX.py
+++ b/src/engine/SCons/Scanner/LaTeX.py
@@ -5,7 +5,7 @@ This module implements the dependency scanner for LaTeX code.
"""
#
-# Copyright (c) 2005 The SCons Foundation
+# __COPYRIGHT__
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ This module implements the dependency scanner for LaTeX code.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = ""
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
import SCons.Scanner
@@ -37,15 +37,13 @@ def LaTeXScanner(fs = SCons.Node.FS.default_fs):
ds = LaTeX(name = "LaTeXScanner",
suffixes = '$LATEXSUFFIXES',
path_variable = 'TEXINPUTS',
- regex = '\\\\(include|input){([^}]*)}',
+ regex = '\\\\(?:include|input){([^}]*)}',
recursive = 0)
return ds
class LaTeX(SCons.Scanner.Classic):
def find_include(self, include, source_dir, path):
if callable(path): path=path()
- # find (2nd result reg expr) + extension
- # print 'looking for latex includes: ' + include[1]
- i = SCons.Node.FS.find_file(include[1] + '.tex',
+ i = SCons.Node.FS.find_file(include + '.tex',
(source_dir,) + path)
return i, include