From 6a9c9f620b1e978f279708665aa1a28779fd035f Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Sat, 18 Feb 2012 14:00:41 +0000 Subject: [PATCH] Call lyxpak.py using the original (not mangled) document file name. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40774 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/configure.py | 2 +- src/Converter.cpp | 2 ++ status.20x | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/configure.py b/lib/configure.py index 4f33c62e3c..f37bfdb47f 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -966,7 +966,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") diff --git a/src/Converter.cpp b/src/Converter.cpp index 16ff6033d4..631b847574 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -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"); @@ -424,6 +425,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); diff --git a/status.20x b/status.20x index 3ea6369a17..a5d960bb20 100644 --- a/status.20x +++ b/status.20x @@ -166,6 +166,9 @@ What's new - Find correctly the file Sweave.sty with older R versions (bug 8019). +- Fix lyx archive creation when the document file name contains spaces + or other characters which are special to latex. + * TEX2LYX - Full support for the command \date{} (bug 7844). -- 2.39.5