adjust

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 4ca14964a5008d655d5d04cb84b5410805647934..71e1aaf0d0a262643a69e2be2b29d394d3344fb3 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -10,19 +10,24 @@
  */
 
 #include <config.h>
+
 #include "debug.h"
 #include "Lexer.h"
 #include "ModuleList.h"
-#include "support/filetools.h"
+
 #include "support/docstring.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
 
+#include <algorithm>
        
-namespace lyx{
-
+using std::endl;
 using std::map;
 using std::string;
 using std::vector;
-using std::endl;
+
+namespace lyx{
+
 using support::FileName;
 using support::libFileSearch;
 using support::makeDisplayPath;
@@ -87,35 +92,46 @@ bool ModuleList::load() {
                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 package read, and availability
-                                       // This code is run when we have
-                                       // modName, fname, and desc
-                                       addLayoutModule(modName, fname, desc);
-                               }
+                       if (!lex.next())
+                               break;
+                       string const fname = lex.getString();
+                       LYXERR(Debug::TCLASS) << "Filename: " << fname << endl;
+                       if (!lex.next())
+                               break;
+                       string const desc = lex.getString();
+                       LYXERR(Debug::TCLASS) << "Description: " << desc << endl;
+                       //FIXME Add packages
+                       if (!lex.next())
+                               break;
+                       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);
                } // end switch
        } //end while
        
        LYXERR(Debug::TCLASS) << "End of parsing of lyxmodules.lst" << endl;
 
        if (!moduleList.empty())
-               sort(moduleList.begin(), moduleList.end(), moduleSorter());
+               std::sort(moduleList.begin(), moduleList.end(), moduleSorter());
        return true;
 }
 
 
 void ModuleList::addLayoutModule(string moduleName, 
-               string filename, string description) {
+               string filename, string description, vector<string> pkgs) {
        LyXModule lm;
        lm.name = moduleName;
        lm.filename = filename;
        lm.description = description;
+       lm.packageList = pkgs;
        modlist_.push_back(lm);
 }