X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=6aa67adfc1150326856d224c08db0ac3eab20ecf;hb=1cfd4fceaccc2de186faf1118c2081346d37c65d;hp=958800c69ec873d923ddb8a339e1603339fff646;hpb=870564775ba8d0cf351dcb0f2f32c144f951e1c6;p=lyx.git

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 958800c69e..6aa67adfc1 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -9,10 +9,9 @@
  * ====================================================== */
 
 #include <config.h>
-#include <cstdlib>
 
 #ifdef __GNUG__
-#pragma implementation "bufferparams.h"
+#pragma implementation
 #endif
 
 #include "bufferparams.h"
@@ -20,35 +19,39 @@
 #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_natbib = false;
+	use_geometry = false;
+	use_amsmath = false;
+	use_natbib = false;
 	use_numerical_citations = false;
 	secnumdepth = 3;
 	tocdepth = 3;
@@ -60,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];
 	}
 }
 
@@ -168,15 +171,42 @@ 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::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(textclass);