X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FLiason.C;h=1c962dec523d303d6868d2ebc30581d2758c25b4;hb=ca3ee9394ad7c6cc0a345255b1147628ce9ca991;hp=7b44131dab2930f96071ba7abbcb8629440520ce;hpb=d0a3af12d9ae8b208f7a70099db29632ad8a7dba;p=lyx.git diff --git a/src/frontends/Liason.C b/src/frontends/Liason.C index 7b44131dab..1c962dec52 100644 --- a/src/frontends/Liason.C +++ b/src/frontends/Liason.C @@ -1,12 +1,12 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. +/** + * \file Liason.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * ====================================================== */ + * \author Allan Rae + * + * Full author contact details are available in file CREDITS + */ #include @@ -18,12 +18,11 @@ #include "lyxrc.h" #include "PrinterParams.h" -#include "LyXView.h" +#include "frontends/LyXView.h" #include "BufferView.h" #include "buffer.h" #include "exporter.h" #include "converter.h" -#include "lyx_gui_misc.h" #include "support/LAssert.h" #include "support/lstrings.h" @@ -31,9 +30,9 @@ #include "support/path.h" #include "support/systemcall.h" -using std::endl; +#include "debug.h" // for lyxerr -extern LyXRC lyxrc; +using std::endl; namespace Liason { @@ -46,10 +45,10 @@ PrinterParams getPrinterParams(Buffer * buffer) } -bool printBuffer(Buffer * buffer, PrinterParams const & pp) +bool printBuffer(Buffer * buffer, PrinterParams const & pp) { string command(lyxrc.print_command + ' '); - + if (pp.target == PrinterParams::PRINTER && lyxrc.print_adapt_output // dvips wants a printer name && !pp.printer_name.empty()) {// printer name given @@ -58,45 +57,40 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp) + ' '; } - switch (pp.which_pages) { - case PrinterParams::EVEN: - command += lyxrc.print_evenpage_flag + ' '; - break; - - case PrinterParams::ODD: - command += lyxrc.print_oddpage_flag + ' '; - break; - - default: - // only option left is print all of them - break; - } - - if (!pp.from_page.empty()) { + if (!pp.all_pages && pp.from_page) { command += lyxrc.print_pagerange_flag + ' '; - command += pp.from_page; + command += tostr(pp.from_page); if (pp.to_page) { - // we have a range "from-to" + // we have a range "from-to" command += '-'; command += tostr(pp.to_page); } command += ' '; } - if (pp.reverse_order) { - command += lyxrc.print_reverse_flag + ' '; + // If both are, or both are not selected, then skip the odd/even printing + if (pp.odd_pages != pp.even_pages) { + if (pp.odd_pages) { + command += lyxrc.print_oddpage_flag + ' '; + } else if (pp.even_pages) { + command += lyxrc.print_evenpage_flag + ' '; + } } - if (1 < pp.count_copies) { - if (pp.unsorted_copies) { - command += lyxrc.print_copies_flag; - } else { + if (pp.count_copies > 1) { + if (pp.sorted_copies) { command += lyxrc.print_collcopies_flag; + } else { + command += lyxrc.print_copies_flag; } command += ' '; command += tostr(pp.count_copies); command += ' '; } + + if (pp.reverse_order) { + command += lyxrc.print_reverse_flag + ' '; + } if (!lyxrc.print_extra_options.empty()) { command += lyxrc.print_extra_options + ' '; @@ -154,6 +148,9 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp) res = one.startscript(Systemcall::DontWait, command); break; } + + lyxerr[Debug::LATEX] << "printBuffer: \"" << command << "\"\n"; + return res == 0; }