X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=00ff5c3e68053463ee9e412ca16c721d272811c1;hb=a040c0bc6f017d0591bbc7ad1aa590589dbc40ff;hp=bfe6dcc8a560eceb83e1f2be120a99e65c9666af;hpb=a2e5d14f4853f0bfab228a265fe91bf545550edb;p=lyx.git

diff --git a/src/bufferparams.C b/src/bufferparams.C
index bfe6dcc8a5..00ff5c3e68 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -1,12 +1,12 @@
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor
  * 	 
  *	     Copyright 1995 Matthias Ettrich
  *           Copyright 1995-1999 The LyX Team.
  *
- * ======================================================*/
+ * ====================================================== */
 
 #include <config.h>
 #include <cstdlib>
@@ -19,13 +19,13 @@
 #include "tex-strings.h"
 #include "layout.h"
 #include "vspace.h"
-#include "error.h"
+#include "debug.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 
 BufferParams::BufferParams()
 {
-	paragraph_separation = LYX_PARSEP_INDENT;
+	paragraph_separation = PARSEP_INDENT;
 	defskip = VSpace(VSpace::MEDSKIP); 
 	quotes_language = InsetQuotes::EnglishQ;
 	quotes_times = InsetQuotes::DoubleQ;
@@ -44,75 +44,25 @@ BufferParams::BufferParams()
 	fonts = "default";
 	inputenc = "latin1";
 	graphicsDriver = "default";
-	sides = 1;
+	sides = LyXTextClass::OneSide;
 	columns = 1;
 	pagestyle = "default";
 	for(int iter = 0; iter < 4; iter++) {
 		user_defined_bullets[iter] = temp_bullets[iter] 
 			                   = ITEMIZE_DEFAULTS[iter];
 	}
-	allowAccents=false;
+	allowAccents = false;
 }
 
 
-void BufferParams::Copy(BufferParams const &p)
-{
-	paragraph_separation = p.paragraph_separation;
-	defskip = p.defskip;
-	quotes_language = p.quotes_language;
-	quotes_times = p.quotes_times;
-	fontsize = p.fontsize;
-	textclass = p.textclass;
-	papersize = p.papersize;
-        papersize2 = p.papersize2;
-        paperpackage = p.paperpackage;
-	orientation = p.orientation;
-        use_geometry = p.use_geometry;
-        paperwidth = p.paperwidth;
-        paperheight = p.paperheight;
-        leftmargin = p.leftmargin;
-        topmargin = p.topmargin;
-        rightmargin = p.rightmargin;
-        bottommargin = p.bottommargin;
-        headheight = p.headheight;
-        headsep = p.headsep;
-        footskip = p.footskip;
-	graphicsDriver = p.graphicsDriver;
-	fonts = p.fonts;
-	spacing = p.spacing;
-	secnumdepth = p.secnumdepth;
-	tocdepth = p.tocdepth;
-	language = p.language;
-	inputenc = p.inputenc;
-	preamble = p.preamble;
-	options = p.options;
-	float_placement = p.float_placement;
-	columns = p.columns;
-	sides = p.sides;
-	pagestyle = p.pagestyle;
-
-	// WARNING destructor will deallocate paragraph!!
-	// this is not good and will cause an error somewhere else.
-	//paragraph = p.paragraph; 
-
-	for (int i = 0; i < 4; ++i) {
-		temp_bullets[i] = p.temp_bullets[i];
-		user_defined_bullets[i] = p.user_defined_bullets[i];
-	}
-
-	allowAccents=p.allowAccents;
-        use_amsmath = p.use_amsmath;
-}
-
-
-void BufferParams::writeFile(FILE *file)
+void BufferParams::writeFile(FILE * file)
 {
 	// The top of the file is written by the buffer.
 	// Prints out the buffer info into the .lyx file given by file
 
  	// the textclass
  	fprintf(file, "\\textclass %s\n",
- 		lyxstyle.NameOfClass(textclass).c_str());
+ 		textclasslist.NameOfClass(textclass).c_str());
 	
 	// then the the preamble
 	if (!preamble.empty()) {
@@ -155,8 +105,8 @@ void BufferParams::writeFile(FILE *file)
 	fprintf(file, "\\papersize %s\n", string_papersize[papersize2]);
 	fprintf(file, "\\paperpackage %s\n",
                 string_paperpackages[paperpackage]);
-	fprintf(file, "\\use_geometry %d\n",use_geometry);
-	fprintf(file, "\\use_amsmath %d\n",use_amsmath);
+	fprintf(file, "\\use_geometry %d\n", use_geometry);
+	fprintf(file, "\\use_amsmath %d\n", use_amsmath);
 	fprintf(file, "\\paperorientation %s\n",
 		string_orientation[orientation]);
         if (!paperwidth.empty())
@@ -222,28 +172,28 @@ void BufferParams::writeFile(FILE *file)
 
 
 void BufferParams::useClassDefaults() {
-	LyXTextClass *tclass = lyxstyle.TextClass(textclass);
-
-	sides = tclass->sides;
-	columns = tclass->columns;
-	pagestyle = tclass->pagestyle;
-	options = tclass->options;
-	secnumdepth = tclass->secnumdepth;
-	tocdepth = tclass->tocdepth;
+	LyXTextClass const & tclass = textclasslist.TextClass(textclass);
+
+	sides = tclass.sides();
+	columns = tclass.columns();
+	pagestyle = tclass.pagestyle();
+	options = tclass.options();
+	secnumdepth = tclass.secnumdepth();
+	tocdepth = tclass.tocdepth();
 }
 
 
-void BufferParams::readPreamble(LyXLex &lex)
+void BufferParams::readPreamble(LyXLex & lex)
 {
 	if (lex.GetString() != "\\begin_preamble")
-		lyxerr.print("Error (BufferParams::readPreamble):"
-			      "consistency check failed.");
+		lyxerr << "Error (BufferParams::readPreamble):"
+			"consistency check failed." << endl;
 
 	preamble = lex.getLongString("\\end_preamble");
 }
 
 
-void BufferParams::readLanguage(LyXLex &lex)
+void BufferParams::readLanguage(LyXLex & lex)
 {
 	string tmptok;
 	string test;
@@ -261,9 +211,10 @@ void BufferParams::readLanguage(LyXLex &lex)
 			break;
 		}
 		else if (test.empty()) {
-			lyxerr.print("Warning: language `"
-				      + tmptok + "' not recognized!");
-			lyxerr.print("         Setting language to `default'.");
+			lyxerr << "Warning: language `"
+			       << tmptok << "' not recognized!\n"
+			       << "         Setting language to `default'."
+			       << endl;
 			language = "default";
 			break;	 
 		}      
@@ -271,11 +222,11 @@ void BufferParams::readLanguage(LyXLex &lex)
 }
 
 
-void BufferParams::readGraphicsDriver(LyXLex &lex)
+void BufferParams::readGraphicsDriver(LyXLex & lex)
 {
 	string tmptok;
 	string test;
-	int n=0;
+	int n = 0;
 	
 	
 	if (!lex.next()) return;