#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"
ModuleList moduleList;
-LyXModule::LyXModule(string n, string f, string d,
- vector<string> p) :
- name(n), filename(f), description(d), packageList(p), checked(false)
-{}
+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() {
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))
+ if (!LaTeXFeatures::isAvailable(*it)) {
available = false;
return available;
+ }
}
available = true;
return available;
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");
return false;
}
- Lexer lex(0, 0);
+ Lexer lex;
if (!lex.setFile(real_file)) {
lyxerr << "ModuleList::load():"
"lyxlex was not able to set file: "
//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
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(moduleName, filename, description, pkgs);
+ LyXModule lm(moduleName, filename, description, pkgs, req, exc);
modlist_.push_back(lm);
}
}
+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;
}