anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Also include in the archive the files referenced in ERT in the document body.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39692 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2011-09-16 14:40:40 +00:00
parent 45aa989efc
commit 40d4d94b01
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/scripts/lyxpak.py
View File

@ -24,9 +24,11 @@ from getopt import getopt
# Pre-compiled regular expressions. # Pre-compiled regular expressions.
re_lyxfile = re.compile("\.lyx$") re_lyxfile = re.compile("\.lyx$")
re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$') 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_package = re.compile(r'^(.*)\\(usepackage){(\s*)(\S+)(\s*)}.*$')
re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$') re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$')
re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(\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_filename = re.compile(r'^(\s*)(filename)(\s+)(\S+)$')
re_options = re.compile(r'^(\s*)options(\s+)(\S+)$') re_options = re.compile(r'^(\s*)options(\s+)(\S+)$')
re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(\S+)$') re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(\S+)$')
@ -92,6 +94,7 @@ def gather_files(curfile, incfiles, lyx2lyx):
lines = input.readlines() lines = input.readlines()
input.close() input.close()
maybe_in_ert = False
i = 0 i = 0
while i < len(lines): while i < len(lines):
# Gather used files. # Gather used files.
@ -99,7 +102,10 @@ def gather_files(curfile, incfiles, lyx2lyx):
extlist = [''] extlist = ['']
match = re_filename.match(lines[i]) match = re_filename.match(lines[i])
if not match: 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: if not match:
match = re_package.match(lines[i]) match = re_package.match(lines[i])
extlist = ['.sty'] extlist = ['.sty']
@ -107,9 +113,13 @@ def gather_files(curfile, incfiles, lyx2lyx):
match = re_class.match(lines[i]) match = re_class.match(lines[i])
extlist = ['.cls'] extlist = ['.cls']
if not match: 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'] extlist = ['', '.eps', '.pdf', '.png', '.jpg']
recursive = False recursive = False
maybe_in_ert = is_lyxfile and lines[i] == "\\backslash"
if match: if match:
file = match.group(4).strip('"') file = match.group(4).strip('"')
if not os.path.isabs(file): if not os.path.isabs(file):