X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Flyxpak.py;h=77b16faa8fc62173639d3d1fa23c1a21f82d59c6;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=07737249fed75abbe0ec3ac58df83129e8ae6ebc;hpb=b26fc9ff62e16a37f56b2c9ecb8d8db49bfcf027;p=lyx.git

diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py
index 07737249fe..77b16faa8f 100755
--- a/lib/scripts/lyxpak.py
+++ b/lib/scripts/lyxpak.py
@@ -23,13 +23,15 @@ from getopt import getopt
 
 # 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):
@@ -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,23 +113,28 @@ 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):
                 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)
+                    gather_files(file, incfiles, lyx2lyx)
             i += 1
             continue
 
@@ -149,7 +160,7 @@ def gather_files(curfile, 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):
@@ -163,7 +174,8 @@ def gather_files(curfile, incfiles, lyx2lyx):
     return 0
 
 
-def find_lyx2lyx(progloc):
+def find_lyx2lyx(progloc, path):
+    " Find a usable version of the lyx2lyx script. "
     # first we will see if the script is roughly where we are
     # i.e., we will assume we are in $SOMEDIR/scripts and look
     # for $SOMEDIR/lyx2lyx/lyx2lyx.
@@ -175,7 +187,7 @@ def find_lyx2lyx(progloc):
 
     # 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:
@@ -252,7 +264,6 @@ def main(args):
     else:
         import tarfile
 
-    # Create a tar archive on *nix and a zip archive on Windows
     ar_ext = ".tar.gz"
     if makezip:
         ar_ext = ".zip"
@@ -263,9 +274,8 @@ def main(args):
 
     path = string.split(os.environ["PATH"], os.pathsep)
 
-    # Try to find the location of the lyx2lyx script
     if lyx2lyx == None:
-        lyx2lyx = find_lyx2lyx(ourprog)
+        lyx2lyx = find_lyx2lyx(ourprog, path)
 
     # Initialize the list with the specified LyX file and recursively
     # gather all required files (also from child documents).
@@ -275,6 +285,10 @@ def main(args):
     # 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
 
@@ -293,7 +307,7 @@ def main(args):
 
     # 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)