X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.h;h=811eeede6e656984454b69177a297d2d76a30ddb;hb=98c966c64594611e469313314abd1e59524adb4a;hp=f385800b6fc90fe7866760ed7cbed55da85096e5;hpb=75c5c8c9e51469822100d70a1ead0d7f8d3f69de;p=lyx.git

diff --git a/src/bufferparams.h b/src/bufferparams.h
index f385800b6f..811eeede6e 100644
--- 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-1999 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -21,16 +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"
 
+#include <boost/array.hpp>
 
-/**
-  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.
-  */
+
+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:
 	///
@@ -102,68 +106,71 @@ public:
 		///
 		ORIENTATION_LANDSCAPE
 	};
-	//@Man: Constructors and Deconstructors
-	//@{
 	///
 	BufferParams();
-	//@}
 
 	///
-	void writeFile(ostream &);
+	void writeFile(std::ostream &) const;
+
+	///
+	void setPaperStuff();
 
 	///
 	void useClassDefaults();
 
 	///
-	VSpace getDefSkip() const { return defskip; }
+	bool hasClassDefaults() const;
+
+	///
+	VSpace const & getDefSkip() const { return defskip; }
 
 	///
-	void setDefSkip(VSpace vs) { defskip = vs; }
-	
+	void setDefSkip(VSpace const & vs) { defskip = vs; }
+
 	/** 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::ClassList::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;
 	///
@@ -175,7 +182,7 @@ public:
 	///
 	int tocdepth;
 	///
-	string language;
+	Language const * language;
 	///
 	string inputenc;
 	///
@@ -191,27 +198,29 @@ 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 &);
 	///
 	void readLanguage(LyXLex &);
 	///
 	void readGraphicsDriver(LyXLex &);
-	/// do we allow accents on all chars in this buffer
-	bool allowAccents;
 	///
-        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;
-protected:
+	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;
 };