fix View Source for literate documents

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index af14a55aa4c2f2f4cb617ccaf09acf091b1186d4..aa0c0112596f815a9c0a824841f68c3bdb351287 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -335,6 +335,7 @@ BufferParams::BufferParams()
        use_bibtopic = false;
        trackChanges = false;
        outputChanges = false;
+       use_default_options = true;
        secnumdepth = 3;
        tocdepth = 3;
        language = default_language;
@@ -495,6 +496,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
        } else if (token == "\\options") {
                lex.eatLine();
                options = lex.getString();
+       } else if (token == "\\use_default_options") {
+               lex >> use_default_options;
        } else if (token == "\\master") {
                lex.eatLine();
                master = lex.getString();
@@ -692,6 +695,10 @@ void BufferParams::writeFile(ostream & os) const
                os << "\\options " << options << '\n';
        }
 
+       // use the class options defined in the layout?
+       os << "\\use_default_options " 
+          << convert<string>(use_default_options) << "\n";
+
        // the master document
        if (!master.empty()) {
                os << "\\master " << master << '\n';
@@ -1025,27 +1032,32 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                                language_options << ',';
                        language_options << language->babel();
                }
-               // FIXME: don't hardcode this! 
                // if Vietnamese is used, babel must directly be loaded
                // with language options, not in the class options, see
                // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html
-               //
+               size_t viet = language_options.str().find("vietnam");
+               // viet = string::npos when not found
                // the same is for all other languages that are not directly supported by
                // babel, but where LaTeX-packages add babel support.
                // this is currently the case for Latvian, Lithuanian, and Mongolian
-               //
+               size_t latvian = language_options.str().find("latvian");
+               size_t lithu = language_options.str().find("lithuanian");
+               size_t mongo = language_options.str().find("mongolian");
                // if Japanese is used, babel must directly be loaded
                // with language options, not in the class options, see
                // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
+               size_t japan = language_options.str().find("japanese");
                if (lyxrc.language_global_options && !language_options.str().empty()
-                && !features.hasLanguage("vietnam")
-                && !features.hasLanguage("latvian")
-                && !features.hasLanguage("lithuanian")
-                && !features.hasLanguage("mongolian")
-                && !features.hasLanguage("japanese"))
+                       && viet == string::npos && japan == string::npos
+                       && latvian == string::npos && lithu == string::npos
+                       && mongo == string::npos)
                        clsoptions << language_options.str() << ',';
        }
 
+       // the predefined options from the layout
+       if (use_default_options && !tclass.options().empty())
+               clsoptions << tclass.options() << ',';
+
        // the user-defined options
        if (!options.empty()) {
                clsoptions << options << ',';
@@ -1417,7 +1429,7 @@ void BufferParams::useClassDefaults()
        sides = tclass.sides();
        columns = tclass.columns();
        pagestyle = tclass.pagestyle();
-       options = tclass.options();
+       use_default_options = true;
        // Only if class has a ToC hierarchy
        if (tclass.hasTocLevels()) {
                secnumdepth = tclass.secnumdepth();
@@ -1433,7 +1445,7 @@ bool BufferParams::hasClassDefaults() const
        return sides == tclass.sides()
                && columns == tclass.columns()
                && pagestyle == tclass.pagestyle()
-               && options == tclass.options()
+               && use_default_options
                && secnumdepth == tclass.secnumdepth()
                && tocdepth == tclass.tocdepth();
 }
@@ -1472,7 +1484,7 @@ bool BufferParams::setBaseClass(string const & classname)
        }
 
        bool const success = bcl[classname].load();
-       if (!success) { 
+       if (!success) {
                docstring s = 
                        bformat(_("The document class %1$s could not be loaded."),
                        from_utf8(classname));
@@ -1489,14 +1501,14 @@ bool BufferParams::setBaseClass(string const & classname)
        for (; mit != men; mit++) {
                string const & modName = *mit;
                // see if we're already in use
-               if (find(layoutModules_.begin(), layoutModules_.end(), modName) != 
+               if (find(layoutModules_.begin(), layoutModules_.end(), modName) !=
                    layoutModules_.end()) {
                        LYXERR(Debug::TCLASS, "Default module `" << modName << 
                                        "' not added because already used.");
                        continue;
                }
                // make sure the user hasn't removed it
-               if (find(removedModules_.begin(), removedModules_.end(), modName) != 
+               if (find(removedModules_.begin(), removedModules_.end(), modName) !=
                    removedModules_.end()) {
                        LYXERR(Debug::TCLASS, "Default module `" << modName << 
                                        "' not added because removed by user.");