X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FModuleList.cpp;h=d442d204a559cde98c0e15dec3b70f1063a1143e;hb=68ee68103a77300c3aa01db9e63bd01b8243a0eb;hp=2de1cb014ceac32b2b8fa86a56ed71449310bff2;hpb=4675141344d58a27577cd6e815725ac3eff3d0f1;p=lyx.git diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp index 2de1cb014c..d442d204a5 100644 --- a/src/ModuleList.cpp +++ b/src/ModuleList.cpp @@ -13,17 +13,17 @@ #include "ModuleList.h" -#include "support/debug.h" #include "LaTeXFeatures.h" #include "Lexer.h" +#include "support/debug.h" #include "support/FileName.h" +#include "support/gettext.h" #include "support/filetools.h" #include "support/lstrings.h" #include -#include - + using namespace std; using namespace lyx::support; @@ -31,71 +31,116 @@ namespace lyx { //global variable: module list -ModuleList moduleList; +ModuleList theModuleList; -LyXModule::LyXModule(string n, string f, string d, - vector p) : - name(n), filename(f), description(d), packageList(p), checked(false) -{} +LyXModule::LyXModule(string const & n, string const & i, + string const & d, vector const & p, + vector const & r, vector const & e, + string const & c): + name_(n), id_(i), description_(d), package_list_(p), + required_modules_(r), excluded_modules_(e), category_(c), + checked_(false) +{ + filename_ = id_ + ".module"; +} -bool LyXModule::isAvailable() { - if (packageList.empty()) +vector LyXModule::prerequisites() const +{ + if (!checked_) + isAvailable(); + return prerequisites_; +} + + +bool LyXModule::isAvailable() const +{ + if (package_list_.empty()) return true; - if (checked) - return available; - vector::const_iterator it = packageList.begin(); - vector::const_iterator end = packageList.end(); + if (checked_) + return available_; + checked_ = true; + available_ = true; + //check whether all of the required packages are available + vector::const_iterator it = package_list_.begin(); + vector::const_iterator end = package_list_.end(); for (; it != end; ++it) { - if (!LaTeXFeatures::isAvailable(*it)) - available = false; - return available; + if (!LaTeXFeatures::isAvailable(*it)) { + available_ = false; + prerequisites_.push_back(*it); + } } - available = true; - return available; + return available_; } -// used when sorting the module list. -class ModuleSorter +bool LyXModule::isCompatible(string const & modname) const { + // do we exclude it? + if (find(excluded_modules_.begin(), excluded_modules_.end(), modname) != + excluded_modules_.end()) + return false; + + LyXModule const * const lm = theModuleList[modname]; + if (!lm) + return true; + + // does it exclude us? + vector const excmods = lm->getExcludedModules(); + if (find(excmods.begin(), excmods.end(), id_) != excmods.end()) + return false; + + return true; +} + + +bool LyXModule::areCompatible(string const & mod1, string const & mod2) +{ + LyXModule const * const lm1 = theModuleList[mod1]; + if (lm1) + return lm1->isCompatible(mod2); + LyXModule const * const lm2 = theModuleList[mod2]; + if (lm2) + return lm2->isCompatible(mod1); + // Can't check it either way. + return true; +} + + +// 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() -bool ModuleList::load() +// Much of this is borrowed from LayoutFileList::read() +bool ModuleList::read() { 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 `lyxmodules.lst'.\n" + << "No 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; } @@ -109,46 +154,71 @@ bool ModuleList::load() finished = true; break; default: - string const modName = lex.getString(); - LYXERR(Debug::TCLASS, "Module name: " << modName); + string const modname = lex.getString(); + LYXERR(Debug::TCLASS, "Module name: " << modname); if (!lex.next()) break; string const fname = lex.getString(); LYXERR(Debug::TCLASS, "Filename: " << fname); - if (!lex.next()) + if (!lex.next(true)) break; string const desc = lex.getString(); LYXERR(Debug::TCLASS, "Description: " << desc); //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 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 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 exc; + while (!str.empty()) { + string p; + str = split(str, p, '|'); + exc.push_back(p); + } + if (!lex.next()) + break; + string const catgy = lex.getString(); + LYXERR(Debug::TCLASS, "Category: " << catgy); // This code is run when we have - // modName, fname, desc, and pkgs - addLayoutModule(modName, fname, desc, pkgs); + // modName, fname, desc, pkgs, req, exc, and catgy + addLayoutModule(modname, fname, desc, pkgs, req, exc, catgy); } // end switch } //end while - + LYXERR(Debug::TCLASS, "End of parsing of lyxmodules.lst"); - if (!moduleList.empty()) - sort(moduleList.begin(), moduleList.end(), ModuleSorter()); + if (!theModuleList.empty()) + sort(theModuleList.begin(), theModuleList.end(), ModuleSorter()); return true; } -void ModuleList::addLayoutModule(string const & moduleName, +void ModuleList::addLayoutModule(string const & modname, string const & filename, string const & description, - vector const & pkgs) + vector const & pkgs, vector const & req, + vector const & exc, string const & catgy) { - LyXModule lm(moduleName, filename, description, pkgs); + LyXModule lm(modname, filename, description, pkgs, req, exc, catgy); modlist_.push_back(lm); } @@ -177,15 +247,27 @@ LyXModuleList::iterator ModuleList::end() } -LyXModule * ModuleList::operator[](string const & str) +LyXModule const * ModuleList::operator[](string const & str) const { - LyXModuleList::iterator it = modlist_.begin(); + LyXModuleList::const_iterator it = modlist_.begin(); for (; it != modlist_.end(); ++it) - if (it->name == str) { - LyXModule & mod = *it; + if (it->getID() == str) { + LyXModule const & mod = *it; return &mod; } 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; + } + return 0; +} + } // namespace lyx