X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=8d2390c1fe838d4668727fd95bd46551f96e604b;hb=3ef684e752bb5afdbfdea51d4c3df4afe1461916;hp=1d5b67c19700e6184a836709c0ff96499763cabf;hpb=0a7ebf229c60143eddd9cbe5f9b87acea1a94e0e;p=lyx.git diff --git a/src/converter.C b/src/converter.C index 1d5b67c197..8d2390c1fe 100644 --- a/src/converter.C +++ b/src/converter.C @@ -26,28 +26,32 @@ #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::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; @@ -55,6 +59,8 @@ using std::string; using std::vector; using std::distance; +namespace Alert = lyx::frontend::Alert; + namespace { @@ -281,10 +287,10 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path) 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 & to_file, ErrorList & errorList, bool try_default) { string const to_ext = formats.extension(to_format); - to_file = ChangeExtension(to_file_base, to_ext); + to_file = changeExtension(to_file_base, to_ext); if (from_format == to_format) return move(from_format, from_file, to_file, false); @@ -295,40 +301,49 @@ bool Converters::convert(Buffer const * buffer, // if no special converter defined, then we take the // default one from ImageMagic. string const from_ext = from_format.empty() ? - GetExtension(from_file) : + getExtension(from_file) : formats.extension(from_format); string const command = - "sh " + - QuoteName(LibFileSearch("scripts", "convertDefault.sh")) + + support::os::python() + ' ' + + quoteName(libFileSearch("scripts", "convertDefault.py")) + ' ' + - QuoteName(from_ext + ':' + from_file) + + quoteName(from_ext + ':' + from_file) + ' ' + - QuoteName(to_ext + ':' + to_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 (isFileReadable(to_file)) { return true; } } Alert::error(_("Cannot convert file"), - bformat(_("No information for converting %1$s " - "format files to %2$s.\n" - "Try defining 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); - string path = OnlyPath(from_file); + + // 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, ""); + string from_base = changeExtension(from_file, ""); + string to_base = changeExtension(to_file, ""); string infile; string outfile = from_file; for (Graph::EdgePath::const_iterator cit = edgepath.begin(); @@ -340,25 +355,25 @@ bool Converters::convert(Buffer const * buffer, << conv.from << " to " << conv.to << endl; infile = outfile; outfile = conv.result_dir.empty() - ? ChangeExtension(from_file, conv.To->extension()) - : AddName(subst(conv.result_dir, + ? changeExtension(from_file, conv.To->extension()) + : addName(subst(conv.result_dir, token_base, from_base), subst(conv.result_file, - token_base, OnlyFilename(from_base))); + token_base, onlyFilename(from_base))); // if input and output files are equal, we use a // temporary file as intermediary (JMarc) string real_outfile; if (outfile == infile) { real_outfile = infile; - outfile = AddName(buffer->temppath(), "tmpfile.out"); + outfile = addName(buffer->temppath(), "tmpfile.out"); } if (conv.latex) { 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 @@ -366,22 +381,22 @@ bool Converters::convert(Buffer const * buffer, 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) - ? infile : MakeRelPath(infile, path); + ? infile : makeRelPath(infile, path); string const outfile2 = (conv.original_dir) - ? outfile : MakeRelPath(outfile, path); + ? outfile : makeRelPath(outfile, path); string command = conv.command; - command = subst(command, token_from, QuoteName(infile2)); - command = subst(command, token_base, QuoteName(from_base)); - command = subst(command, token_to, QuoteName(outfile2)); - command = LibScriptSearch(command); + command = subst(command, token_from, quoteName(infile2)); + command = subst(command, token_base, quoteName(from_base)); + command = subst(command, token_to, quoteName(outfile2)); + command = libScriptSearch(command); if (!conv.parselog.empty()) - command += " 2> " + QuoteName(infile2 + ".out"); + command += " 2> " + quoteName(infile2 + ".out"); if (conv.from == "dvi" && conv.to == "ps") command = add_options(command, @@ -393,7 +408,7 @@ bool Converters::convert(Buffer const * buffer, 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; @@ -421,12 +436,12 @@ bool Converters::convert(Buffer const * buffer, if (!conv.parselog.empty()) { string const logfile = infile2 + ".log"; - string const script = LibScriptSearch(conv.parselog); + string const script = libScriptSearch(conv.parselog); string const command2 = script + - " < " + QuoteName(infile2 + ".out") + - " > " + QuoteName(logfile); + " < " + quoteName(infile2 + ".out") + + " > " + quoteName(logfile); one.startscript(Systemcall::Wait, command2); - if (!scanLog(*buffer, command, logfile)) + if (!scanLog(*buffer, command, logfile, errorList)) return false; } @@ -437,9 +452,9 @@ bool Converters::convert(Buffer const * buffer, } 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; } @@ -451,9 +466,9 @@ bool Converters::convert(Buffer const * buffer, return true; if (!conv.result_dir.empty()) { - to_file = AddName(subst(conv.result_dir, token_base, to_base), + to_file = addName(subst(conv.result_dir, token_base, to_base), subst(conv.result_file, - token_base, OnlyFilename(to_base))); + token_base, onlyFilename(to_base))); if (from_base != to_base) { string const from = subst(conv.result_dir, token_base, from_base); @@ -463,7 +478,7 @@ bool Converters::convert(Buffer const * buffer, 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)); + from_ascii(from), from_ascii(to))); return false; } } @@ -480,18 +495,18 @@ bool Converters::move(string const & fmt, return true; bool no_errors = true; - string const path = OnlyPath(from); - string const base = OnlyFilename(ChangeExtension(from, "")); - string const to_base = ChangeExtension(to, ""); - string const to_extension = GetExtension(to); + string const path = onlyPath(from); + string const base = onlyFilename(changeExtension(from, "")); + string const to_base = changeExtension(to, ""); + string const to_extension = getExtension(to); - vector files = DirList(OnlyPath(from), GetExtension(from)); + vector files = dirList(onlyPath(from), getExtension(from)); for (vector::const_iterator it = files.begin(); it != files.end(); ++it) if (prefixIs(*it, base)) { string const from2 = path + *it; string to2 = to_base + it->substr(base.length()); - to2 = ChangeExtension(to2, to_extension); + to2 = changeExtension(to2, to_extension); lyxerr[Debug::FILES] << "moving " << from2 << " to " << to2 << endl; @@ -502,9 +517,9 @@ bool Converters::move(string const & fmt, if (!moved && no_errors) { Alert::error(_("Cannot convert file"), 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)); + _("Could not copy a temporary file from %1$s to %2$s.") : + _("Could not move a temporary file from %1$s to %2$s."), + from_ascii(from2), from_ascii(to2))); no_errors = false; } } @@ -515,11 +530,11 @@ bool Converters::move(string const & fmt, 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) + ErrorList & errorList, bool try_default) { string to_file; return convert(buffer, from_file, to_file_base, from_format, to_format, - to_file, try_default); + to_file, errorList, try_default); } @@ -536,7 +551,7 @@ bool Converters::formatIsUsed(string const & format) bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, - string const & filename) + string const & filename, ErrorList & errorList) { OutputParams runparams; runparams.flavor = OutputParams::LATEX; @@ -545,7 +560,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, int const result = latex.scanLogFile(terr); if (result & LaTeX::ERRORS) - bufferErrors(buffer, terr); + bufferErrors(buffer, terr, errorList); return true; } @@ -553,10 +568,10 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, namespace { -class showMessage : public std::unary_function, public boost::signals::trackable { +class showMessage : public std::unary_function, 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); } @@ -568,7 +583,7 @@ private: bool Converters::runLaTeX(Buffer const & buffer, string const & command, - OutputParams const & runparams) + OutputParams const & runparams, ErrorList & errorList) { buffer.busy(true); buffer.message(_("Running LaTeX...")); @@ -584,14 +599,14 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, 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"), @@ -683,3 +698,6 @@ Converters converters; // The global copy after reading lyxrc.defaults Converters system_converters; + + +} // namespace lyx