english_language was not used at all.

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index bd035f49664600463b1c8601a8be54c6b61dfbef..e53af9b7e9f98d12dc315eefdcc17571cdbb5641 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -13,16 +13,15 @@
 
 #include "ModuleList.h"
 
-#include "support/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 namespace std;
 using namespace lyx::support;
@@ -34,13 +33,15 @@ namespace lyx {
 ModuleList moduleList;
 
 
-LyXModule::LyXModule(string const & n, string const & f, 
+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), filename(f), description(d), 
+       name(n), id(i), description(d), 
        packageList(p), requiredModules(r), excludedModules(e),
        checked(false)
-{}
+{
+       filename = id + ".module";
+}
 
 
 bool LyXModule::isAvailable() {
@@ -49,12 +50,14 @@ bool LyXModule::isAvailable() {
        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))
+               if (!LaTeXFeatures::isAvailable(*it)) {
                        available = false;
                        return available;
+               }
        }
        available = true;
        return available;
@@ -72,34 +75,30 @@ public:
 };
 
 
-//Much of this is borrowed from TextClassList::read()
+//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;
        }
 
@@ -202,7 +201,7 @@ 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)
@@ -213,4 +212,15 @@ LyXModule * ModuleList::operator[](string const & str)
        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