X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=179d26604b29ace0e2819023742dd6d73a333c36;hb=dbd7a961fc46bb10c85bdd8c7fb6626477ae63d8;hp=0206ec3f9c8057a1ea16c3e3d56d52346750e663;hpb=2748a88bbd292061b2df34fd636bdaf88330af24;p=lyx.git

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 0206ec3f9c..179d26604b 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -4,15 +4,14 @@
  *           LyX, The Document Processor
  * 	 
  *	     Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
-#include <cstdlib>
 
 #ifdef __GNUG__
-#pragma implementation "bufferparams.h"
+#pragma implementation
 #endif
 
 #include "bufferparams.h"
@@ -20,34 +19,40 @@
 #include "layout.h"
 #include "vspace.h"
 #include "debug.h"
-#include "support/lyxlib.h"
-#include "support/lstrings.h"
 #include "lyxrc.h"
 #include "language.h"
+#include "lyxtextclasslist.h"
+
+#include "support/lyxlib.h"
+#include "support/lstrings.h"
+
+#include <cstdlib>
 
 using std::ostream;
 using std::endl;
 
 BufferParams::BufferParams()
+	// Initialize textclass to point to article. if `first' is
+	// true in the returned pair, then `second' is the textclass
+	// number; if it is false, second is 0. In both cases, second
+	// is what we want.
+	: textclass(textclasslist.NumberOfClass("article").second)
 {
 	paragraph_separation = PARSEP_INDENT;
 	defskip = VSpace(VSpace::MEDSKIP); 
 	quotes_language = InsetQuotes::EnglishQ;
 	quotes_times = InsetQuotes::DoubleQ;
 	fontsize = "default";
-	// Initialize textclass to point to article. if `first' is
-	// true in the returned pair, then `second' is the textclass
-	// number; if it is false, second is 0. In both cases, second
-	// is what we want.
-	textclass = textclasslist.NumberOfClass("article").second;
 
-        /*  PaperLayout */
+	/*  PaperLayout */
 	papersize = PAPER_DEFAULT;
-        papersize2 = VM_PAPER_DEFAULT; /* DEFAULT */
-        paperpackage = PACKAGE_NONE;
+	papersize2 = VM_PAPER_DEFAULT; /* DEFAULT */
+	paperpackage = PACKAGE_NONE;
 	orientation = ORIENTATION_PORTRAIT;
-        use_geometry = false;
-        use_amsmath = false;
+	use_geometry = false;
+	use_amsmath = false;
+	use_natbib = false;
+	use_numerical_citations = false;
 	secnumdepth = 3;
 	tocdepth = 3;
 	language = default_language;
@@ -58,8 +63,8 @@ BufferParams::BufferParams()
 	columns = 1;
 	pagestyle = "default";
 	for (int iter = 0; iter < 4; ++iter) {
-		user_defined_bullets[iter] = temp_bullets[iter] 
-			                   = ITEMIZE_DEFAULTS[iter];
+		user_defined_bullets[iter] = ITEMIZE_DEFAULTS[iter];
+		temp_bullets[iter] = ITEMIZE_DEFAULTS[iter];
 	}
 }
 
@@ -70,7 +75,7 @@ void BufferParams::writeFile(ostream & os) const
 	// Prints out the buffer info into the .lyx file given by file
 
  	// the textclass
- 	os << "\\textclass " << textclasslist.NameOfClass(textclass) << '\n';
+ 	os << "\\textclass " << textclasslist[textclass].name() << '\n';
 	
 	// then the the preamble
 	if (!preamble.empty()) {
@@ -87,8 +92,9 @@ void BufferParams::writeFile(ostream & os) const
 	}
    
 	/* then the text parameters */
-	os << "\\language " << language->lang()
-	   << "\n\\inputencoding " << inputenc
+	if (language != ignore_language)
+		os << "\\language " << language->lang() << '\n';
+	os << "\\inputencoding " << inputenc
 	   << "\n\\fontscheme " << fonts
 	   << "\n\\graphics " << graphicsDriver << '\n';
 
@@ -103,6 +109,8 @@ void BufferParams::writeFile(ostream & os) const
 	   << "\n\\paperpackage " << string_paperpackages[paperpackage]
 	   << "\n\\use_geometry " << use_geometry
 	   << "\n\\use_amsmath " << use_amsmath
+	   << "\n\\use_natbib " << use_natbib
+	   << "\n\\use_numerical_citations " << use_numerical_citations
 	   << "\n\\paperorientation " << string_orientation[orientation]
 	   << '\n';
         if (!paperwidth.empty())
@@ -163,17 +171,45 @@ void BufferParams::writeFile(ostream & os) const
 			}
 			else {
 				os << "\\bulletLaTeX " << i
-				   << "\n\t"
+				   << "\n\t\""
 				   << user_defined_bullets[i].getText()
-				   << "\n\\end_bullet\n";
+				   << "\"\n\\end_bullet\n";
 			}
 		}
 	}
 }
 
 
-void BufferParams::useClassDefaults() {
-	LyXTextClass const & tclass = textclasslist.TextClass(textclass);
+void BufferParams::setPaperStuff()
+{
+	papersize = PAPER_DEFAULT;
+	char const c1 = paperpackage;
+	if (c1 == PACKAGE_NONE) {
+		char const c2 = papersize2;
+		if (c2 == VM_PAPER_USLETTER)
+			papersize = PAPER_USLETTER;
+		else if (c2 == VM_PAPER_USLEGAL)
+			papersize = PAPER_LEGALPAPER;
+		else if (c2 == VM_PAPER_USEXECUTIVE)
+			papersize = PAPER_EXECUTIVEPAPER;
+		else if (c2 == VM_PAPER_A3)
+			papersize = PAPER_A3PAPER;
+		else if (c2 == VM_PAPER_A4)
+			papersize = PAPER_A4PAPER;
+		else if (c2 == VM_PAPER_A5)
+			papersize = PAPER_A5PAPER;
+		else if ((c2 == VM_PAPER_B3) || (c2 == VM_PAPER_B4) ||
+			 (c2 == VM_PAPER_B5))
+			papersize = PAPER_B5PAPER;
+	} else if ((c1 == PACKAGE_A4) || (c1 == PACKAGE_A4WIDE) ||
+		   (c1 == PACKAGE_WIDEMARGINSA4))
+		papersize = PAPER_A4PAPER;
+}
+
+
+void BufferParams::useClassDefaults()
+{
+	LyXTextClass const & tclass = textclasslist[textclass];
 
 	sides = tclass.sides();
 	columns = tclass.columns();
@@ -184,9 +220,22 @@ void BufferParams::useClassDefaults() {
 }
 
 
+bool BufferParams::hasClassDefaults() const
+{
+	LyXTextClass const & tclass = textclasslist[textclass];
+	
+	return (sides == tclass.sides()
+		&& columns == tclass.columns()
+		&& pagestyle == tclass.pagestyle()
+		&& options == tclass.options()
+		&& secnumdepth == tclass.secnumdepth()
+		&& tocdepth == tclass.tocdepth());
+}
+
+
 void BufferParams::readPreamble(LyXLex & lex)
 {
-	if (lex.GetString() != "\\begin_preamble")
+	if (lex.getString() != "\\begin_preamble")
 		lyxerr << "Error (BufferParams::readPreamble):"
 			"consistency check failed." << endl;
 
@@ -198,7 +247,7 @@ void BufferParams::readLanguage(LyXLex & lex)
 {
 	if (!lex.next()) return;
 	
-	string const tmptok = lex.GetString();
+	string const tmptok = lex.getString();
 
 	// check if tmptok is part of tex_babel in tex-defs.h
 	language = languages.getLanguage(tmptok);
@@ -216,7 +265,7 @@ void BufferParams::readGraphicsDriver(LyXLex & lex)
 {
 	if (!lex.next()) return;
 	
-	string const tmptok = lex.GetString();
+	string const tmptok = lex.getString();
 	// check if tmptok is part of tex_graphics in tex_defs.h
 	int n = 0;
 	while (true) {