X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FModuleList.cpp;h=a9658710029e440959749bd48b9f0902f63070d7;hb=dc7c7ca03eca25cf7a6395c155b70dac1594e481;hp=7efd0cdd925389c669edc8068bf52e09ead936ca;hpb=52d3a1e426a079ad28a33b4cd5fba99946765a0e;p=lyx.git

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 7efd0cdd92..a965871002 100644
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -30,58 +30,70 @@ namespace lyx {
 
 
 //global variable: module list
-ModuleList moduleList;
+ModuleList theModuleList;
 
 
 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)
+	                   vector<string> const & r, vector<string> 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";
+	filename_ = id_ + ".module";
 }
 
 
-bool LyXModule::isAvailable() {
+vector<string> LyXModule::prerequisites() const {
+#ifdef TEX2LYX
+	return vector<string>();
+#else
+	if (!checked_)
+		isAvailable();
+	return prerequisites_;
+#endif
+}
+
+
+bool LyXModule::isAvailable() const {
 #ifdef TEX2LYX
 	return true;
 #else
-	if (packageList.empty())
+	if (package_list_.empty())
 		return true;
-	if (checked)
-		return available;
-	checked = true;
+	if (checked_)
+		return available_;
+	checked_ = true;
+	available_ = true;
 	//check whether all of the required packages are available
-	vector<string>::const_iterator it  = packageList.begin();
-	vector<string>::const_iterator end = packageList.end(); 
+	vector<string>::const_iterator it  = package_list_.begin();
+	vector<string>::const_iterator end = package_list_.end(); 
 	for (; it != end; ++it) {
 		if (!LaTeXFeatures::isAvailable(*it)) {
-			available = false;
-			return available;
+			available_ = false;
+			prerequisites_.push_back(*it);
 		}
 	}
-	available = true;
-	return available;
+	return available_;
 #endif
 }
 
 
-bool LyXModule::isCompatible(string const & modName) const
+bool LyXModule::isCompatible(string const & modname) const
 {
 	// do we exclude it?
-	if (find(excludedModules.begin(), excludedModules.end(), modName) !=
-			excludedModules.end())
+	if (find(excluded_modules_.begin(), excluded_modules_.end(), modname) !=
+			excluded_modules_.end())
 		return false;
 
-	LyXModule const * const lm = moduleList[modName];
+	LyXModule const * const lm = theModuleList[modname];
 	if (!lm)
 		return true;
 
 	// does it exclude us?
-	vector<string> const excMods = lm->getExcludedModules();
-	if (find(excMods.begin(), excMods.end(), id) != excMods.end())
+	vector<string> const excmods = lm->getExcludedModules();
+	if (find(excmods.begin(), excmods.end(), id_) != excmods.end())
 		return false;
 
 	return true;
@@ -90,10 +102,10 @@ bool LyXModule::isCompatible(string const & modName) const
 
 bool LyXModule::areCompatible(string const & mod1, string const & mod2)
 {
-	LyXModule const * const lm1 = moduleList[mod1];
+	LyXModule const * const lm1 = theModuleList[mod1];
 	if (lm1)
 		return lm1->isCompatible(mod2);
-	LyXModule const * const lm2 = moduleList[mod2];
+	LyXModule const * const lm2 = theModuleList[mod2];
 	if (lm2)
 		return lm2->isCompatible(mod1);
 	// Can't check it either way.
@@ -112,15 +124,14 @@ public:
 
 
 //Much of this is borrowed from LayoutFileList::read()
-bool ModuleList::load()
+bool ModuleList::read()
 {
 	FileName const real_file = libFileSearch("", "lyxmodules.lst");
 	LYXERR(Debug::TCLASS, "Reading modules from `" << real_file << '\'');
 
 	if (real_file.empty()) {
-		LYXERR0("unable to find modules file  `"
-			<< to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
-			<< "'.\nNo modules will be available.");
+		LYXERR0("unable to find modules file `lyxmodules.lst'.\n"
+			<< "No modules will be available.");
 		return false;
 	}
 
@@ -133,7 +144,7 @@ bool ModuleList::load()
 
 	if (!lex.isOK()) {
 		LYXERR0("unable to open modules file  `"
-			<< to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
+			<< to_utf8(makeDisplayPath(real_file.absFileName(), 1000))
 			<< "'\nNo modules will be available.");
 		return false;
 	}
@@ -148,13 +159,13 @@ 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);
@@ -189,26 +200,30 @@ bool ModuleList::load()
 				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, pkgs, req, and exc
-			addLayoutModule(modName, fname, desc, pkgs, req, exc);
+			// 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<string> const & pkgs, vector<string> const & req,
-	vector<string> const & exc)
+	vector<string> const & exc, string const & catgy)
 {
-	LyXModule lm(moduleName, filename, description, pkgs, req, exc);
+	LyXModule lm(modname, filename, description, pkgs, req, exc, catgy);
 	modlist_.push_back(lm);
 }
 
@@ -237,15 +252,26 @@ 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->getID() == str) {
-			LyXModule & mod = *it;
+			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