This commit adds some new functionality to the modules stuff. In particular, it intro...

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index dc2823911dc75cc136a1c453ecf87a6a14f9b575..9e2ff3c57e20702ea2b02280480f8880b1158e42 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -314,6 +314,7 @@ BufferParams::BufferParams()
        : pimpl_(new Impl)
 {
        setBaseClass(defaultTextclass());
+       makeTextClass();
        paragraph_separation = PARSEP_INDENT;
        quotes_language = InsetQuotes::EnglishQ;
        fontsize = "default";
@@ -497,7 +498,6 @@ string const BufferParams::readToken(Lexer & lex, string const & token,
                readPreamble(lex);
        } else if (token == "\\begin_modules") {
                readModules(lex);
-               makeTextClass();
        } else if (token == "\\options") {
                lex.eatLine();
                options = lex.getString();
@@ -810,6 +810,14 @@ void BufferParams::writeFile(ostream & os) const
 
 void BufferParams::validate(LaTeXFeatures & features) const
 {
+       if (!getTextClass().requires().empty()) {
+               vector<string> req = getTextClass().requires();
+               for (vector<string>::const_iterator it = req.begin();
+                    it != req.end(); ++it) {
+                       features.require(*it);
+               }
+       }
+
        if (outputChanges) {
                bool dvipost    = LaTeXFeatures::isAvailable("dvipost");
                bool xcolorsoul = LaTeXFeatures::isAvailable("soul") &&
@@ -1363,24 +1371,16 @@ void BufferParams::setTextClass(TextClassPtr tc) {
 
 bool BufferParams::setBaseClass(textclass_type tc)
 {
-       bool retVal = true;
-       if (textclasslist[tc].load())
+       if (textclasslist[tc].load()) {
                baseClass_ = tc;
-       else {
-               docstring s = 
-                       bformat(_("The document class %1$s could not be loaded."),
-                from_utf8(textclasslist[tc].name()));
-               frontend::Alert::error(_("Could not load class"), s);
-               retVal = false;
+               return true;
        }
-       makeTextClass();
-       return retVal;
-}
-
-
-void BufferParams::setJustBaseClass(textclass_type tc)
-{ 
-       baseClass_ = tc; 
+       
+       docstring s = 
+               bformat(_("The document class %1$s could not be loaded."),
+               from_utf8(textclasslist[tc].name()));
+       frontend::Alert::error(_("Could not load class"), s);
+       return false;
 }
 
 
@@ -1393,6 +1393,7 @@ textclass_type BufferParams::getBaseClass() const
 void BufferParams::makeTextClass()
 {
        textClass_.reset(new TextClass(textclasslist[getBaseClass()]));
+       
        //FIXME It might be worth loading the children's modules here,
        //just as we load their bibliographies and such, instead of just 
        //doing a check in InsetInclude.
@@ -1420,7 +1421,7 @@ void BufferParams::makeTextClass()
                                                "may not be possible.\n"), from_utf8(modName));
                        frontend::Alert::warning(_("Package not available"), msg);
                }
-               FileName layout_file = libFileSearch("layouts", lm->filename);
+               FileName layout_file = libFileSearch("layouts", lm->getFilename());
                textClass_->read(layout_file, TextClass::MODULE);
        }
 }
@@ -1432,7 +1433,7 @@ vector<string> const & BufferParams::getModules() const {
 
 
 
-bool BufferParams::addLayoutModule(string modName, bool makeClass) {
+bool BufferParams::addLayoutModule(string const & modName) {
        LayoutModuleList::const_iterator it = layoutModules_.begin();
        LayoutModuleList::const_iterator end = layoutModules_.end();
        for (; it != end; it++) {
@@ -1442,27 +1443,12 @@ bool BufferParams::addLayoutModule(string modName, bool makeClass) {
        if (it != layoutModules_.end())
                return false;
        layoutModules_.push_back(modName);
-       if (makeClass)
-               makeTextClass();
        return true;
 }
 
 
-bool BufferParams::addLayoutModules(vector<string>modNames)
-{
-       bool retval = true;
-       vector<string>::const_iterator it = modNames.begin();
-       vector<string>::const_iterator end = modNames.end();
-       for (; it != end; ++it)
-               retval &= addLayoutModule(*it, false);
-       makeTextClass();
-       return retval;
-}
-
-
 void BufferParams::clearLayoutModules() {
        layoutModules_.clear();
-       makeTextClass();
 }