Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index dbe290939d94a8d28717eb2a115e46f639adfa04..ce0d25a13a1a7c37bf264a2993fceac01fbc4f2a 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -109,6 +109,8 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                IL_HTMLLABEL,
                IL_HTMLSTYLE,
                IL_HTMLPREAMBLE,
+               IL_DOCBOOKTAG,
+               IL_DOCBOOKATTR,
                IL_INTOC,
                IL_ISTOCCAPTION,
                IL_LABELFONT,
@@ -153,6 +155,8 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                { "custompars", IL_CUSTOMPARS },
                { "decoration", IL_DECORATION },
                { "display", IL_DISPLAY },
+               { "docbookattr", IL_DOCBOOKATTR },
+               { "docbooktag", IL_DOCBOOKTAG },
                { "editexternal", IL_EDITEXTERNAL },
                { "end", IL_END },
                { "fixedwidthpreambleencoding", IL_FIXEDWIDTH_PREAMBLE_ENCODING },
@@ -493,11 +497,17 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                case IL_HTMLPREAMBLE:
                        htmlpreamble_ = lex.getLongString(from_ascii("EndPreamble"));
                        break;
+               case IL_DOCBOOKTAG:
+                       lex >> docbooktag_;
+                       break;
+               case IL_DOCBOOKATTR:
+                       lex >> docbookattr_;
+                       break;
                case IL_REQUIRES: {
                        lex.eatLine();
                        vector<string> const req
                                = getVectorFromString(lex.getString(true));
-                       requires_.insert(req.begin(), req.end());
+                       required_.insert(req.begin(), req.end());
                        break;
                }
                case IL_SPELLCHECK:
@@ -544,8 +554,6 @@ InsetLayout::InsetLyXType translateLyXType(std::string const & str)
                return InsetLayout::CHARSTYLE;
        if (compare_ascii_no_case(str, "custom") == 0)
                return InsetLayout::CUSTOM;
-       if (compare_ascii_no_case(str, "element") == 0)
-               return InsetLayout::ELEMENT;
        if (compare_ascii_no_case(str, "end") == 0)
                return InsetLayout::END;
        if (compare_ascii_no_case(str, "standard") == 0)
@@ -689,7 +697,7 @@ void InsetLayout::readArgument(Lexer & lex)
                        arg.tooltip = lex.getDocString();
                } else if (tok == "requires") {
                        lex.next();
-                       arg.requires = lex.getString();
+                       arg.required = lex.getString();
                } else if (tok == "decoration") {
                        lex.next();
                        arg.decoration = lex.getString();