X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.h;h=4f611a7c8d2f31f4e7171bde4ab764a4e3e6b6e8;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=002b9b2d18f3538257db94ec4208a20991d83aff;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/bufferparams.h b/src/bufferparams.h
index 002b9b2d18..4f611a7c8d 100644
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -23,18 +23,16 @@
 #include "Bullet.h"
 #include "insets/insetquotes.h"
 #include "layout.h"
-#include "support/block.h"
+#include <boost/array.hpp>
 
-using std::ostream;
-
-/**
-  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:
 	///
@@ -106,14 +104,11 @@ public:
 		///
 		ORIENTATION_LANDSCAPE
 	};
-	//@Man: Constructors and Deconstructors
-	//@{
 	///
 	BufferParams();
-	//@}
 
 	///
-	void writeFile(ostream &) const;
+	void writeFile(std::ostream &) const;
 
 	///
 	void useClassDefaults();
@@ -135,15 +130,15 @@ public:
 	///
   	string fontsize; 
 	///
- 	LyXTextClassList::ClassList::size_type textclass;
+ 	LyXTextClassList::size_type textclass;
 
 	/* this are for the PaperLayout */
-	///
-  	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
+	/// 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
         ///
 	PAPER_ORIENTATION orientation; // add approp. signedness
 	///
@@ -179,9 +174,7 @@ public:
 	///
 	int tocdepth;
 	///
-	string language;
-	///
-	Language const * language_info;
+	Language const * language;
 	///
 	string inputenc;
 	///
@@ -197,17 +190,15 @@ public:
 	///
 	string pagestyle;
 	///
-	block<Bullet, 4> temp_bullets;
+	array<Bullet, 4> temp_bullets;
 	///
-	block<Bullet, 4> user_defined_bullets;
+	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;
 	/// Time ago we agreed that this was a buffer property [ale990407]
@@ -216,7 +207,8 @@ 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;
 };