X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=9de2dc5ed7758b2fb55e0c9bfacb8474a6f73776;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=07938d9d9d65cac927323f852a1b886275550114;hpb=f566e7c6040e5e60d140f3da625fe5f191eebbcc;p=lyx.git diff --git a/src/converter.C b/src/converter.C index 07938d9d9d..9de2dc5ed7 100644 --- a/src/converter.C +++ b/src/converter.C @@ -15,11 +15,12 @@ #include "format.h" #include "lyxrc.h" #include "buffer.h" +#include "bufferparams.h" +#include "buffer_funcs.h" #include "bufferview_funcs.h" +#include "errorlist.h" #include "LaTeX.h" -#include "lyx_cb.h" // ShowMessage() #include "gettext.h" -#include "BufferView.h" #include "debug.h" #include "frontends/Alert.h" @@ -28,12 +29,16 @@ #include "support/filetools.h" #include "support/lyxfunctional.h" #include "support/path.h" +#include "support/tostr.h" #include "support/systemcall.h" -#include "BoostFormat.h" +#include +#include #include +using namespace lyx::support; + #ifndef CXX_GLOBAL_CSTD using std::isdigit; #endif @@ -58,15 +63,33 @@ string const add_options(string const & command, string const & options) return head + ' ' + options + ' ' + tail; } + +string const dvipdfm_options(BufferParams const & bp) +{ + string result; + + if (bp.papersize2 != VM_PAPER_CUSTOM) { + string const paper_size = bp.paperSizeName(); + if (paper_size != "b5" && paper_size != "foolscap") + result = "-p "+ paper_size; + + if (bp.orientation == ORIENTATION_LANDSCAPE) + result += " -l"; + } + + return result; +} + } // namespace anon Converter::Converter(string const & f, string const & t, string const & c, - string const & l): from(f), to(t), command(c), flags(l), - From(0), To(0), latex(false), - original_dir(false), need_aux(false) + string const & l): from(f), to(t), command(c), flags(l), + From(0), To(0), latex(false), + original_dir(false), need_aux(false) {} + void Converter::readFlags() { string flag_list(flags); @@ -103,14 +126,13 @@ bool operator<(Converter const & a, Converter const & b) int const i = compare_ascii_no_case(a.From->prettyname(), b.From->prettyname()); if (i == 0) - return compare_ascii_no_case(a.To->prettyname(), b.To->prettyname()) - < 0; + return compare_ascii_no_case(a.To->prettyname(), + b.To->prettyname()) < 0; else return i < 0; } - class compare_Converter { public: compare_Converter(string const & f, string const & t) @@ -256,6 +278,9 @@ bool Converters::convert(Buffer const * buffer, if (edgepath.empty()) { return false; } + LatexRunParams runparams; + runparams.flavor = usePdflatex(edgepath) ? + LatexRunParams::PDFLATEX : LatexRunParams::LATEX; string path = OnlyPath(from_file); Path p(path); @@ -292,7 +317,7 @@ bool Converters::convert(Buffer const * buffer, run_latex = true; string command = subst(conv.command, token_from, ""); lyxerr[Debug::FILES] << "Running " << command << endl; - if (!runLaTeX(buffer, command)) + if (!runLaTeX(buffer, command, runparams)) return false; } else { if (conv.need_aux && !run_latex @@ -300,7 +325,7 @@ bool Converters::convert(Buffer const * buffer, lyxerr[Debug::FILES] << "Running " << latex_command_ << " to update aux file"<< endl; - runLaTeX(buffer, latex_command_); + runLaTeX(buffer, latex_command_, runparams); } string infile2 = (conv.original_dir) @@ -319,15 +344,14 @@ bool Converters::convert(Buffer const * buffer, if (conv.from == "dvi" && conv.to == "ps") command = add_options(command, - dvips_options(buffer)); + buffer->params.dvips_options()); else if (conv.from == "dvi" && prefixIs(conv.to, "pdf")) command = add_options(command, - dvipdfm_options(buffer)); + dvipdfm_options(buffer->params)); lyxerr[Debug::FILES] << "Calling " << command << endl; if (buffer) - ShowMessage(buffer, _("Executing command:"), command); - + buffer->message(_("Executing command: ") + command); Systemcall::Starttype type = (dummy) ? Systemcall::DontWait : Systemcall::Wait; Systemcall one; @@ -339,7 +363,7 @@ bool Converters::convert(Buffer const * buffer, res = one.startscript(type, command); if (!real_outfile.empty()) { - if (!lyx::rename(outfile, real_outfile)) + if (!rename(outfile, real_outfile)) res = -1; else lyxerr[Debug::FILES] @@ -360,13 +384,16 @@ bool Converters::convert(Buffer const * buffer, } if (res) { - if (conv.to == "program") - Alert::alert(_("There were errors during the Build process."), - _("You should try to fix them.")); - else - Alert::alert(_("Cannot convert file"), - _("Error while executing"), - command.substr(0, 50)); + if (conv.to == "program") { + Alert::error(_("Build errors"), + _("There were errors during the build process.")); + } 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))); + } return false; } } @@ -386,14 +413,10 @@ bool Converters::convert(Buffer const * buffer, token_base, from_base); string to = subst(conv.result_dir, token_base, to_base); - if (!lyx::rename(from, to)) { -#if USE_BOOST_FORMAT - Alert::alert(_("Error while trying to move directory:"), - from, boost::io::str(boost::format(_("to %1$s")) % to)); -#else - Alert::alert(_("Error while trying to move directory:"), - from, _("to ") + to); -#endif + if (!rename(from, to)) { + Alert::error(_("Cannot convert file"), + bformat(_("Could not move a temporary file from %1$s to %2$s."), + from, to)); return false; } } @@ -426,16 +449,12 @@ bool Converters::move(string const & from, string const & to, bool copy) lyxerr[Debug::FILES] << "moving " << from2 << " to " << to2 << endl; bool const moved = (copy) - ? lyx::copy(from2, to2) - : lyx::rename(from2, to2); + ? lyx::support::copy(from2, to2) + : rename(from2, to2); if (!moved && no_errors) { -#if USE_BOOST_FORMAT - Alert::alert(_("Error while trying to move file:"), - from2, boost::io::str(boost::format(_("to %1$s")) % to2)); -#else - Alert::alert(_("Error while trying to move file:"), - from2, _("to ") + to2); -#endif + Alert::error(_("Cannot convert file"), + bformat(_("Could not move a temporary file from %1$s to %2$s."), + from2, to2)); no_errors = false; } } @@ -444,8 +463,8 @@ bool Converters::move(string const & from, string const & to, bool copy) bool Converters::convert(Buffer const * buffer, - string const & from_file, string const & to_file_base, - string const & from_format, string const & to_format) + string const & from_file, string const & to_file_base, + string const & from_format, string const & to_format) { string to_file; return convert(buffer, from_file, to_file_base, from_format, to_format, @@ -465,120 +484,73 @@ bool Converters::formatIsUsed(string const & format) } -bool Converters::scanLog(Buffer const * buffer, string const & command, - string const & filename) +bool Converters::scanLog(Buffer const * buffer, string const & /*command*/, + string const & filename) { if (!buffer) return false; - BufferView * bv = buffer->getUser(); - if (bv) { - bv->owner()->busy(true); - // all error insets should have been removed by now - } - - LaTeX latex("", filename, ""); + LatexRunParams runparams; + runparams.flavor = LatexRunParams::LATEX; + LaTeX latex("", runparams, filename, ""); TeXErrors terr; int result = latex.scanLogFile(terr); - if (bv) { - if ((result & LaTeX::ERRORS)) { - // Insert all errors as errors boxes - bv->insertErrors(terr); -#warning repaint() or update() or nothing ? - bv->repaint(); - bv->fitCursor(); - } - bv->owner()->busy(false); - } - if ((result & LaTeX::ERRORS)) { - int num_errors = latex.getNumErrors(); - string s; - string t; - if (num_errors == 1) { - s = _("One error detected"); - t = _("You should try to fix it."); - } else { - s = tostr(num_errors); - s += _(" errors detected."); - t = _("You should try to fix them."); - } - string head; - split(command, head, ' '); -#if USE_BOOST_FORMAT - Alert::alert(boost::io::str(boost::format(_("There were errors during running of %1$s")) % head), - s, t); -#else - Alert::alert(_("There were errors during running of ") + head, - s, t); -#endif - return false; - } else if (result & LaTeX::NO_OUTPUT) { - string const s = _("The operation resulted in"); - string const t = _("an empty file."); - Alert::alert(_("Resulting file is empty"), s, t); - return false; - } + if (result & LaTeX::ERRORS) + bufferErrors(*buffer, terr); + return true; } +namespace { + +class showMessage : public boost::signals::trackable { +public: + showMessage(Buffer const * b) : buffer_(b) {}; + void operator()(string m) + { + buffer_->message(m); + } +private: + Buffer const * buffer_; +}; -bool Converters::runLaTeX(Buffer const * buffer, string const & command) +} + +bool Converters::runLaTeX(Buffer const * buffer, string const & command, + LatexRunParams const & runparams) { + // when is this needed? if (!buffer) return false; - BufferView * bv = buffer->getUser(); - - if (bv) { - bv->owner()->busy(true); - bv->owner()->message(_("Running LaTeX...")); - // all the autoinsets have already been removed - } + buffer->busy(true); + buffer->message(_("Running LaTeX...")); // do the LaTeX run(s) string name = buffer->getLatexName(); - LaTeX latex(command, name, buffer->filePath()); + LaTeX latex(command, runparams, name, buffer->filePath()); TeXErrors terr; - int result = latex.run(terr, - bv ? &bv->owner()->getLyXFunc() : 0); - - if (bv) { - if ((result & LaTeX::ERRORS)) { - // Insert all errors as errors boxes - bv->insertErrors(terr); -#warning repaint() or update() or nothing ? - bv->repaint(); - bv->fitCursor(); - } - } + showMessage show(buffer); + latex.message.connect(show); + int result = latex.run(terr); + + if (result & LaTeX::ERRORS) + bufferErrors(*buffer, terr); // check return value from latex.run(). if ((result & LaTeX::NO_LOGFILE)) { - Alert::alert(_("LaTeX did not work!"), - _("Missing log file:"), name); - } else if ((result & LaTeX::ERRORS)) { - int num_errors = latex.getNumErrors(); - string s; - string t; - if (num_errors == 1) { - s = _("One error detected"); - t = _("You should try to fix it."); - } else { - s = tostr(num_errors); - s += _(" errors detected."); - t = _("You should try to fix them."); - } - Alert::alert(_("There were errors during the LaTeX run."), - s, t); - } else if (result & LaTeX::NO_OUTPUT) { - string const s = _("The operation resulted in"); - string const t = _("an empty file."); - Alert::alert(_("Resulting file is empty"), s, t); + string str = bformat(_("LaTeX did not run successfully. " + "Additionally, LyX could not locate " + "the LaTeX log %1$s."), name); + Alert::error(_("LaTeX failed"), str); + } else if (result & LaTeX::NO_OUTPUT) { + Alert::warning(_("Output is empty"), + _("An empty output file was generated.")); } - if (bv) - bv->owner()->busy(false); + + buffer->busy(false); int const ERROR_MASK = LaTeX::NO_LOGFILE | @@ -590,55 +562,6 @@ bool Converters::runLaTeX(Buffer const * buffer, string const & command) } -string const Converters::dvips_options(Buffer const * buffer) -{ - string result; - if (!buffer) - return result; - - if (buffer->params.use_geometry - && buffer->params.papersize2 == BufferParams::VM_PAPER_CUSTOM - && !lyxrc.print_paper_dimension_flag.empty() - && !buffer->params.paperwidth.empty() - && !buffer->params.paperheight.empty()) { - // using a custom papersize - result = lyxrc.print_paper_dimension_flag; - result += ' ' + buffer->params.paperwidth; - result += ',' + buffer->params.paperheight; - } else { - string const paper_option = papersize(buffer); - if (paper_option != "letter" || - buffer->params.orientation != BufferParams::ORIENTATION_LANDSCAPE) { - // dvips won't accept -t letter -t landscape. In all other - // cases, include the paper size explicitly. - result = lyxrc.print_paper_flag; - result += ' ' + paper_option; - } - } - if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE && - buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM) - result += ' ' + lyxrc.print_landscape_flag; - return result; -} - - -string const Converters::dvipdfm_options(Buffer const * buffer) -{ - string result; - if (!buffer) - return result; - - if (buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM) { - string const paper_size = papersize(buffer); - if (paper_size != "b5" && paper_size != "foolscap") - result = "-p "+ paper_size; - - if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE) - result += " -l"; - } - - return result; -} void Converters::buildGraph() { @@ -652,7 +575,8 @@ void Converters::buildGraph() } } -vector const + +std::vector const Converters::intToFormat(std::vector const & input) { vector result(input.size()); @@ -669,37 +593,41 @@ Converters::intToFormat(std::vector const & input) vector const Converters::getReachableTo(string const & target, bool clear_visited) { - vector const & reachablesto = + vector const & reachablesto = G_.getReachableTo(formats.getNumber(target), clear_visited); return intToFormat(reachablesto); } + vector const Converters::getReachable(string const & from, bool only_viewable, - bool clear_visited) + bool clear_visited) { - vector const & reachables = - G_.getReachable(formats.getNumber(from), - only_viewable, + vector const & reachables = + G_.getReachable(formats.getNumber(from), + only_viewable, clear_visited); return intToFormat(reachables); } + bool Converters::isReachable(string const & from, string const & to) { return G_.isReachable(formats.getNumber(from), formats.getNumber(to)); } -Graph::EdgePath const + +Graph::EdgePath const Converters::getPath(string const & from, string const & to) { return G_.getPath(formats.getNumber(from), formats.getNumber(to)); } + /// The global instance Converters converters;