X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FModuleList.cpp;h=356bbe9379440a7e85ded86908ec9858df6ec1da;hb=2e433654c7f3db02bfd0e4dd09eb04cd8ab44bb9;hp=89b2aa9309f61bf499d12f058d1fbe437ccbcd09;hpb=4f795bd3099c9d0133e1bc0d9d2956cc09462f8e;p=lyx.git diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp index 89b2aa9309..356bbe9379 100644 --- a/src/ModuleList.cpp +++ b/src/ModuleList.cpp @@ -37,10 +37,10 @@ ModuleList theModuleList; LyXModule::LyXModule(string const & n, string const & i, string const & d, vector const & p, vector const & r, vector const & e, - string const & c): + 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), available_(false) + checked_(false), available_(false), local_(local) { filename_ = id_ + ".module"; } @@ -199,9 +199,13 @@ 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 @@ -216,9 +220,9 @@ bool ModuleList::read() void ModuleList::addLayoutModule(string const & modname, string const & filename, string const & description, vector const & pkgs, vector const & req, - vector const & exc, string const & catgy) + vector 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); } @@ -264,10 +268,10 @@ 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