* Call metrics of the parameters with the correct font in MathMacros, for example

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index aa0c0112596f815a9c0a824841f68c3bdb351287..65fd6ab3a4048d6fb8810e6df4502860a37d1d4f 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1468,36 +1468,17 @@ void BufferParams::setDocumentClass(DocumentClass const * const tc) {
 }
 
 
-bool BufferParams::setBaseClass(string const & classname)
+void BufferParams::addDefaultModules()
 {
-       LYXERR(Debug::TCLASS, "setBaseClass: " << classname);
-       LayoutFileList & bcl = LayoutFileList::get();
-       if (!bcl.haveClass(classname)) {
-               docstring s = 
-                       bformat(_("The document class %1$s could not be found. "
-                               "A default textclass with default layouts will be used. "
-                               "LyX might not be able to produce output unless a correct "
-                               "textclass is selected from the document settings dialog."),
-                       from_utf8(classname));
-               frontend::Alert::error(_("Document class not found"), s);
-               bcl.addEmptyClass(classname);
-       }
-
-       bool const success = bcl[classname].load();
-       if (!success) {
-               docstring s = 
-                       bformat(_("The document class %1$s could not be loaded."),
-                       from_utf8(classname));
-               frontend::Alert::error(_("Could not load class"), s);
-               return false;
-       }
-
-       pimpl_->baseClass_ = classname;
-
-       // add any required modules not already in use
+       // add any default modules not already in use
        list<string> const & mods = baseClass()->defaultModules();
        list<string>::const_iterator mit = mods.begin();
        list<string>::const_iterator men = mods.end();
+
+       // we want to add these to the front, but in the right order,
+       // so we collect them here first.
+       list<string> modulesToAdd;
+
        for (; mit != men; mit++) {
                string const & modName = *mit;
                // see if we're already in use
@@ -1514,12 +1495,25 @@ bool BufferParams::setBaseClass(string const & classname)
                                        "' not added because removed by user.");
                        continue;
                }
+
                // Now we want to check the list of selected modules to see if any of them
-               // exclude this one.
+               // excludes this one, or if we exclude one of them.
+               LyXModule * thismod = moduleList[modName];
+               if (!thismod) {
+                       LYXERR0("Adding default module " << modName << 
+                                       " even though it is unavailable.");
+                       modulesToAdd.push_back(modName);
+                       continue;
+               }
+
                bool foundit = false;
+               vector<string> const ourExcMods = thismod->getExcludedModules();
+               vector<string>::const_iterator const eit = ourExcMods.begin();
+               vector<string>::const_iterator const een = ourExcMods.end();
+
                // so iterate over the selected modules...
                LayoutModuleList::const_iterator lit = layoutModules_.begin();
-               LayoutModuleList::const_iterator len = layoutModules_.end();
+               LayoutModuleList::const_iterator const len = layoutModules_.end();
                for (; lit != len; lit++) {
                        LyXModule * lm = moduleList[*lit];
                        if (!lm)
@@ -1533,12 +1527,54 @@ bool BufferParams::setBaseClass(string const & classname)
                                                *lit << "'.");
                                break;
                        }
+                       if (find(eit, een, *lit) != een) {
+                               foundit = true;
+                               LYXERR(Debug::TCLASS, "Default module `" << modName << 
+                                               "' not added because it excludes loaded module `" << 
+                                               *lit << "'.");
+                               break;
+                       }
                }
+
                if (!foundit) {
                        LYXERR(Debug::TCLASS, "Default module `" << modName << "' added.");
-                       layoutModules_.push_back(modName);
+                       modulesToAdd.push_back(modName);
                }
        }
+
+       // OK, now we can add the default modules.
+       layoutModules_.insert(
+                       layoutModules_.begin(), modulesToAdd.begin(), modulesToAdd.end());
+}
+
+
+bool BufferParams::setBaseClass(string const & classname)
+{
+       LYXERR(Debug::TCLASS, "setBaseClass: " << classname);
+       LayoutFileList & bcl = LayoutFileList::get();
+       if (!bcl.haveClass(classname)) {
+               docstring s = 
+                       bformat(_("The document class %1$s could not be found. "
+                               "A default textclass with default layouts will be used. "
+                               "LyX might not be able to produce output unless a correct "
+                               "textclass is selected from the document settings dialog."),
+                       from_utf8(classname));
+               frontend::Alert::error(_("Document class not found"), s);
+               bcl.addEmptyClass(classname);
+       }
+
+       bool const success = bcl[classname].load();
+       if (!success) {
+               docstring s = 
+                       bformat(_("The document class %1$s could not be loaded."),
+                       from_utf8(classname));
+               frontend::Alert::error(_("Could not load class"), s);
+               return false;
+       }
+
+       pimpl_->baseClass_ = classname;
+       addDefaultModules();
+
        return true;
 }