X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPrinterParams.h;h=443f29aa4aec627a57425ecffa4ab578acbee148;hb=005545f28100fd30afa22313d6e3b1b67aa9a857;hp=cdaeb297047aed1b380751b27622a14a0735f43d;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git

diff --git a/src/PrinterParams.h b/src/PrinterParams.h
index cdaeb29704..443f29aa4a 100644
--- a/src/PrinterParams.h
+++ b/src/PrinterParams.h
@@ -1,29 +1,18 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- *	    LyX, The Document Processor
+/**
+ * \file PrinterParams.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *	    Copyright 1995 Matthias Ettrich
- *	    Copyright 1995-2001 The LyX Team
+ * \author Allan Rae
  *
- *	    This file Copyright 1999-2001
- *	    Allan Rae
- *======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef PRINTERPARAMS_H
 #define PRINTERPARAMS_H
 
-#ifndef LYXRC_H
-#error You must include lyxrc.h before PrinterParams.h
-#endif
-
-#ifdef ENABLE_ASSERTIONS
-#include "support/LAssert.h"
-extern bool containsOnly(string const &, char const *);
-#endif
-
+#include "lyxrc.h"
 
 /**
   This struct contains (or should contain) all the parameters required for
@@ -44,20 +33,11 @@ struct PrinterParams {
 	///
 	Target target;
 	///
-	string printer_name;
+	std::string printer_name;
 	///
-	string file_name;
-	/// We allow printing of even pages in a range and so on.
-	enum WhichPages{
-		///
-		ALL,
-		///
-		ODD,
-		///
-		EVEN
-	};
+	std::string file_name;
 	///
-	WhichPages which_pages;
+	bool all_pages;
 	/** Print a page range. Both from_page and to_page used to be strings
 	    because they're actually easier to work with that way.  I've
 	    switched to_page to be an int.  However, from_page will remain a
@@ -65,15 +45,19 @@ struct PrinterParams {
 	    a page range "1,3-5" and so on.
 	    I've modified the invariant test to match. ARRae 20000518
 	 */
-	string from_page;
+	unsigned int from_page;
 	///
-	int to_page;
+	unsigned int to_page;
 	///
-	bool reverse_order;
+	bool odd_pages;
+	///
+	bool even_pages;
 	///
-	bool unsorted_copies;
+	unsigned int count_copies;
 	///
-	int count_copies;
+	bool sorted_copies;
+	///
+	bool reverse_order;
 	// The settings below should allow us to print any read-only doc in
 	// whatever size/orientation we want it -- overriding the documents
 	// settings.
@@ -89,78 +73,21 @@ struct PrinterParams {
 	    xforms code anyway) however new ports and external scripts
 	    might drive the wrong values in.
 	 */
-	void testInvariant() const
-		{
-#ifdef ENABLE_ASSERTIONS
-			if (!from_page.empty()) {
-				// Assert(from_page == number or empty)
-				lyx::Assert(containsOnly(from_page,
-							 "1234567890"));
-			}
-			if (to_page) {
-				// Assert(to_page == empty
-				//        or number iff from_page set)
-				lyx::Assert(!from_page.empty());
-			}
-			switch (target) {
-			case PRINTER:
-//				Assert(!printer_name.empty());
-				break;
-			case FILE:
-				lyx::Assert(!file_name.empty());
-				break;
-			default:
-				lyx::Assert(false);
-				break;
-			}
-			switch (which_pages) {
-			case ALL:
-			case ODD:
-			case EVEN:
-				break;
-			default:
-				lyx::Assert(false);
-				break;
-			}
-#endif
-		}
-
+	void testInvariant() const;
 	///
-	PrinterParams(Target const & t = PRINTER,
-		      string const & pname = lyxrc.printer,
-		      string const & fname = string(),
-		      WhichPages const wp = ALL,
-		      string const & from = string(),
-		      int const & to = 0,
-		      bool const reversed = false,
-		      bool const unsorted = false,
-		      int const & num_copies = 1)
-		: target(t),
-		  printer_name(pname),
-		  file_name(fname),
-		  which_pages(wp),
-		  from_page(from),
-		  to_page(to),
-		  reverse_order(reversed),
-		  unsorted_copies(unsorted),
-		  count_copies(num_copies)
-		{
-			testInvariant();
-		}
+	PrinterParams(Target t = PRINTER,
+		      std::string const & pname = lyxrc.printer,
+		      std::string const & fname = std::string(),
+		      bool all = true,
+		      unsigned int from = 1,
+		      unsigned int to = 0,
+		      bool odd = true,
+		      bool even = true,
+		      unsigned int copies = 1,
+		      bool sorted = false,
+		      bool reverse = false);
 	///
-	PrinterParams(PrinterParams const & pp)
-		: target(pp.target),
-		  printer_name(pp.printer_name),
-		  file_name(pp.file_name),
-		  which_pages(pp.which_pages),
-		  from_page(pp.from_page),
-		  to_page(pp.to_page),
-		  reverse_order(pp.reverse_order),
-		  unsorted_copies(pp.unsorted_copies),
-		  count_copies(pp.count_copies)
-		{
-			testInvariant();
-		}
+	PrinterParams(PrinterParams const & pp);
 };
 
 #endif