Correctly set language after intitle paragraphs

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 6b693b16e624a93fa3c71651c9bb5d3ed1f2a63b..356bbe9379440a7e85ded86908ec9858df6ec1da 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -37,10 +37,10 @@ ModuleList theModuleList;
 LyXModule::LyXModule(string const & n, string const & i,
                           string const & d, vector<string> const & p,
                           vector<string> const & r, vector<string> const & e,
-                          string const & c):
+                          string const & c, bool const local):
        name_(n), id_(i), description_(d), package_list_(p),
        required_modules_(r), excluded_modules_(e), category_(c),
-       checked_(false)
+       checked_(false), available_(false), local_(local)
 {
        filename_ = id_ + ".module";
 }
@@ -48,21 +48,14 @@ LyXModule::LyXModule(string const & n, string const & i,
 
 vector<string> LyXModule::prerequisites() const
 {
-#ifdef TEX2LYX
-       return vector<string>();
-#else
        if (!checked_)
                isAvailable();
        return prerequisites_;
-#endif
 }
 
 
 bool LyXModule::isAvailable() const
 {
-#ifdef TEX2LYX
-       return true;
-#else
        if (package_list_.empty())
                return true;
        if (checked_)
@@ -79,7 +72,6 @@ bool LyXModule::isAvailable() const
                }
        }
        return available_;
-#endif
 }
 
 
@@ -207,9 +199,13 @@ bool ModuleList::read()
                                break;
                        string const catgy = lex.getString();
                        LYXERR(Debug::TCLASS, "Category: " << catgy);
+                       if (!lex.next())
+                               break;
+                       bool const local = lex.getString() == "true";
+                       LYXERR(Debug::TCLASS, "Local: " << local);
                        // This code is run when we have
-                       // modName, fname, desc, pkgs, req, exc, and catgy
-                       addLayoutModule(modname, fname, desc, pkgs, req, exc, catgy);
+                       // modName, fname, desc, pkgs, req, exc, catgy, and local
+                       addLayoutModule(modname, fname, desc, pkgs, req, exc, catgy, local);
                } // end switch
        } //end while
 
@@ -224,9 +220,9 @@ bool ModuleList::read()
 void ModuleList::addLayoutModule(string const & modname,
        string const & filename, string const & description,
        vector<string> const & pkgs, vector<string> const & req,
-       vector<string> const & exc, string const & catgy)
+       vector<string> const & exc, string const & catgy, bool const local)
 {
-       LyXModule lm(modname, filename, description, pkgs, req, exc, catgy);
+       LyXModule lm(modname, filename, description, pkgs, req, exc, catgy, local);
        modlist_.push_back(lm);
 }
 
@@ -272,10 +268,10 @@ LyXModule * ModuleList::operator[](string const & str)
        LyXModuleList::iterator it = modlist_.begin();
        for (; it != modlist_.end(); ++it)
                if (it->getID() == str) {
-               LyXModule & mod = *it;
-               return &mod;
+                       LyXModule & mod = *it;
+                       return &mod;
                }
-               return 0;
+       return 0;
 }
 
 } // namespace lyx