Move \PassOptionsToPackage before the first package loaded

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 44847a9bdb7e2ed62239817092d4e8bc211a3f6e..e266a0fdabe10d18c2d0758067644334b38e6b17 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -413,7 +413,7 @@ BufferParams::BufferParams()
        change_bars = false;
        postpone_fragile_content = true;
        use_default_options = true;
-       maintain_unincluded_children = false;
+       maintain_unincluded_children = CM_None;
        secnumdepth = 3;
        tocdepth = 3;
        language = default_language;
@@ -782,7 +782,14 @@ string BufferParams::readToken(Lexer & lex, string const & token,
        } else if (token == "\\begin_includeonly") {
                readIncludeonly(lex);
        } else if (token == "\\maintain_unincluded_children") {
-               lex >> maintain_unincluded_children;
+               string tmp;
+               lex >> tmp;
+               if (tmp == "no")
+                       maintain_unincluded_children = CM_None;
+               else if (tmp == "mostly")
+                       maintain_unincluded_children = CM_Mostly;
+               else if (tmp == "strict")
+                       maintain_unincluded_children = CM_Strict;
        } else if (token == "\\options") {
                lex.eatLine();
                options = lex.getString();
@@ -1235,8 +1242,19 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
                        os << c << '\n';
                os << "\\end_includeonly" << '\n';
        }
-       os << "\\maintain_unincluded_children "
-          << convert<string>(maintain_unincluded_children) << '\n';
+       string muc = "no";
+       switch (maintain_unincluded_children) {
+       case CM_Mostly:
+               muc = "mostly";
+               break;
+       case CM_Strict:
+               muc = "strict";
+               break;
+       case CM_None:
+       default:
+               break;
+       }
+       os << "\\maintain_unincluded_children " << muc << '\n';
 
        // local layout information
        docstring const local_layout = getLocalLayout(false);
@@ -1717,6 +1735,9 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
        os << '{' << from_ascii(tclass.latexname()) << "}\n";
        // end of \documentclass defs
 
+       // The package options (via \PassOptionsToPackage)
+       os << from_ascii(features.getPackageOptions());
+
        // if we use fontspec or newtxmath, we have to load the AMS packages here
        string const ams = features.loadAMSPackages();
        bool const ot1 = (main_font_encoding() == "default" || main_font_encoding() == "OT1");
@@ -1995,9 +2016,6 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
                        os << "\\synctex=-1\n";
        }
 
-       // The package options (via \PassOptionsToPackage)
-       os << from_ascii(features.getPackageOptions());
-
        // due to interferences with babel and hyperref, the color package has to
        // be loaded (when it is not already loaded) before babel when hyperref
        // is used with the colorlinks option, see