anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix pdf format conversion

Browse Source 
When calling the default converter (convert) we pass the format on the
command line. In LyX we have various pdf, pdf2, pdf3, etc. formats all
representing PDF. We need to strip to trailing digit in the format string
otherwise the format is not understood by convert.
This commit is contained in:
Julien Rioux 2013-07-13 16:12:04 +02:00 committed by Vincent van Ravesteijn
parent 096204e23f
commit 73368ed2d9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/graphics/GraphicsConverter.cpp
View File

@ -255,6 +255,13 @@ static void build_conversion_command(string const & command, ostream & script)
}
static string const strip_digit(string const & format)
{
// Strip trailing digits from format names e.g. "pdf6" -> "pdf"
return format.substr(0, format.find_last_not_of("0123456789") + 1);
}
static void build_script(string const & from_file,
string const & to_file,
string const & from_format,
@ -318,12 +325,12 @@ static void build_script(string const & from_file,
<< libScriptSearch("$$s/scripts/convertDefault.py",
quote_python) << ' ';
if (!from_format.empty())
os << from_format << ':';
os << strip_digit(from_format) << ':';
// The extra " quotes around infile and outfile are needed
// because the filename may contain spaces and it is used
// as argument of os.system().
os << "' + '\"' + infile + '\"' + ' "
<< to_format << ":' + '\"' + outfile + '\"' + '";
<< strip_digit(to_format) << ":' + '\"' + outfile + '\"' + '";
string const command = os.str();
LYXERR(Debug::GRAPHICS,