cleanup and reorder initialisation code of GuiView and GuiToolbars. Move some things...

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 0d78a53f2cf83246c146bde90be785367853d2e6..a713f84c52a74bfec1853b65c883c76c8500f224 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -195,13 +195,13 @@ PaperOrientationTranslator const & paperorientationtranslator()
 
 
 // Page sides
-typedef Translator<int, TextClass::PageSides> SidesTranslator;
+typedef Translator<int, PageSides> SidesTranslator;
 
 
 SidesTranslator const init_sidestranslator()
 {
-       SidesTranslator translator(1, TextClass::OneSide);
-       translator.addPair(2, TextClass::TwoSides);
+       SidesTranslator translator(1, OneSide);
+       translator.addPair(2, TwoSides);
        return translator;
 }
 
@@ -352,7 +352,7 @@ BufferParams::BufferParams()
        fontsTypewriterScale = 100;
        inputenc = "auto";
        graphicsDriver = "default";
-       sides = TextClass::OneSide;
+       sides = OneSide;
        columns = 1;
        listings_params = string();
        pagestyle = "default";
@@ -863,10 +863,10 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        // if needed
        if (sides != tclass.sides()) {
                switch (sides) {
-               case TextClass::OneSide:
+               case OneSide:
                        clsoptions << "oneside,";
                        break;
-               case TextClass::TwoSides:
+               case TwoSides:
                        clsoptions << "twoside,";
                        break;
                }
@@ -1620,7 +1620,7 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
                        os << "]{inputenc}\n";
                        texrow.newline();
                }
-               if (package == Encoding::CJK) {
+               if (package == Encoding::CJK || features.mustProvide("CJK")) {
                        os << "\\usepackage{CJK}\n";
                        texrow.newline();
                }