# Pre-compiled regular expressions.
re_lyxfile = re.compile("\.lyx$")
-re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$')
-re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(\S+)(\s*)}.*$')
-re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$')
-re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(\S+)(\s*)}.*$')
-re_filename = re.compile(r'^(\s*)(filename)(\s+)(\S+)$')
-re_options = re.compile(r'^(\s*)options(\s+)(\S+)$')
-re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(\S+)$')
+re_input = re.compile(r'^(.*)\\(input|include){(\s*)(.+)(\s*)}.*$')
+re_ertinput = re.compile(r'^(input|include)({)(\s*)(.+)(\s*)}.*$')
+re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(.+)(\s*)}.*$')
+re_class = re.compile(r'^(\\)(textclass)(\s+)(.+)\s*$')
+re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(.+)(\s*)}.*$')
+re_ertnorecur = re.compile(r'^(verbatiminput|lstinputlisting|includegraphics\[*.*\]*)({)(\s*)(.+)(\s*)}.*$')
+re_filename = re.compile(r'^(\s*)(filename)(\s+)(.+)\s*$')
+re_options = re.compile(r'^(\s*)options(\s+)(.+)\s*$')
+re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(.+)\s*$')
def usage(prog_name):
lines = input.readlines()
input.close()
+ maybe_in_ert = False
i = 0
while i < len(lines):
# Gather used files.
extlist = ['']
match = re_filename.match(lines[i])
if not match:
- match = re_input.match(lines[i])
+ if maybe_in_ert:
+ match = re_ertinput.match(lines[i])
+ else:
+ match = re_input.match(lines[i])
if not match:
match = re_package.match(lines[i])
extlist = ['.sty']
match = re_class.match(lines[i])
extlist = ['.cls']
if not match:
- match = re_norecur.match(lines[i])
+ if maybe_in_ert:
+ match = re_ertnorecur.match(lines[i])
+ else:
+ match = re_norecur.match(lines[i])
extlist = ['', '.eps', '.pdf', '.png', '.jpg']
recursive = False
+ maybe_in_ert = is_lyxfile and lines[i] == "\\backslash"
if match:
file = match.group(4).strip('"')
if not os.path.isabs(file):
file = os.path.join(curdir, file)
file_exists = False
- for ext in extlist:
- if os.path.exists(file + ext):
- file = file + ext
- file_exists = True
- break
- if file_exists:
+ if not os.path.isdir(file):
+ for ext in extlist:
+ if os.path.exists(file + ext):
+ file = file + ext
+ file_exists = True
+ break
+ if file_exists and not abspath(file) in incfiles:
incfiles.append(abspath(file))
if recursive:
gather_files(file, incfiles, lyx2lyx)
j = 0
while j < len(bibfiles):
if os.path.isabs(bibfiles[j]):
- file = bibfiles[j]
+ file = bibfiles[j] + '.bib'
else:
file = os.path.join(curdir, bibfiles[j] + '.bib')
if os.path.exists(file):
# now we will try to query LyX itself to find the path.
extlist = ['']
- if os.environ.has_key("PATHEXT"):
+ if "PATHEXT" in os.environ:
extlist = extlist + os.environ["PATHEXT"].split(os.pathsep)
lyx_exe, full_path = find_exe(["lyxc", "lyx"], extlist, path)
if lyx_exe == None:
# Find the topmost dir common to all files
if len(incfiles) > 1:
topdir = os.path.commonprefix(incfiles)
+ # Check whether topdir is valid, as os.path.commonprefix() works on
+ # a character by character basis, rather than on path elements.
+ if not os.path.exists(topdir):
+ topdir = os.path.dirname(topdir) + os.path.sep
else:
topdir = os.path.dirname(incfiles[0]) + os.path.sep
# Create the archive
try:
- if os.name == 'nt':
+ if makezip:
zip = zipfile.ZipFile(ar_name, "w", zipfile.ZIP_DEFLATED)
for file in incfiles:
zip.write(file)