fix compilation; remove cruft in configure script (I may have removed too much, but...

[lyx.git] / src / bufferparams.h

diff --git a/src/bufferparams.h b/src/bufferparams.h
index 1d0adc1fd6b6580f6412c58ad6e07f0b6adfcec0..811eeede6e656984454b69177a297d2d76a30ddb 100644 (file)
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -21,8 +21,10 @@
 #include "vspace.h"
 #include "Spacing.h"
 #include "Bullet.h"
+#include "lyxtextclass.h"
+
 #include "insets/insetquotes.h"
-#include "layout.h"
+
 #include <boost/array.hpp>
 
 
@@ -110,6 +112,9 @@ public:
        ///
        void writeFile(std::ostream &) const;
 
+       ///
+       void setPaperStuff();
+
        ///
        void useClassDefaults();
 
@@ -125,47 +130,47 @@ public:
        /** Wether paragraphs are separated by using a indent like in
          articles or by using a little skip like in letters.
          */
-       PARSEP paragraph_separation;
+       PARSEP paragraph_separation;
        ///
-       InsetQuotes::quote_language quotes_language;
+       InsetQuotes::quote_language quotes_language;
        ///
-       InsetQuotes::quote_times quotes_times;
+       InsetQuotes::quote_times quotes_times;
        ///
-       string fontsize; 
+       string fontsize;
        ///
-       LyXTextClassList::size_type textclass;
+       lyx::textclass_type textclass;
 
        /* this are for the PaperLayout */
        /// the general papersize (papersize2 or paperpackage
-       char papersize; // add apprip. signedness 
-        ///  the selected Geometry papersize
-        char papersize2; // add approp. signedness
-        /// a special paperpackage .sty-file
-        char paperpackage; // add approp. signedness
-        ///
+       char papersize; // add apprip. signedness
+       ///  the selected Geometry papersize
+       char papersize2; // add approp. signedness
+       /// a special paperpackage .sty-file
+       char paperpackage; // add approp. signedness
+       ///
        PAPER_ORIENTATION orientation; // add approp. signedness
        ///
-        bool use_geometry;
-        ///
-        string paperwidth;
-        ///
-        string paperheight;
-        ///
-        string leftmargin;
-        ///
-        string topmargin;
-        ///
-        string rightmargin;
-        ///
-        string bottommargin;
-        ///
-        string headheight;
-        ///
-        string headsep;
-        ///
-        string footskip;
-        
-        /* some LaTeX options */
+       bool use_geometry;
+       ///
+       string paperwidth;
+       ///
+       string paperheight;
+       ///
+       string leftmargin;
+       ///
+       string topmargin;
+       ///
+       string rightmargin;
+       ///
+       string bottommargin;
+       ///
+       string headheight;
+       ///
+       string headsep;
+       ///
+       string footskip;
+
+       /* some LaTeX options */
        /// The graphics driver
        string graphicsDriver;
        ///
@@ -203,13 +208,13 @@ public:
        ///
        void readGraphicsDriver(LyXLex &);
        ///
-        bool use_amsmath;
+       bool use_amsmath;
        ///
-        bool use_natbib;
+       bool use_natbib;
        ///
-        bool use_numerical_citations;
+       bool use_numerical_citations;
        /// Time ago we agreed that this was a buffer property [ale990407]
-        string parentname;
+       string parentname;
 private:
        ///
        friend class Buffer;