#include "converter.h"
+#include "ConverterCache.h"
#include "buffer.h"
#include "buffer_funcs.h"
#include "bufferparams.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
+#include "support/os.h"
#include "support/path.h"
#include "support/systemcall.h"
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::changeExtension;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::contains;
-using lyx::support::dirList;
-using lyx::support::getExtension;
-using lyx::support::isFileReadable;
-using lyx::support::libFileSearch;
-using lyx::support::libScriptSearch;
-using lyx::support::makeRelPath;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::Path;
-using lyx::support::prefixIs;
-using lyx::support::quoteName;
-using lyx::support::split;
-using lyx::support::subst;
-using lyx::support::Systemcall;
+
+namespace lyx {
+
+using support::absolutePath;
+using support::addName;
+using support::bformat;
+using support::changeExtension;
+using support::compare_ascii_no_case;
+using support::contains;
+using support::dirList;
+using support::getExtension;
+using support::isFileReadable;
+using support::libFileSearch;
+using support::libScriptSearch;
+using support::makeRelPath;
+using support::onlyFilename;
+using support::onlyPath;
+using support::Path;
+using support::prefixIs;
+using support::quoteName;
+using support::split;
+using support::subst;
+using support::Systemcall;
using std::endl;
using std::find_if;
using std::vector;
using std::distance;
+namespace Alert = lyx::frontend::Alert;
+
namespace {
bool Converters::convert(Buffer const * buffer,
- string const & from_file, string const & to_file_base,
- string const & from_format, string const & to_format,
- string & to_file, bool try_default)
+ string const & from_file, string const & to_file,
+ string const & orig_from,
+ string const & from_format, string const & to_format,
+ ErrorList & errorList, int conversionflags)
{
- string const to_ext = formats.extension(to_format);
- to_file = changeExtension(to_file_base, to_ext);
+ BOOST_ASSERT(absolutePath(from_file));
+ BOOST_ASSERT(absolutePath(to_file));
+ BOOST_ASSERT(absolutePath(orig_from));
if (from_format == to_format)
return move(from_format, from_file, to_file, false);
+ if ((conversionflags & try_cache) &&
+ ConverterCache::get().inCache(orig_from, to_format))
+ return ConverterCache::get().copy(orig_from, to_format, to_file);
+
Graph::EdgePath edgepath = getPath(from_format, to_format);
if (edgepath.empty()) {
- if (try_default) {
+ if (conversionflags & try_default) {
// if no special converter defined, then we take the
// default one from ImageMagic.
string const from_ext = from_format.empty() ?
getExtension(from_file) :
formats.extension(from_format);
+ string const to_ext = formats.extension(to_format);
string const command =
- "python " +
+ support::os::python() + ' ' +
quoteName(libFileSearch("scripts", "convertDefault.py")) +
' ' +
quoteName(from_ext + ':' + from_file) +
quoteName(to_ext + ':' + to_file);
lyxerr[Debug::FILES]
<< "No converter defined! "
- "I use convertDefault.sh:\n\t"
+ "I use convertDefault.py:\n\t"
<< command << endl;
Systemcall one;
one.startscript(Systemcall::Wait, command);
if (isFileReadable(to_file)) {
+ if (conversionflags & try_cache)
+ ConverterCache::get().add(orig_from,
+ to_format, to_file);
return true;
}
}
Alert::error(_("Cannot convert file"),
- bformat(_("No information for converting %1$s "
- "format files to %2$s.\n"
- "Define a convertor in the preferences."),
- from_format, to_format));
+ bformat(_("No information for converting %1$s "
+ "format files to %2$s.\n"
+ "Define a converter in the preferences."),
+ from_ascii(from_format), from_ascii(to_format)));
return false;
}
OutputParams runparams;
runparams.flavor = getFlavor(edgepath);
+
+ // Some converters (e.g. lilypond) can only output files to the
+ // current directory, so we need to change the current directory.
+ // 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.
string path = onlyPath(from_file);
Path p(path);
+ // empty the error list before any new conversion takes place.
+ errorList.clear();
+
bool run_latex = false;
string from_base = changeExtension(from_file, "");
string to_base = changeExtension(to_file, "");
run_latex = true;
string const command = subst(conv.command, token_from, "");
lyxerr[Debug::FILES] << "Running " << command << endl;
- if (!runLaTeX(*buffer, command, runparams))
+ if (!runLaTeX(*buffer, command, runparams, errorList))
return false;
} else {
if (conv.need_aux && !run_latex
lyxerr[Debug::FILES]
<< "Running " << latex_command_
<< " to update aux file"<< endl;
- runLaTeX(*buffer, latex_command_, runparams);
+ runLaTeX(*buffer, latex_command_, runparams, errorList);
}
string const infile2 = (conv.original_dir)
lyxerr[Debug::FILES] << "Calling " << command << endl;
if (buffer)
buffer->message(_("Executing command: ")
- + command);
+ + from_utf8(command));
Systemcall::Starttype const type = (dummy)
? Systemcall::DontWait : Systemcall::Wait;
" < " + quoteName(infile2 + ".out") +
" > " + quoteName(logfile);
one.startscript(Systemcall::Wait, command2);
- if (!scanLog(*buffer, command, logfile))
+ if (!scanLog(*buffer, command, logfile, errorList))
return false;
}
} else {
// FIXME: this should go out of here. For example, here we cannot say if
// it is a document (.lyx) or something else. Same goes for elsewhere.
- Alert::error(_("Cannot convert file"),
- bformat(_("An error occurred whilst running %1$s"),
- command.substr(0, 50)));
+ Alert::error(_("Cannot convert file"),
+ bformat(_("An error occurred whilst running %1$s"),
+ from_ascii(command.substr(0, 50))));
}
return false;
}
return true;
if (!conv.result_dir.empty()) {
- to_file = addName(subst(conv.result_dir, token_base, to_base),
- subst(conv.result_file,
- token_base, onlyFilename(to_base)));
+ // The converter has put the file(s) in a directory.
+ // In this case we ignore the given to_file.
if (from_base != to_base) {
string const from = subst(conv.result_dir,
token_base, from_base);
Mover const & mover = movers(conv.from);
if (!mover.rename(from, to)) {
Alert::error(_("Cannot convert file"),
- bformat(_("Could not move a temporary file from %1$s to %2$s."),
- from, to));
+ bformat(_("Could not move a temporary directory from %1$s to %2$s."),
+ from_ascii(from), from_ascii(to)));
return false;
}
}
return true;
- } else
+ } else {
+ if (conversionflags & try_cache)
+ ConverterCache::get().add(orig_from, to_format, outfile);
return move(conv.to, outfile, to_file, conv.latex);
+ }
}
bformat(copy ?
_("Could not copy a temporary file from %1$s to %2$s.") :
_("Could not move a temporary file from %1$s to %2$s."),
- from2, to2));
+ from_ascii(from2), from_ascii(to2)));
no_errors = false;
}
}
}
-bool Converters::convert(Buffer const * buffer,
- string const & from_file, string const & to_file_base,
- string const & from_format, string const & to_format,
- bool try_default)
-{
- string to_file;
- return convert(buffer, from_file, to_file_base, from_format, to_format,
- to_file, try_default);
-}
-
-
bool Converters::formatIsUsed(string const & format)
{
ConverterList::const_iterator cit = converterlist_.begin();
bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
- string const & filename)
+ string const & filename, ErrorList & errorList)
{
OutputParams runparams;
runparams.flavor = OutputParams::LATEX;
int const result = latex.scanLogFile(terr);
if (result & LaTeX::ERRORS)
- bufferErrors(buffer, terr);
+ bufferErrors(buffer, terr, errorList);
return true;
}
namespace {
-class showMessage : public std::unary_function<string, void>, public boost::signals::trackable {
+class showMessage : public std::unary_function<docstring, void>, public boost::signals::trackable {
public:
showMessage(Buffer const & b) : buffer_(b) {};
- void operator()(string const & m) const
+ void operator()(docstring const & m) const
{
buffer_.message(m);
}
bool Converters::runLaTeX(Buffer const & buffer, string const & command,
- OutputParams const & runparams)
+ OutputParams const & runparams, ErrorList & errorList)
{
buffer.busy(true);
buffer.message(_("Running LaTeX..."));
int const result = latex.run(terr);
if (result & LaTeX::ERRORS)
- bufferErrors(buffer, terr);
+ bufferErrors(buffer, terr, errorList);
// check return value from latex.run().
if ((result & LaTeX::NO_LOGFILE)) {
- string const str =
+ docstring const str =
bformat(_("LaTeX did not run successfully. "
- "Additionally, LyX could not locate "
- "the LaTeX log %1$s."), name);
+ "Additionally, LyX could not locate "
+ "the LaTeX log %1$s."), from_utf8(name));
Alert::error(_("LaTeX failed"), str);
} else if (result & LaTeX::NO_OUTPUT) {
Alert::warning(_("Output is empty"),
// The global copy after reading lyxrc.defaults
Converters system_converters;
+
+
+} // namespace lyx
projects / lyx.git / blobdiff