Fix bug #12772

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 4ed97de91431d8e23a91a366252edd04717b8012..d8fd34cc729437bab7c7ef45eb0f6b5affbe27c0 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -18,11 +18,12 @@
 
 #include "support/debug.h"
 #include "support/FileName.h"
+#include "support/gettext.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
 #include <algorithm>
-       
+
 using namespace std;
 using namespace lyx::support;
 
@@ -33,39 +34,44 @@ 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";
 }
 
 
-bool LyXModule::isAvailable() const {
-#ifdef TEX2LYX
-       return true;
-#else
+vector<string> LyXModule::prerequisites() const
+{
+       if (!checked_)
+               isAvailable();
+       return prerequisites_;
+}
+
+
+bool LyXModule::isAvailable() const
+{
        if (package_list_.empty())
                return true;
        if (checked_)
                return available_;
        checked_ = true;
+       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;
-                       return available_;
+                       prerequisites_.push_back(*it);
                }
        }
-       available_ = true;
        return available_;
-#endif
 }
 
 
@@ -101,18 +107,18 @@ bool LyXModule::areCompatible(string const & mod1, string const & mod2)
        return true;
 }
 
+
 // used when sorting the module list.
-class ModuleSorter
-{
+class ModuleSorter {
 public:
        int operator()(LyXModule const & lm1, LyXModule const & lm2) const
        {
-               return lm1.getName() < lm2.getName();
+               return _(lm1.getName()) < _(lm2.getName());
        }
 };
 
 
-//Much of this is borrowed from LayoutFileList::read()
+// Much of this is borrowed from LayoutFileList::read()
 bool ModuleList::read()
 {
        FileName const real_file = libFileSearch("", "lyxmodules.lst");
@@ -193,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())
@@ -207,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);
 }
 
@@ -249,18 +259,19 @@ LyXModule const * ModuleList::operator[](string const & str) const
                        LyXModule const & mod = *it;
                        return &mod;
                }
-       return 0;
+       return nullptr;
 }
 
+
 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 nullptr;
 }
 
 } // namespace lyx