Added Liviu Andronic, and modified generate_contributions.py to match what was in...

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index daa19da09d88ba8c595d97d70f330dde1c55214e..e53af9b7e9f98d12dc315eefdcc17571cdbb5641 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -13,15 +13,15 @@
 
 #include "ModuleList.h"
 
-#include "support/debug.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
 #include <algorithm>
-#include <ostream>
        
 using namespace std;
 using namespace lyx::support;
@@ -33,45 +33,72 @@ namespace lyx {
 ModuleList moduleList;
 
 
+LyXModule::LyXModule(string const & n, string const & i, 
+                          string const & d, vector<string> const & p,
+                          vector<string> const & r, vector<string> const & e):
+       name(n), id(i), description(d), 
+       packageList(p), requiredModules(r), excludedModules(e),
+       checked(false)
+{
+       filename = id + ".module";
+}
+
+
+bool LyXModule::isAvailable() {
+       if (packageList.empty())
+               return true;
+       if (checked)
+               return available;
+       checked = true;
+       //check whether all of the required packages are available
+       vector<string>::const_iterator it  = packageList.begin();
+       vector<string>::const_iterator end = packageList.end(); 
+       for (; it != end; ++it) {
+               if (!LaTeXFeatures::isAvailable(*it)) {
+                       available = false;
+                       return available;
+               }
+       }
+       available = true;
+       return available;
+}
+
+
 // used when sorting the module list.
 class ModuleSorter
 {
 public:
        int operator()(LyXModule const & lm1, LyXModule const & lm2) const
        {
-               return lm1.name < lm2.name;
+               return lm1.getName() < lm2.getName();
        }
 };
 
 
-//Much of this is borrowed from TextClassList::read()
+//Much of this is borrowed from LayoutFileList::read()
 bool ModuleList::load()
 {
        FileName const real_file = libFileSearch("", "lyxmodules.lst");
        LYXERR(Debug::TCLASS, "Reading modules from `" << real_file << '\'');
 
        if (real_file.empty()) {
-               lyxerr << "ModuleList::load(): unable to find "
-                               "modules file  `"
-                               << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
-                               << "'.\nNo modules will be available." << endl;
+               LYXERR0("unable to find modules file  `"
+                       << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
+                       << "'.\nNo modules will be available.");
                return false;
        }
 
-       Lexer lex(0, 0);
+       Lexer lex;
        if (!lex.setFile(real_file)) {
-               lyxerr << "ModuleList::load():"
-                               "lyxlex was not able to set file: "
-                               << real_file << ".\nNo modules will be available." << endl;
+               LYXERR0("lyxlex was not able to set file: "
+                       << real_file << ".\nNo modules will be available.");
                return false;
        }
 
        if (!lex.isOK()) {
-               lyxerr << "ModuleList::load():" <<
-                               "unable to open modules file  `"
-                               << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
-                               << "'\nNo modules will be available."
-                               << endl;
+               LYXERR0("unable to open modules file  `"
+                       << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
+                       << "'\nNo modules will be available.");
                return false;
        }
 
@@ -98,17 +125,37 @@ bool ModuleList::load()
                        //FIXME Add packages
                        if (!lex.next())
                                break;
-                       string packages = lex.getString();
-                       LYXERR(Debug::TCLASS, "Packages: " << packages);
+                       string str = lex.getString();
+                       LYXERR(Debug::TCLASS, "Packages: " << str);
                        vector<string> pkgs;
-                       while (!packages.empty()) {
+                       while (!str.empty()) {
                                string p;
-                               packages = split(packages, p, ',');
+                               str = split(str, p, ',');
                                pkgs.push_back(p);
                        }
+                       if (!lex.next())
+                               break;
+                       str = lex.getString();
+                       LYXERR(Debug::TCLASS, "Required: " << str);
+                       vector<string> req;
+                       while (!str.empty()) {
+                               string p;
+                               str = split(str, p, '|');
+                               req.push_back(p);
+                       }
+                       if (!lex.next())
+                               break;
+                       str = lex.getString();
+                       LYXERR(Debug::TCLASS, "Excluded: " << str);
+                       vector<string> exc;
+                       while (!str.empty()) {
+                               string p;
+                               str = split(str, p, '|');
+                               exc.push_back(p);
+                       }
                        // This code is run when we have
-                       // modName, fname, desc, and pkgs
-                       addLayoutModule(modName, fname, desc, pkgs);
+                       // modName, fname, desc, pkgs, req, and exc
+                       addLayoutModule(modName, fname, desc, pkgs, req, exc);
                } // end switch
        } //end while
        
@@ -122,13 +169,10 @@ bool ModuleList::load()
 
 void ModuleList::addLayoutModule(string const & moduleName, 
        string const & filename, string const & description,
-       vector<string> const & pkgs)
+       vector<string> const & pkgs, vector<string> const & req,
+       vector<string> const & exc)
 {
-       LyXModule lm;
-       lm.name = moduleName;
-       lm.filename = filename;
-       lm.description = description;
-       lm.packageList = pkgs;
+       LyXModule lm(moduleName, filename, description, pkgs, req, exc);
        modlist_.push_back(lm);
 }
 
@@ -157,11 +201,22 @@ LyXModuleList::iterator ModuleList::end()
 }
 
 
+LyXModule * ModuleList::getModuleByName(string const & str)
+{
+       LyXModuleList::iterator it = modlist_.begin();
+       for (; it != modlist_.end(); ++it)
+               if (it->getName() == str) {
+                       LyXModule & mod = *it;
+                       return &mod;
+               }
+       return 0;
+}
+
 LyXModule * ModuleList::operator[](string const & str)
 {
        LyXModuleList::iterator it = modlist_.begin();
        for (; it != modlist_.end(); ++it)
-               if (it->name == str) {
+               if (it->getID() == str) {
                        LyXModule & mod = *it;
                        return &mod;
                }