X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=9de2dc5ed7758b2fb55e0c9bfacb8474a6f73776;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=46de668a931d5a926e9809e8bfb01edb467866da;hpb=01478feb03a4f46fad25576e262f1fa03c3b726c;p=lyx.git diff --git a/src/converter.C b/src/converter.C index 46de668a93..9de2dc5ed7 100644 --- a/src/converter.C +++ b/src/converter.C @@ -15,12 +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" @@ -32,8 +32,13 @@ #include "support/tostr.h" #include "support/systemcall.h" +#include +#include + #include +using namespace lyx::support; + #ifndef CXX_GLOBAL_CSTD using std::isdigit; #endif @@ -58,6 +63,23 @@ 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 @@ -67,6 +89,7 @@ Converter::Converter(string const & f, string const & t, string const & c, 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] @@ -389,7 +413,7 @@ 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 (!rename(from, to)) { Alert::error(_("Cannot convert file"), bformat(_("Could not move a temporary file from %1$s to %2$s."), from, to)); @@ -425,8 +449,8 @@ 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) { Alert::error(_("Cannot convert file"), bformat(_("Could not move a temporary file from %1$s to %2$s."), @@ -439,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, @@ -460,66 +484,73 @@ bool Converters::formatIsUsed(string const & format) } -bool Converters::scanLog(Buffer const * buffer, string const & command, +bool Converters::scanLog(Buffer const * buffer, string const & /*command*/, string const & filename) { if (!buffer) return false; - BufferView * bv = buffer->getUser(); - LaTeX latex("", filename, ""); + LatexRunParams runparams; + runparams.flavor = LatexRunParams::LATEX; + LaTeX latex("", runparams, filename, ""); TeXErrors terr; int result = latex.scanLogFile(terr); - if (bv && (result & LaTeX::ERRORS)) { - ErrorList el(*buffer, terr); - bv->setErrorList(el); - bv->showErrorList(_("LaTeX")); - } + if (result & LaTeX::ERRORS) + bufferErrors(*buffer, terr); return true; } +namespace { -bool Converters::runLaTeX(Buffer const * buffer, string const & command) +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, + 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 && (result & LaTeX::ERRORS)) { - //show errors - ErrorList el(*buffer, terr); - bv->setErrorList(el); - bv->showErrorList(_("LaTeX")); - } + 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)) { - string str = bformat(_("LaTeX did not run successfully. Additionally, LyX " - "could not locate the LaTeX log %1$s."), name); + 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.")); + _("An empty output file was generated.")); } - if (bv) - bv->owner()->busy(false); + + buffer->busy(false); int const ERROR_MASK = LaTeX::NO_LOGFILE | @@ -531,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() { @@ -593,7 +575,8 @@ void Converters::buildGraph() } } -vector const + +std::vector const Converters::intToFormat(std::vector const & input) { vector result(input.size()); @@ -616,9 +599,10 @@ Converters::getReachableTo(string const & target, bool 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), @@ -628,12 +612,14 @@ Converters::getReachable(string const & from, bool only_viewable, return intToFormat(reachables); } + bool Converters::isReachable(string const & from, string const & to) { return G_.isReachable(formats.getNumber(from), formats.getNumber(to)); } + Graph::EdgePath const Converters::getPath(string const & from, string const & to) { @@ -641,6 +627,7 @@ Converters::getPath(string const & from, string const & to) formats.getNumber(to)); } + /// The global instance Converters converters;