New InsetLayout tag ParbreakIgnored

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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index e78b3ff7ef3b3bbaa6476af09cc1d7092ebbbb1f..b523457c6017235932bf8feda6873287668dda8d 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -41,10 +41,11 @@ InsetLayout::InsetLayout() :
        fixedwidthpreambleencoding_(false), htmlforcecss_ (false),
        htmlisblock_(true), multipar_(true), custompars_(true),
        forceplain_(false), passthru_(false), parbreakisnewline_(false),
-       freespacing_(false), keepempty_(false), forceltr_(false),
+       parbreakignored_(false), freespacing_(false), keepempty_(false), forceltr_(false),
        forceownlines_(false), needprotect_(false), needcprotect_(false),
-       intoc_(false), spellcheck_(true), resetsfont_(false), display_(true),
-       forcelocalfontswitch_(false), add_to_toc_(false), is_toc_caption_(false)
+       needmboxprotect_(false), intoc_(false), spellcheck_(true),
+       resetsfont_(false), display_(true), forcelocalfontswitch_(false),
+       add_to_toc_(false), is_toc_caption_(false), edit_external_(false)
 {
        labelfont_.setColor(Color_error);
 }
@@ -90,6 +91,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_CUSTOMPARS,
                IL_DECORATION,
                IL_DISPLAY,
+               IL_EDITEXTERNAL,
                IL_FIXEDWIDTH_PREAMBLE_ENCODING,
                IL_FONT,
                IL_FORCE_LOCAL_FONT_SWITCH,
@@ -118,11 +120,15 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_LYXTYPE,
                IL_OBSOLETEDBY,
                IL_KEEPEMPTY,
+               IL_MENUSTRING,
                IL_MULTIPAR,
                IL_NEEDCPROTECT,
+               IL_NEEDMBOXPROTECT,
                IL_NEEDPROTECT,
+               IL_NEWLINE_CMD,
                IL_PASSTHRU,
                IL_PASSTHRU_CHARS,
+               IL_PARBREAKIGNORED,
                IL_PARBREAKISNEWLINE,
                IL_PREAMBLE,
                IL_REQUIRES,
@@ -146,6 +152,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                { "custompars", IL_CUSTOMPARS },
                { "decoration", IL_DECORATION },
                { "display", IL_DISPLAY },
+               { "editexternal", IL_EDITEXTERNAL },
                { "end", IL_END },
                { "fixedwidthpreambleencoding", IL_FIXEDWIDTH_PREAMBLE_ENCODING },
                { "font", IL_FONT },
@@ -174,10 +181,14 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                { "latextype", IL_LATEXTYPE },
                { "leftdelim", IL_LEFTDELIM },
                { "lyxtype", IL_LYXTYPE },
+               { "menustring", IL_MENUSTRING },
                { "multipar", IL_MULTIPAR },
                { "needcprotect", IL_NEEDCPROTECT },
+               { "needmboxprotect", IL_NEEDMBOXPROTECT },
                { "needprotect", IL_NEEDPROTECT },
+               { "newlinecmd", IL_NEWLINE_CMD },
                { "obsoletedby", IL_OBSOLETEDBY },
+               { "parbreakignored", IL_PARBREAKIGNORED },
                { "parbreakisnewline", IL_PARBREAKISNEWLINE },
                { "passthru", IL_PASSTHRU },
                { "passthruchars", IL_PASSTHRU_CHARS },
@@ -246,6 +257,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_LABELSTRING:
                        lex >> labelstring_;
                        break;
+               case IL_MENUSTRING:
+                       lex >> menustring_;
+                       break;
                case IL_DECORATION:
                        lex >> tmp;
                        decoration_ = translateDecoration(tmp);
@@ -312,6 +326,12 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_PASSTHRU_CHARS:
                        lex >> passthru_chars_;
                        break;
+               case IL_NEWLINE_CMD:
+                       lex >> newline_cmd_;
+                       break;
+               case IL_PARBREAKIGNORED:
+                       lex >> parbreakignored_;
+                       break;
                case IL_PARBREAKISNEWLINE:
                        lex >> parbreakisnewline_;
                        break;
@@ -327,6 +347,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_NEEDCPROTECT:
                        lex >> needcprotect_;
                        break;
+               case IL_NEEDMBOXPROTECT:
+                       lex >> needmboxprotect_;
+                       break;
                case IL_CONTENTASLABEL:
                        lex >> contentaslabel_;
                        break;
@@ -473,6 +496,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_ISTOCCAPTION:
                        lex >> is_toc_caption_;
                        break;
+               case IL_EDITEXTERNAL:
+                       lex >> edit_external_;
+                       break;
                case IL_END:
                        getout = true;
                        break;
@@ -584,11 +610,13 @@ void InsetLayout::readArgument(Lexer & lex)
        arg.mandatory = false;
        arg.autoinsert = false;
        arg.insertcotext = false;
+       arg.insertonnewline = false;
        bool error = false;
        bool finished = false;
        arg.font = inherit_font;
        arg.labelfont = inherit_font;
        arg.is_toc_caption = false;
+       arg.free_spacing = false;
        arg.passthru = PT_INHERITED;
        arg.nodelims = false;
        string nr;
@@ -617,6 +645,9 @@ void InsetLayout::readArgument(Lexer & lex)
                } else if (tok == "insertcotext") {
                        lex.next();
                        arg.insertcotext = lex.getBool();
+               } else if (tok == "insertonnewline") {
+                       lex.next();
+                       arg.insertonnewline = lex.getBool();
                } else if (tok == "leftdelim") {
                        lex.next();
                        arg.ldelim = lex.getDocString();
@@ -642,6 +673,9 @@ void InsetLayout::readArgument(Lexer & lex)
                } else if (tok == "decoration") {
                        lex.next();
                        arg.decoration = lex.getString();
+               } else if (tok == "newlinecmd") {
+                       lex.next();
+                       arg.newlinecmd = lex.getString();
                } else if (tok == "font") {
                        arg.font = lyxRead(lex, arg.font);
                } else if (tok == "labelfont") {
@@ -661,6 +695,9 @@ void InsetLayout::readArgument(Lexer & lex)
                } else if (tok == "istoccaption") {
                        lex.next();
                        arg.is_toc_caption = lex.getBool();
+               } else if (tok == "freespacing") {
+                       lex.next();
+                       arg.free_spacing = lex.getBool();
                } else {
                        lex.printError("Unknown tag");
                        error = true;