X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FLiason.C;h=1c962dec523d303d6868d2ebc30581d2758c25b4;hb=ca3ee9394ad7c6cc0a345255b1147628ce9ca991;hp=3b17230a6c20da4a20a39edab59367d9f7397e5c;hpb=d4ee9c38b6aa45146f67658352623bcbc3e0ad9b;p=lyx.git

diff --git a/src/frontends/Liason.C b/src/frontends/Liason.C
index 3b17230a6c..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-2000 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 <config.h>
 
@@ -15,23 +15,24 @@
 #endif
 
 #include "Liason.h"
-#include "LyXView.h"
-#include "BufferView.h"
-#include "buffer.h"
 #include "lyxrc.h"
 #include "PrinterParams.h"
-#include "lyx_gui_misc.h"
+
+#include "frontends/LyXView.h"
+#include "BufferView.h"
+#include "buffer.h"
+#include "exporter.h"
+#include "converter.h"
+
+#include "support/LAssert.h"
 #include "support/lstrings.h"
 #include "support/filetools.h"
 #include "support/path.h"
-#include "exporter.h"
-#include "converter.h"
-#include "minibuffer.h"
-#include "support/syscall.h"
+#include "support/systemcall.h"
 
-using std::endl;
+#include "debug.h" // for lyxerr
 
-extern LyXRC lyxrc;
+using std::endl;
 
 namespace Liason {
 
@@ -44,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
@@ -56,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 + ' ';
@@ -106,8 +102,8 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp)
 		return false;
 
 	// Push directory path.
-	string path = OnlyPath(buffer->fileName());
-	if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
+	string path = buffer->filePath();
+	if (lyxrc.use_tempdir || !IsDirWriteable(path)) {
 		path = buffer->tmppath;
 	}
 	Path p(path);
@@ -116,7 +112,7 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp)
 	// 1. we print to a file
 	// 2. we print direct to a printer
 	// 3. we print using a spool command (print to file first)
-	Systemcalls one;
+	Systemcall one;
 	int res = 0;
 	string dviname = ChangeExtension(buffer->getLatexName(true), "dvi");
 	switch (pp.target) {
@@ -134,13 +130,14 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp)
 			command2 += QuoteName(psname);
 			// First run dvips.
 			// If successful, then spool command
-			res = one.startscript(Systemcalls::System, command);
+			res = one.startscript(Systemcall::Wait, command);
 			if (res == 0)
-				res = one.startscript(Systemcalls::SystemDontWait,
+				res = one.startscript(Systemcall::DontWait,
 						      command2);
 		} else
 			// case 2
-			res = one.startscript(Systemcalls::SystemDontWait, command);
+			res = one.startscript(Systemcall::DontWait,
+					      command + QuoteName(dviname));
 		break;
 
 	case PrinterParams::FILE:
@@ -148,15 +145,20 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp)
 		command += lyxrc.print_to_file
 			+ QuoteName(MakeAbsPath(pp.file_name, path));
 		command += ' ' + QuoteName(dviname);
-		res = one.startscript(Systemcalls::SystemDontWait, command);
+		res = one.startscript(Systemcall::DontWait, command);
 		break;
 	}
+
+	lyxerr[Debug::LATEX] << "printBuffer: \"" << command << "\"\n";
+
 	return res == 0;
 }
 
-void setMinibuffer(LyXView * lv, char const * msg)
+
+void setMinibuffer(LyXView * lv, string const & msg)
 {
-	lv->getMiniBuffer()->Set(msg);
+	lyx::Assert(lv);
+	lv->message(msg);
 }
 
 } // namespace Liason