X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FModuleList.cpp;h=14e2917159bddeeea7fb184ad714221ed823c6a5;hb=b7406da7f0326fbd895c700ad5ded4cc5112094f;hp=b530706f07db4cacbb7f4f853bdeff1c28c53708;hpb=be85a6fcb55291a6fa8ebf7f6cb58fdecafd741d;p=lyx.git

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index b530706f07..14e2917159 100644
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -13,46 +13,74 @@
 
 #include "ModuleList.h"
 
-#include "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 std::endl;
-using std::map;
-using std::string;
-using std::vector;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::libFileSearch;
-using support::makeDisplayPath;
 
 //global variable: module list
 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()
 {
-	support::FileName const real_file = libFileSearch("", "lyxmodules.lst");
-	LYXERR(Debug::TCLASS) << "Reading modules from `"
-			<< real_file << '\'' << endl;
+	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 "
@@ -81,58 +109,75 @@ bool ModuleList::load()
 
 	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;
+			LYXERR(Debug::TCLASS, "Module name: " << modName);
 			if (!lex.next())
 				break;
 			string const fname = lex.getString();
-			LYXERR(Debug::TCLASS) << "Filename: " << fname << endl;
+			LYXERR(Debug::TCLASS, "Filename: " << fname);
 			if (!lex.next())
 				break;
 			string const desc = lex.getString();
-			LYXERR(Debug::TCLASS) << "Description: " << desc << endl;
+			LYXERR(Debug::TCLASS, "Description: " << desc);
 			//FIXME Add packages
 			if (!lex.next())
 				break;
-			string packages = lex.getString();
-			LYXERR(Debug::TCLASS) << "Packages: " << packages << endl;
+			string str = lex.getString();
+			LYXERR(Debug::TCLASS, "Packages: " << str);
 			vector<string> pkgs;
-			while (!packages.empty()) {
+			while (!str.empty()) {
 				string p;
-				packages = support::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
 	
-	LYXERR(Debug::TCLASS) << "End of parsing of lyxmodules.lst" << endl;
+	LYXERR(Debug::TCLASS, "End of parsing of lyxmodules.lst");
 
 	if (!moduleList.empty())
-		std::sort(moduleList.begin(), moduleList.end(), ModuleSorter());
+		sort(moduleList.begin(), moduleList.end(), ModuleSorter());
 	return true;
 }
 
 
 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);
 }
 
@@ -161,11 +206,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;
 		}