*/
#include <config.h>
+
+#include "ModuleList.h"
+
#include "debug.h"
#include "Lexer.h"
-#include "ModuleList.h"
+
#include "support/filetools.h"
-#include "support/docstring.h"
+#include "support/lstrings.h"
+#include <algorithm>
-namespace lyx{
-
+using std::endl;
using std::map;
using std::string;
using std::vector;
-using std::endl;
+
+namespace lyx {
+
using support::FileName;
using support::libFileSearch;
using support::makeDisplayPath;
// used when sorting the module list.
-class moduleSorter
- : public std::binary_function<LyXModule, LyXModule, int>
+class ModuleSorter
{
- public:
- int operator()(LyXModule const & lm1,
- LyXModule const & lm2) const
- {
- return (lm1.name < lm2.name);
- }
+public:
+ int operator()(LyXModule const & lm1, LyXModule const & lm2) const
+ {
+ return lm1.name < lm2.name;
+ }
};
//Much of this is borrowed from TextClassList::read()
-bool ModuleList::load() {
+bool ModuleList::load()
+{
support::FileName const real_file = libFileSearch("", "lyxmodules.lst");
- LYXERR(Debug::TCLASS) << "Reading modules from `"
- << real_file << '\'' << endl;
+ LYXERR(Debug::TCLASS, "Reading modules from `" << real_file << '\'');
if (real_file.empty()) {
lyxerr << "ModuleList::load(): unable to find "
bool finished = false;
// Parse modules files
- LYXERR(Debug::TCLASS) << "Starting parsing of lyxmodules.lst" << endl;
+ LYXERR(Debug::TCLASS, "Starting parsing of lyxmodules.lst");
while (lex.isOK() && !finished) {
- LYXERR(Debug::TCLASS) << "\tline by line" << endl;
+ LYXERR(Debug::TCLASS, "\tline by line");
switch (lex.lex()) {
case Lexer::LEX_FEOF:
finished = true;
break;
default:
string const modName = lex.getString();
- LYXERR(Debug::TCLASS) << "Module name: " << modName << endl;
- if (lex.next()) {
- string const fname = lex.getString();
- LYXERR(Debug::TCLASS) << "Filename: " << fname << endl;
- if (lex.next()) {
- string const desc = lex.getString();
- LYXERR(Debug::TCLASS) << "Description: " << desc << endl;
- //FIXME Add package read, and availability
- // This code is run when we have
- // modName, fname, and desc
- addLayoutModule(modName, fname, desc);
- }
+ LYXERR(Debug::TCLASS, "Module name: " << modName);
+ if (!lex.next())
+ break;
+ string const fname = lex.getString();
+ LYXERR(Debug::TCLASS, "Filename: " << fname);
+ if (!lex.next())
+ 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);
+ vector<string> pkgs;
+ while (!packages.empty()) {
+ string p;
+ packages = support::split(packages, p, ',');
+ pkgs.push_back(p);
}
+ // This code is run when we have
+ // modName, fname, desc, and pkgs
+ addLayoutModule(modName, fname, desc, pkgs);
} // end switch
} //end while
- LYXERR(Debug::TCLASS) << "End of parsing of lyxmodules.lst" << endl;
+ LYXERR(Debug::TCLASS, "End of parsing of lyxmodules.lst");
if (!moduleList.empty())
- sort(moduleList.begin(), moduleList.end(), moduleSorter());
+ std::sort(moduleList.begin(), moduleList.end(), ModuleSorter());
return true;
}
-void ModuleList::addLayoutModule(string moduleName,
- string filename, string description) {
+void ModuleList::addLayoutModule(string const & moduleName,
+ string const & filename, string const & description,
+ vector<string> const & pkgs)
+{
LyXModule lm;
lm.name = moduleName;
lm.filename = filename;
lm.description = description;
+ lm.packageList = pkgs;
modlist_.push_back(lm);
}
}
-LyXModule * ModuleList::operator[](string const str) {
+LyXModule * ModuleList::operator[](string const & str)
+{
LyXModuleList::iterator it = modlist_.begin();
for (; it != modlist_.end(); ++it)
if (it->name == str) {
return 0;
}
-}
+} // namespace lyx