X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsConverter.cpp;h=ccfb57ce4b4a02f9dfa3a1507713de677856987c;hb=e6afdf1b2b1f707a69ac5b2ddb9056443b0a89b4;hp=817768e489f21d5686ae0578f018a985dbabca50;hpb=9abb7db46800e554f57e865a3e768602ffd9d6f1;p=lyx.git diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp index 817768e489..ccfb57ce4b 100644 --- a/src/graphics/GraphicsConverter.cpp +++ b/src/graphics/GraphicsConverter.cpp @@ -15,15 +15,16 @@ #include "Converter.h" #include "Format.h" +#include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" +#include "support/FileName.h" #include "support/filetools.h" #include "support/ForkedCalls.h" #include "support/lstrings.h" -#include "support/lyxlib.h" #include "support/os.h" -#include +#include "support/bind.h" #include #include @@ -110,7 +111,7 @@ FileName const & Converter::convertedFile() const /** Build the conversion script. * The script is output to the stream \p script. */ -static void build_script(FileName const & from_file, string const & to_file_base, +static void build_script(string const & from_file, string const & to_file_base, string const & from_format, string const & to_format, ostream & script); @@ -132,7 +133,9 @@ Converter::Impl::Impl(FileName const & from_file, string const & to_file_base, // The conversion commands are stored in a stringstream ostringstream script; - build_script(from_file, to_file_base, from_format, to_format, script); + build_script(from_file.toFilesystemEncoding(), + to_file_.toFilesystemEncoding(), + from_format, to_format, script); LYXERR(Debug::GRAPHICS, "\tConversion script:" "\n--------------------------------------\n" << script.str() @@ -159,9 +162,9 @@ Converter::Impl::Impl(FileName const & from_file, string const & to_file_base, // We create a dummy command for ease of understanding of the // list of forked processes. // Note: 'python ' is absolutely essential, or execvp will fail. - script_command_ = support::os::python() + ' ' + + script_command_ = os::python() + ' ' + quoteName(script_file_.toFilesystemEncoding()) + ' ' + - quoteName(onlyFilename(from_file.toFilesystemEncoding())) + ' ' + + quoteName(onlyFileName(from_file.toFilesystemEncoding())) + ' ' + quoteName(to_format); // All is ready to go valid_process_ = true; @@ -176,8 +179,8 @@ void Converter::Impl::startConversion() } ForkedCall::SignalTypePtr ptr = - support::ForkedCallQueue::add(script_command_); - ptr->connect(boost::bind(&Impl::converted, this, _1, _2)); + ForkedCallQueue::add(script_command_); + ptr->connect(bind(&Impl::converted, this, _1, _2)); } @@ -207,8 +210,8 @@ static string const move_file(string const & from_file, string const & to_file) return string(); ostringstream command; - command << "fromfile = utf8ToDefaultEncoding(" << from_file << ")\n" - << "tofile = utf8ToDefaultEncoding(" << to_file << ")\n\n" + command << "fromfile = " << from_file << "\n" + << "tofile = " << to_file << "\n\n" << "try:\n" << " os.rename(fromfile, tofile)\n" << "except:\n" @@ -247,43 +250,30 @@ static void build_conversion_command(string const & command, ostream & script) " sys.exit(1)\n\n"; // Delete the infile - script << "unlinkNoThrow(infile)\n\n"; + script << "if infile != outfile:\n" + " unlinkNoThrow(infile)\n\n"; } -static void build_script(FileName const & from_file, - string const & to_file_base, +static void build_script(string const & from_file, + string const & to_file, string const & from_format, string const & to_format, ostream & script) { - BOOST_ASSERT(from_format != to_format); + LASSERT(from_format != to_format, /**/); LYXERR(Debug::GRAPHICS, "build_script ... "); - typedef Converters::EdgePath EdgePath; + typedef Graph::EdgePath EdgePath; script << "#!/usr/bin/env python\n" "# -*- coding: utf-8 -*-\n" - "import os, shutil, sys, locale\n\n" + "import os, shutil, sys\n\n" "def unlinkNoThrow(file):\n" " ''' remove a file, do not throw if an error occurs '''\n" " try:\n" " os.unlink(file)\n" " except:\n" - " pass\n\n" - "def utf8ToDefaultEncoding(file):\n" - " ''' if possible, convert to the default encoding '''\n" - " try:\n" - " language, output_encoding = locale.getdefaultlocale()\n" - " if output_encoding == None:\n" - " output_encoding = 'latin1'\n" - " return unicode(file, 'utf8').encode(output_encoding)\n" - " except:\n" - " return file\n\n"; - - // we do not use ChangeExtension because this is a basename - // which may nevertheless contain a '.' - string const to_file = to_file_base + '.' - + formats.extension(to_format); + " pass\n\n"; EdgePath const edgepath = from_format.empty() ? EdgePath() : @@ -293,19 +283,18 @@ static void build_script(FileName const & from_file, // Remember to remove the temp file because we only want the name... static int counter = 0; string const tmp = "gconvert" + convert(counter++); - FileName const to_base(tempName(FileName(), tmp)); - to_base.removeFile(); + string const to_base = FileName::tempName(tmp).toFilesystemEncoding(); // Create a copy of the file in case the original name contains // problematic characters like ' or ". We can work around that problem // in python, but the converters might be shell scripts and have more // troubles with it. - string outfile = addExtension(to_base.absFilename(), getExtension(from_file.absFilename())); - script << "infile = utf8ToDefaultEncoding(" - << quoteName(from_file.absFilename(), quote_python) - << ")\n" - "outfile = utf8ToDefaultEncoding(" - << quoteName(outfile, quote_python) << ")\n" + string outfile = addExtension(to_base, getExtension(from_file)); + script << "infile = " + << quoteName(from_file, quote_python) + << "\n" + "outfile = " + << quoteName(outfile, quote_python) << "\n" "shutil.copy(infile, outfile)\n"; // Some converters (e.g. lilypond) can only output files to the @@ -313,19 +302,19 @@ static void build_script(FileName const & from_file, // This has the added benefit that all other files that may be // generated by the converter are deleted when LyX closes and do not // clutter the real working directory. - script << "os.chdir(utf8ToDefaultEncoding(" - << quoteName(onlyPath(outfile)) << "))\n"; + script << "os.chdir(" + << quoteName(onlyPath(outfile)) << ")\n"; if (edgepath.empty()) { // Either from_format is unknown or we don't have a // converter path from from_format to to_format, so we use // the default converter. script << "infile = outfile\n" - << "outfile = utf8ToDefaultEncoding(" - << quoteName(to_file, quote_python) << ")\n"; + << "outfile = " + << quoteName(to_file, quote_python) << "\n"; ostringstream os; - os << support::os::python() << ' ' + os << os::python() << ' ' << libScriptSearch("$$s/scripts/convertDefault.py", quote_python) << ' '; if (!from_format.empty()) @@ -345,10 +334,11 @@ static void build_script(FileName const & from_file, } // The conversion commands may contain these tokens that need to be - // changed to infile, infile_base, outfile respectively. - string const token_from = "$$i"; - string const token_base = "$$b"; - string const token_to = "$$o"; + // changed to infile, infile_base, outfile and output directory respectively. + string const token_from = "$$i"; + string const token_base = "$$b"; + string const token_to = "$$o"; + string const token_todir = "$$d"; EdgePath::const_iterator it = edgepath.begin(); EdgePath::const_iterator end = edgepath.end(); @@ -359,22 +349,35 @@ static void build_script(FileName const & from_file, // Build the conversion command string const infile = outfile; string const infile_base = changeExtension(infile, string()); - outfile = addExtension(to_base.absFilename(), conv.To->extension()); + outfile = conv.result_file.empty() + ? addExtension(to_base, conv.To->extension()) + : addName(subst(conv.result_dir, + token_base, infile_base), + subst(conv.result_file, + token_base, onlyFileName(infile_base))); + + // If two formats share the same extension we may get identical names + if (outfile == infile && conv.result_file.empty()) { + string const new_base = FileName::tempName(tmp).toFilesystemEncoding(); + outfile = addExtension(new_base, conv.To->extension()); + } // Store these names in the python script - script << "infile = utf8ToDefaultEncoding(" - << quoteName(infile, quote_python) << ")\n" - "infile_base = utf8ToDefaultEncoding(" - << quoteName(infile_base, quote_python) << ")\n" - "outfile = utf8ToDefaultEncoding(" - << quoteName(outfile, quote_python) << ")\n"; + script << "infile = " + << quoteName(infile, quote_python) << "\n" + "infile_base = " + << quoteName(infile_base, quote_python) << "\n" + "outfile = " + << quoteName(outfile, quote_python) << "\n" + "outdir = os.path.dirname(outfile)\n" ; // See comment about extra " quotes above (although that // applies only for the first loop run here). string command = conv.command; - command = subst(command, token_from, "' + '\"' + infile + '\"' + '"); - command = subst(command, token_base, "' + '\"' + infile_base + '\"' + '"); - command = subst(command, token_to, "' + '\"' + outfile + '\"' + '"); + command = subst(command, token_from, "' + '\"' + infile + '\"' + '"); + command = subst(command, token_base, "' + '\"' + infile_base + '\"' + '"); + command = subst(command, token_to, "' + '\"' + outfile + '\"' + '"); + command = subst(command, token_todir, "' + '\"' + outdir + '\"' + '"); command = libScriptSearch(command, quote_python); build_conversion_command(command, script);