mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Call lyxpak.py using the original (not mangled) document file name.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40773 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
a26b53885e
commit
dd2185a4a6
@ -920,7 +920,7 @@ def checkConverterEntries():
|
||||
# Currently, lyxpak outputs a gzip compressed tar archive on *nix
|
||||
# and a zip archive on Windows.
|
||||
# So, we configure the appropriate version according to the platform.
|
||||
cmd = r'\converter lyx %s "python -tt $$s/scripts/lyxpak.py $$r/$$i" ""'
|
||||
cmd = r'\converter lyx %s "python -tt $$s/scripts/lyxpak.py $$r/$$f" ""'
|
||||
if os.name == 'nt':
|
||||
addToRC(r'\Format lyxzip zip "LyX Archive (zip)" "" "" "" "document,menu=export"')
|
||||
addToRC(cmd % "lyxzip")
|
||||
|
@ -50,6 +50,7 @@ string const token_base("$$b");
|
||||
string const token_to("$$o");
|
||||
string const token_path("$$p");
|
||||
string const token_orig_path("$$r");
|
||||
string const token_orig_from("$$f");
|
||||
string const token_encoding("$$e");
|
||||
string const token_latex_encoding("$$E");
|
||||
|
||||
@ -412,6 +413,7 @@ bool Converters::convert(Buffer const * buffer,
|
||||
command = subst(command, token_to, quoteName(outfile2));
|
||||
command = subst(command, token_path, quoteName(onlyPath(infile.absFileName())));
|
||||
command = subst(command, token_orig_path, quoteName(onlyPath(orig_from.absFileName())));
|
||||
command = subst(command, token_orig_from, quoteName(onlyFileName(orig_from.absFileName())));
|
||||
command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string());
|
||||
command = libScriptSearch(command);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user