X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=f5a6c8ffdecd65ee22df7efa8ec0ef21b97a7979;hb=f268743f8c014ef2dadd260fd1a3873cb1d2038b;hp=0f28bba8cf04fdf0b7659f9396dd8124bcf4ebd0;hpb=e3fc8227837296d5cbc800b549ffe53c4617a12c;p=lyx.git diff --git a/src/converter.C b/src/converter.C index 0f28bba8cf..f5a6c8ffde 100644 --- a/src/converter.C +++ b/src/converter.C @@ -5,7 +5,7 @@ * * \author Dekel Tsur * - * Full author contact details are available in file CREDITS + * Full author contact details are available in file CREDITS. */ #include @@ -15,6 +15,7 @@ #include "format.h" #include "lyxrc.h" #include "buffer.h" +#include "bufferparams.h" #include "buffer_funcs.h" #include "bufferview_funcs.h" #include "errorlist.h" @@ -62,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 @@ -108,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(), + 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) @@ -300,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, runparams)) + if (!runLaTeX(*buffer, command, runparams)) return false; } else { if (conv.need_aux && !run_latex @@ -308,7 +325,7 @@ 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); } string infile2 = (conv.original_dir) @@ -327,19 +344,19 @@ 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) - buffer->message(_("Executing command: ") + command); + buffer->message(_("Executing command: ") + command); + Systemcall::Starttype type = (dummy) ? Systemcall::DontWait : Systemcall::Wait; Systemcall one; int res; - if (conv.original_dir && buffer) { + if (conv.original_dir) { Path p(buffer->filePath()); res = one.startscript(type, command); } else @@ -362,7 +379,7 @@ bool Converters::convert(Buffer const * buffer, " < " + QuoteName(infile2 + ".out") + " > " + QuoteName(logfile); one.startscript(Systemcall::Wait, command2); - if (!scanLog(buffer, command, logfile)) + if (!scanLog(*buffer, command, logfile)) return false; } @@ -467,12 +484,9 @@ 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; - LatexRunParams runparams; runparams.flavor = LatexRunParams::LATEX; LaTeX latex("", runparams, filename, ""); @@ -480,7 +494,7 @@ bool Converters::scanLog(Buffer const * buffer, string const & /*command*/, int result = latex.scanLogFile(terr); if (result & LaTeX::ERRORS) - bufferErrors(*buffer, terr); + bufferErrors(buffer, terr); return true; } @@ -489,37 +503,34 @@ namespace { class showMessage : public boost::signals::trackable { public: - showMessage(Buffer const * b) : buffer_(b) {}; - void operator()(string m) + showMessage(Buffer const & b) : buffer_(b) {}; + void operator()(string const & m) { - buffer_->message(m); + buffer_.message(m); } private: - Buffer const * buffer_; + 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; - - buffer->busy(true); - buffer->message(_("Running LaTeX...")); + buffer.busy(true); + buffer.message(_("Running LaTeX...")); // do the LaTeX run(s) - string name = buffer->getLatexName(); - LaTeX latex(command, runparams, name, buffer->filePath()); + string name = buffer.getLatexName(); + LaTeX latex(command, runparams, name, buffer.filePath()); TeXErrors terr; showMessage show(buffer); latex.message.connect(show); int result = latex.run(terr); if (result & LaTeX::ERRORS) - bufferErrors(*buffer, terr); + bufferErrors(buffer, terr); // check return value from latex.run(). if ((result & LaTeX::NO_LOGFILE)) { @@ -532,8 +543,8 @@ bool Converters::runLaTeX(Buffer const * buffer, string const & command, _("An empty output file was generated.")); } - - buffer->busy(false); + + buffer.busy(false); int const ERROR_MASK = LaTeX::NO_LOGFILE | @@ -545,56 +556,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() { @@ -635,7 +596,7 @@ Converters::getReachableTo(string const & target, bool clear_visited) vector const Converters::getReachable(string const & from, bool only_viewable, - bool clear_visited) + bool clear_visited) { vector const & reachables = G_.getReachable(formats.getNumber(from),