X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FModuleList.cpp;h=51a942776610d4cd131db854deb3f886b0b267d9;hb=04eef3480faffb98b87f23cf39c09f2bb3c71173;hp=f5412b8ead7ae96e9971a830ba54676dfe3ac1d5;hpb=2a25d7039f6fbfd1d5bae87fd9fd91fdf316459a;p=lyx.git

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index f5412b8ead..51a9427766 100644
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -18,11 +18,12 @@
 
 #include "support/debug.h"
 #include "support/FileName.h"
+#include "support/gettext.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
 #include <algorithm>
-	
+
 using namespace std;
 using namespace lyx::support;
 
@@ -30,42 +31,47 @@ namespace lyx {
 
 
 //global variable: module list
-ModuleList moduleList;
+ModuleList theModuleList;
 
 
-LyXModule::LyXModule(string const & n, string const & i, 
+LyXModule::LyXModule(string const & n, string const & i,
 	                   string const & d, vector<string> const & p,
 	                   vector<string> const & r, vector<string> const & e,
 	                   string const & c):
-	name_(n), id_(i), description_(d), package_list_(p), 
+	name_(n), id_(i), description_(d), package_list_(p),
 	required_modules_(r), excluded_modules_(e), category_(c),
-	checked_(false)
+	checked_(false), available_(false)
 {
 	filename_ = id_ + ".module";
 }
 
 
-bool LyXModule::isAvailable() {
-#ifdef TEX2LYX
-	return true;
-#else
+vector<string> LyXModule::prerequisites() const
+{
+	if (!checked_)
+		isAvailable();
+	return prerequisites_;
+}
+
+
+bool LyXModule::isAvailable() const
+{
 	if (package_list_.empty())
 		return true;
 	if (checked_)
 		return available_;
 	checked_ = true;
+	available_ = true;
 	//check whether all of the required packages are available
 	vector<string>::const_iterator it  = package_list_.begin();
-	vector<string>::const_iterator end = package_list_.end(); 
+	vector<string>::const_iterator end = package_list_.end();
 	for (; it != end; ++it) {
 		if (!LaTeXFeatures::isAvailable(*it)) {
 			available_ = false;
-			return available_;
+			prerequisites_.push_back(*it);
 		}
 	}
-	available_ = true;
 	return available_;
-#endif
 }
 
 
@@ -76,7 +82,7 @@ bool LyXModule::isCompatible(string const & modname) const
 			excluded_modules_.end())
 		return false;
 
-	LyXModule const * const lm = moduleList[modname];
+	LyXModule const * const lm = theModuleList[modname];
 	if (!lm)
 		return true;
 
@@ -91,37 +97,36 @@ 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.
 	return true;
 }
 
+
 // used when sorting the module list.
-class ModuleSorter
-{
+class ModuleSorter {
 public:
 	int operator()(LyXModule const & lm1, LyXModule const & lm2) const
 	{
-		return lm1.getName() < lm2.getName();
+		return _(lm1.getName()) < _(lm2.getName());
 	}
 };
 
 
-//Much of this is borrowed from LayoutFileList::read()
+// Much of this is borrowed from LayoutFileList::read()
 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;
 	}
 
@@ -134,7 +139,7 @@ bool ModuleList::read()
 
 	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;
 	}
@@ -199,16 +204,16 @@ bool ModuleList::read()
 			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 & modname, 
+void ModuleList::addLayoutModule(string const & modname,
 	string const & filename, string const & description,
 	vector<string> const & pkgs, vector<string> const & req,
 	vector<string> const & exc, string const & catgy)
@@ -242,6 +247,18 @@ LyXModuleList::iterator ModuleList::end()
 }
 
 
+LyXModule const * ModuleList::operator[](string const & str) const
+{
+	LyXModuleList::const_iterator it = modlist_.begin();
+	for (; it != modlist_.end(); ++it)
+		if (it->getID() == str) {
+			LyXModule const & mod = *it;
+			return &mod;
+		}
+	return 0;
+}
+
+
 LyXModule * ModuleList::operator[](string const & str)
 {
 	LyXModuleList::iterator it = modlist_.begin();