Rationalize the handling of InsetLayout's preamble and requries. That is,

[features.git] / src / insets / InsetLayout.cpp

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 4280eb5428ef5489fa0a57593a59a7f2be2929a8..ca1429793b47e46d6cc6b26f5540f86a05ff6bd2 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -14,7 +14,7 @@
 
 #include "InsetLayout.h"
 
-#include "Color.h"
+#include "ColorSet.h"
 #include "Font.h"
 #include "Lexer.h"
 #include "TextClass.h"
@@ -67,7 +67,7 @@ InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
        return InsetLayout::ILT_ERROR;
 }
 
-}
+} // namespace anon
 
 
 bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
@@ -256,7 +256,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                        bgcolor_ = lcolor.getFromLyXName(tmp);
                        break;
                case IL_PREAMBLE:
-                       preamble_ = lex.getLongString("EndPreamble");
+                       preamble_ = from_utf8(lex.getLongString("EndPreamble"));
                        break;
                case IL_REQUIRES: {
                        lex.eatLine();