fix lookup problem for \vert.

[lyx.git] / src / PrinterParams.h

diff --git a/src/PrinterParams.h b/src/PrinterParams.h
index 61e96f6807fa7d1bf99a6012b99dd50982714ed9..71253ce75e542596a527b7e17106db604a7e86ab 100644 (file)
--- a/src/PrinterParams.h
+++ b/src/PrinterParams.h
@@ -1,13 +1,13 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *         LyX, The Document Processor
- *      
+ *
  *         Copyright 1995 Matthias Ettrich
- *         Copyright 1995-2000 The LyX Team
+ *         Copyright 1995-2001 The LyX Team
  *
- *         This file Copyright 1999-2000
+ *         This file Copyright 1999-2001
  *         Allan Rae
  *======================================================
  */
@@ -15,9 +15,7 @@
 #ifndef PRINTERPARAMS_H
 #define PRINTERPARAMS_H
 
-#ifndef LYXRC_H
-#error You must include lyxrc.h before PrinterParams.h
-#endif
+#include "lyxrc.h"
 
 #ifdef ENABLE_ASSERTIONS
 #include "support/LAssert.h"
@@ -73,11 +71,11 @@ struct PrinterParams {
        ///
        bool unsorted_copies;
        ///
-       int count_copies;
+       int count_copies;
        // The settings below should allow us to print any read-only doc in
        // whatever size/orientation we want it -- overriding the documents
        // settings.
-        // Override the documents orientation
+       // Override the documents orientation
        // bool orientation;
        // Print n pages per physical sheet
        // unsigned int nup;
@@ -94,22 +92,23 @@ struct PrinterParams {
 #ifdef ENABLE_ASSERTIONS
                        if (!from_page.empty()) {
                                // Assert(from_page == number or empty)
-                               Assert(containsOnly(from_page, "1234567890"));
+                               lyx::Assert(containsOnly(from_page,
+                                                        "1234567890"));
                        }
                        if (to_page) {
                                // Assert(to_page == empty
                                //        or number iff from_page set)
-                               Assert(!from_page.empty());
+                               lyx::Assert(!from_page.empty());
                        }
                        switch (target) {
                        case PRINTER:
-//                             Assert(!printer_name.empty());
+//                             Assert(!printer_name.empty());
                                break;
                        case FILE:
-                               Assert(!file_name.empty());
+                               lyx::Assert(!file_name.empty());
                                break;
                        default:
-                               Assert(false);
+                               lyx::Assert(false);
                                break;
                        }
                        switch (which_pages) {
@@ -118,7 +117,7 @@ struct PrinterParams {
                        case EVEN:
                                break;
                        default:
-                               Assert(false);
+                               lyx::Assert(false);
                                break;
                        }
 #endif