Correctly set language after intitle paragraphs

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 49895e6d4df32af6b452d3236fa7834268f99fff..356bbe9379440a7e85ded86908ec9858df6ec1da 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -23,7 +23,7 @@
 #include "support/lstrings.h"
 
 #include <algorithm>
-       
+
 using namespace std;
 using namespace lyx::support;
 
@@ -34,33 +34,28 @@ namespace lyx {
 ModuleList theModuleList;
 
 
-LyXModule::LyXModule(string const & n, string const & i, 
+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):
-       name_(n), id_(i), description_(d), package_list_(p), 
+                          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";
 }
 
 
-vector<string> LyXModule::prerequisites() const {
-#ifdef TEX2LYX
-       return vector<string>();
-#else
+vector<string> LyXModule::prerequisites() const
+{
        if (!checked_)
                isAvailable();
        return prerequisites_;
-#endif
 }
 
 
-bool LyXModule::isAvailable() const {
-#ifdef TEX2LYX
-       return true;
-#else
+bool LyXModule::isAvailable() const
+{
        if (package_list_.empty())
                return true;
        if (checked_)
@@ -69,7 +64,7 @@ bool LyXModule::isAvailable() const {
        available_ = true;
        //check whether all of the required packages are available
        vector<string>::const_iterator it  = package_list_.begin();
-       vector<string>::const_iterator end = package_list_.end(); 
+       vector<string>::const_iterator end = package_list_.end();
        for (; it != end; ++it) {
                if (!LaTeXFeatures::isAvailable(*it)) {
                        available_ = false;
@@ -77,7 +72,6 @@ bool LyXModule::isAvailable() const {
                }
        }
        return available_;
-#endif
 }
 
 
@@ -115,8 +109,7 @@ bool LyXModule::areCompatible(string const & mod1, string const & mod2)
 
 
 // used when sorting the module list.
-class ModuleSorter
-{
+class ModuleSorter {
 public:
        int operator()(LyXModule const & lm1, LyXModule const & lm2) const
        {
@@ -206,12 +199,16 @@ 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
-       
+
        LYXERR(Debug::TCLASS, "End of parsing of lyxmodules.lst");
 
        if (!theModuleList.empty())
@@ -220,12 +217,12 @@ bool ModuleList::read()
 }
 
 
-void ModuleList::addLayoutModule(string const & modname, 
+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);
 }
 
@@ -265,15 +262,16 @@ LyXModule const * ModuleList::operator[](string const & str) const
        return 0;
 }
 
+
 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