form para crash fix from John

[lyx.git] / src / bufferparams.h

diff --git a/src/bufferparams.h b/src/bufferparams.h
index 70d147c242e17a7cf60171597eef49d09a3e7ff9..aeed3a1572df767b4e0c6a568f280455be63a493 100644 (file)
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -23,7 +23,7 @@
 #include "Bullet.h"
 #include "insets/insetquotes.h"
 #include "layout.h"
-#include "support/block.h"
+#include <boost/array.hpp>
 
 
 struct Language;
@@ -110,9 +110,15 @@ public:
        ///
        void writeFile(std::ostream &) const;
 
+       ///
+       void setPaperStuff();
+
        ///
        void useClassDefaults();
 
+       ///
+       bool hasClassDefaults() const;
+
        ///
        VSpace const & getDefSkip() const { return defskip; }
 
@@ -174,9 +180,7 @@ public:
        ///
        int tocdepth;
        ///
-       string language;
-       ///
-       Language const * language_info;
+       Language const * language;
        ///
        string inputenc;
        ///
@@ -192,9 +196,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 &);
        ///
@@ -203,6 +207,10 @@ public:
        void readGraphicsDriver(LyXLex &);
        ///
         bool use_amsmath;
+       ///
+        bool use_natbib;
+       ///
+        bool use_numerical_citations;
        /// Time ago we agreed that this was a buffer property [ale990407]
         string parentname;
 private: