X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Flyxpak.py;h=696acef81d513a0c9c0fd4ea0cbabb6024f6e4d3;hb=c0bbc020a56e0e55fe4a07230ab6d9851fef0c24;hp=ced3b385eddd0333b7c4761cba0c20dea46f3d31;hpb=517cfe9266ac95fdc5611c2622ac4818b1475193;p=lyx.git diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py index ced3b385ed..696acef81d 100755 --- a/lib/scripts/lyxpak.py +++ b/lib/scripts/lyxpak.py @@ -24,9 +24,11 @@ from getopt import getopt # Pre-compiled regular expressions. re_lyxfile = re.compile("\.lyx$") re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$') +re_ertinput = 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_ertnorecur = 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+)$') @@ -92,6 +94,7 @@ def gather_files(curfile, incfiles, lyx2lyx): lines = input.readlines() input.close() + maybe_in_ert = False i = 0 while i < len(lines): # Gather used files. @@ -99,7 +102,10 @@ def gather_files(curfile, incfiles, lyx2lyx): 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'] @@ -107,9 +113,13 @@ def gather_files(curfile, incfiles, lyx2lyx): 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): @@ -121,7 +131,7 @@ def gather_files(curfile, incfiles, lyx2lyx): file = file + ext file_exists = True break - if file_exists and not file in incfiles: + if file_exists and not abspath(file) in incfiles: incfiles.append(abspath(file)) if recursive: gather_files(file, incfiles, lyx2lyx)