This is the first of a series of commits that will make InsetLayout a real class.

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 80c8550923de08aac27bb58d7a3f793649c34f63..c29f0bd1f8a0d0a0359e18410488b417a7e38952 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -16,9 +16,8 @@
 #include "TextClass.h"
 #include "Lexer.h"
 #include "Font.h"
-#include "support/debug.h"
-
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <ostream>
@@ -488,15 +487,17 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
                        break;
 
                case LT_REQUIRES:
-                       if (lexrc.eatLine())
-                               requires_ = getVectorFromString(lexrc.getString());
+                       lexrc.eatLine();
+                       vector<string> const req = 
+                               getVectorFromString(lexrc.getString());
+                       requires_.insert(req.begin(), req.end());
                        break;
 
                }
        }
        lexrc.popTable();
 
-       return error;
+       return !error;
 }