-#! /usr/bin/env python
# -*- coding: utf-8 -*-
# file lyxpak.py
# Licence details can be found in the file COPYING.
# author Enrico Forestieri
+# author Richard Heck
# Full author contact details are available in file CREDITS
# This script creates a tar or zip archive with a lyx file and all included
-# files (graphics and so on). The created archive is the standard type on a
-# given platform, such that a zip archive is created on Windows and a gzip
-# compressed tar archive on *nix.
+# files (graphics and so on). By default, the created archive is the standard
+# type on a given platform, such that a zip archive is created on Windows and
+# a gzip compressed tar archive on *nix. This can be controlled by command
+# line options, however.
import os, re, string, sys
if sys.version_info < (2, 4, 0):
from sets import Set as set
from getopt import getopt
-lyx2lyx = None
-
# 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):
return newname
-def gather_files(curfile, incfiles):
+def gather_files(curfile, incfiles, lyx2lyx):
" Recursively gather files."
curdir = os.path.dirname(abspath(curfile))
is_lyxfile = re_lyxfile.search(curfile)
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)
+ gather_files(file, incfiles, lyx2lyx)
i += 1
continue
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):
return 0
+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.
+ ourpath = os.path.dirname(abspath(progloc))
+ (upone, discard) = os.path.split(ourpath)
+ tryit = os.path.join(upone, "lyx2lyx", "lyx2lyx")
+ if os.access(tryit, os.X_OK):
+ return tryit
+
+ # now we will try to query LyX itself to find the path.
+ extlist = ['']
+ 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:
+ error('Cannot find the LyX executable in the path.')
+ cmd_status, cmd_stdout = run_cmd("%s -version 2>&1" % lyx_exe)
+ if cmd_status != None:
+ error('Cannot query LyX about the lyx2lyx script.')
+ re_msvc = re.compile(r'^(\s*)(Host type:)(\s+)(win32)$')
+ re_sysdir = re.compile(r'^(\s*)(LyX files dir:)(\s+)(\S+)$')
+ lines = cmd_stdout.splitlines()
+ for line in lines:
+ match = re_msvc.match(line)
+ if match:
+ # The LyX executable was built with MSVC, so the
+ # "LyX files dir:" line is unusable
+ basedir = os.path.dirname(os.path.dirname(full_path))
+ tryit = os.path.join(basedir, 'Resources', 'lyx2lyx', 'lyx2lyx')
+ break
+ match = re_sysdir.match(line)
+ if match:
+ tryit = os.path.join(match.group(4), 'lyx2lyx', 'lyx2lyx')
+ break
+
+ if not os.access(tryit, os.X_OK):
+ error('Unable to find the lyx2lyx script.')
+ return tryit
+
+
def main(args):
ourprog = args[0]
makezip = (os.name == 'nt')
outdir = ""
- global lyx2lyx
+ lyx2lyx = None
for (opt, param) in options:
if opt == "-h":
else:
import tarfile
- # Create a tar archive on *nix and a zip archive on Windows
ar_ext = ".tar.gz"
if makezip:
ar_ext = ".zip"
path = string.split(os.environ["PATH"], os.pathsep)
- # Try to find the location of the lyx2lyx script
if lyx2lyx == None:
- # 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.
- ourpath = os.path.dirname(abspath(ourprog))
- (upone, discard) = os.path.split(ourpath)
- tryit = os.path.join(upone, "lyx2lyx", "lyx2lyx")
- if os.path.exists(tryit):
- lyx2lyx = tryit
- else:
- extlist = ['']
- if os.environ.has_key("PATHEXT"):
- extlist = extlist + os.environ["PATHEXT"].split(os.pathsep)
- lyx_exe, full_path = find_exe(["lyxc", "lyx"], extlist, path)
- if lyx_exe == None:
- error('Cannot find the LyX executable in the path.')
- cmd_status, cmd_stdout = run_cmd("%s -version 2>&1" % lyx_exe)
- if cmd_status != None:
- error('Cannot query LyX about the lyx2lyx script.')
- re_msvc = re.compile(r'^(\s*)(Host type:)(\s+)(win32)$')
- re_sysdir = re.compile(r'^(\s*)(LyX files dir:)(\s+)(\S+)$')
- lines = cmd_stdout.splitlines()
- for line in lines:
- match = re_msvc.match(line)
- if match:
- # The LyX executable was built with MSVC, so the
- # "LyX files dir:" line is unusable
- basedir = os.path.dirname(os.path.dirname(full_path))
- lyx2lyx = os.path.join(basedir, 'Resources', 'lyx2lyx', 'lyx2lyx')
- break
- match = re_sysdir.match(line)
- if match:
- lyx2lyx = os.path.join(match.group(4), 'lyx2lyx', 'lyx2lyx')
- break
- if not os.access(lyx2lyx, os.X_OK):
- error('Unable to find the lyx2lyx script.')
+ lyx2lyx = find_lyx2lyx(ourprog, path)
# Initialize the list with the specified LyX file and recursively
# gather all required files (also from child documents).
incfiles = [abspath(lyxfile)]
- gather_files(lyxfile, incfiles)
+ gather_files(lyxfile, incfiles, lyx2lyx)
# 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)
projects / lyx.git / blobdiff