X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FModuleList.cpp;h=e53af9b7e9f98d12dc315eefdcc17571cdbb5641;hb=ad91dd139c4d6665704b11d9bd34770c3b769543;hp=1095cb60a8b5a278188063b8c975a81560a78602;hpb=7f17f13bfc2ad4e7cdd8ecfce23374e2b3d0c646;p=lyx.git

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 1095cb60a8..e53af9b7e9 100644
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -10,124 +10,169 @@
  */
 
 #include <config.h>
-#include "debug.h"
-#include "Lexer.h"
+
 #include "ModuleList.h"
-#include "support/docstring.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>
 	
-namespace lyx{
+using namespace std;
+using namespace lyx::support;
+
+namespace lyx {
 
-using std::map;
-using std::string;
-using std::vector;
-using std::endl;
-using support::FileName;
-using support::libFileSearch;
-using support::makeDisplayPath;
 
 //global variable: module list
 ModuleList moduleList;
 
 
-// used when sorting the module list.
-class moduleSorter
-	: public std::binary_function<LyXModule, LyXModule, int>
+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)
 {
-	public:
-		int operator()(LyXModule const & lm1,
-								 LyXModule const & lm2) const
-		{
-			return (lm1.name < lm2.name);
+	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.getName() < lm2.getName();
+	}
 };
 
 
-//Much of this is borrowed from TextClassList::read()
-bool ModuleList::load() {
-	support::FileName const real_file = libFileSearch("", "lyxmodules.lst");
-	LYXERR(Debug::TCLASS) << "Reading modules from `"
-			<< real_file << '\'' << endl;
+//Much of this is borrowed from LayoutFileList::read()
+bool ModuleList::load()
+{
+	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  `"
+			<< to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
+			<< "'.\nNo 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;
 	}
 
 	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 packages
-					if (lex.next()) {
-						string packages = lex.getString();
-						LYXERR(Debug::TCLASS) << "Packages: " << packages << endl;
-						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);
-					}
-				}
+			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 str = lex.getString();
+			LYXERR(Debug::TCLASS, "Packages: " << str);
+			vector<string> pkgs;
+			while (!str.empty()) {
+				string 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, 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())
-		sort(moduleList.begin(), moduleList.end(), moduleSorter());
+		sort(moduleList.begin(), moduleList.end(), ModuleSorter());
 	return true;
 }
 
 
-void ModuleList::addLayoutModule(string moduleName, 
-		string filename, string description, vector<string> pkgs) {
-	LyXModule lm;
-	lm.name = moduleName;
-	lm.filename = filename;
-	lm.description = description;
-	lm.packageList = pkgs;
+void ModuleList::addLayoutModule(string const & moduleName, 
+	string const & filename, string const & description,
+	vector<string> const & pkgs, vector<string> const & req,
+	vector<string> const & exc)
+{
+	LyXModule lm(moduleName, filename, description, pkgs, req, exc);
 	modlist_.push_back(lm);
 }
 
@@ -156,14 +201,26 @@ LyXModuleList::iterator ModuleList::end()
 }
 
 
-LyXModule * ModuleList::operator[](string const str) {
+LyXModule * ModuleList::getModuleByName(string const & str)
+{
 	LyXModuleList::iterator it = modlist_.begin();
 	for (; it != modlist_.end(); ++it)
-		if (it->name == str) {
+		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->getID() == str) {
+			LyXModule & mod = *it;
+			return &mod;
+		}
+	return 0;
 }
+
+} // namespace lyx