Don't allow newline characters in preference (#5840).

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 34c47b7cf34c6647ed8ed323efb82392dd3412d4..49895e6d4df32af6b452d3236fa7834268f99fff 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -18,6 +18,7 @@
 
 #include "support/debug.h"
 #include "support/FileName.h"
+#include "support/gettext.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
@@ -45,7 +46,18 @@ LyXModule::LyXModule(string const & n, string const & i,
 }
 
 
-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
@@ -54,16 +66,16 @@ bool LyXModule::isAvailable() {
        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(); 
        for (; it != end; ++it) {
                if (!LaTeXFeatures::isAvailable(*it)) {
                        available_ = false;
-                       return available_;
+                       prerequisites_.push_back(*it);
                }
        }
-       available_ = true;
        return available_;
 #endif
 }
@@ -101,27 +113,27 @@ bool LyXModule::areCompatible(string const & mod1, string const & mod2)
        return true;
 }
 
+
 // used when sorting the module list.
 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 +146,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;
        }
@@ -242,15 +254,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