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 72d601b508ed44675a431ea0adbe3aad39b9063e..811eeede6e656984454b69177a297d2d76a30ddb 100644 (file)
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -1,11 +1,11 @@
 // -*- 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.
  *
  * ====================================================== */
 
@@ -21,18 +21,20 @@
 #include "vspace.h"
 #include "Spacing.h"
 #include "Bullet.h"
+#include "lyxtextclass.h"
+
 #include "insets/insetquotes.h"
-#include "layout.h"
-#include "support/block.h"
 
-/**
-  This class contains all the parameters for this a buffer uses. Some
-  work needs to be done on this class to make it nice. Now everything
-  is in public.
-  */
+#include <boost/array.hpp>
+
 
 struct Language;
 
+/** Buffer parameters.
+   This class contains all the parameters for this a buffer uses. Some
+   work needs to be done on this class to make it nice. Now everything
+   is in public.
+*/
 class BufferParams {
 public:
        ///
@@ -104,18 +106,21 @@ public:
                ///
                ORIENTATION_LANDSCAPE
        };
-       //@Man: Constructors and Deconstructors
-       //@{
        ///
        BufferParams();
-       //@}
 
        ///
        void writeFile(std::ostream &) const;
 
+       ///
+       void setPaperStuff();
+
        ///
        void useClassDefaults();
 
+       ///
+       bool hasClassDefaults() const;
+
        ///
        VSpace const & getDefSkip() const { return defskip; }
 
@@ -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; /* the general papersize (papersize2 or paperpackage */ // add approp. signedness
-        ///
-        char papersize2; /* the selected Geometry papersize */ // add approp. signedness
-        ///
-        char paperpackage; /* a special paperpackage .sty-file */ // 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;
        ///
@@ -177,9 +182,7 @@ public:
        ///
        int tocdepth;
        ///
-       string language;
-       ///
-       Language const * language_info;
+       Language const * language;
        ///
        string inputenc;
        ///
@@ -195,9 +198,9 @@ public:
        ///
        string pagestyle;
        ///
-       block<Bullet, 4> temp_bullets;
+       boost::array<Bullet, 4> temp_bullets;
        ///
-       block<Bullet, 4> user_defined_bullets;
+       boost::array<Bullet, 4> user_defined_bullets;
        ///
        void readPreamble(LyXLex &);
        ///
@@ -205,14 +208,19 @@ public:
        ///
        void readGraphicsDriver(LyXLex &);
        ///
-        bool use_amsmath;
+       bool use_amsmath;
+       ///
+       bool use_natbib;
+       ///
+       bool use_numerical_citations;
        /// Time ago we agreed that this was a buffer property [ale990407]
-        string parentname;
+       string parentname;
 private:
        ///
        friend class Buffer;
        /** This is the amount of space used for paragraph_separation "skip",
-         and for detached paragraphs in "indented" documents. */
+         and for detached paragraphs in "indented" documents.
+       */
        VSpace defskip;
 };