bug 7

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 9143c03fc3a20a9545f6ad96ef7c8659f4e6f08c..6aa67adfc1150326856d224c08db0ac3eab20ecf 100644 (file)
--- 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,9 +171,9 @@ 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";
                        }
                }
        }