Fix assertion when checking if change in selection

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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 3c4fc9bb9fce398d57e79d37a0312f0f67987098..acef3d143955f4a093acac6d9976104ae744b8ac 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -42,8 +42,8 @@ InsetLayout::InsetLayout() :
        htmlisblock_(true), multipar_(true), custompars_(true),
        forceplain_(false), passthru_(false), parbreakisnewline_(false),
        freespacing_(false), keepempty_(false), forceltr_(false),
-       forceownlines_(false), needprotect_(false), intoc_(false),
-       spellcheck_(true), resetsfont_(false), display_(true),
+       forceownlines_(false), needprotect_(false), needcprotect_(false),
+       intoc_(false), spellcheck_(true), resetsfont_(false), display_(true),
        forcelocalfontswitch_(false), add_to_toc_(false), is_toc_caption_(false)
 {
        labelfont_.setColor(Color_error);
@@ -74,7 +74,7 @@ InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
        return InsetLayout::ILT_ERROR;
 }
 
-} // namespace anon
+} // namespace
 
 
 bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
@@ -90,6 +90,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,
@@ -119,6 +120,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_OBSOLETEDBY,
                IL_KEEPEMPTY,
                IL_MULTIPAR,
+               IL_NEEDCPROTECT,
                IL_NEEDPROTECT,
                IL_PASSTHRU,
                IL_PASSTHRU_CHARS,
@@ -145,6 +147,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,6 +177,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                { "leftdelim", IL_LEFTDELIM },
                { "lyxtype", IL_LYXTYPE },
                { "multipar", IL_MULTIPAR },
+               { "needcprotect", IL_NEEDCPROTECT },
                { "needprotect", IL_NEEDPROTECT },
                { "obsoletedby", IL_OBSOLETEDBY },
                { "parbreakisnewline", IL_PARBREAKISNEWLINE },
@@ -322,6 +326,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_NEEDPROTECT:
                        lex >> needprotect_;
                        break;
+               case IL_NEEDCPROTECT:
+                       lex >> needcprotect_;
+                       break;
                case IL_CONTENTASLABEL:
                        lex >> contentaslabel_;
                        break;
@@ -468,6 +475,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,6 +594,8 @@ void InsetLayout::readArgument(Lexer & lex)
        arg.font = inherit_font;
        arg.labelfont = inherit_font;
        arg.is_toc_caption = false;
+       arg.passthru = PT_INHERITED;
+       arg.nodelims = false;
        string nr;
        lex >> nr;
        bool const postcmd = prefixIs(nr, "post:");
@@ -642,6 +654,15 @@ void InsetLayout::readArgument(Lexer & lex)
                } else if (tok == "passthruchars") {
                        lex.next();
                        arg.pass_thru_chars = lex.getDocString();
+               } else if (tok == "passthru") {
+                       lex.next();
+                       docstring value = lex.getDocString();
+                       if (value == "true" || value == "1")
+                               arg.passthru = PT_TRUE;
+                       else if (value == "false" || value == "0")
+                               arg.passthru = PT_FALSE;
+                       else
+                               arg.passthru = PT_INHERITED;
                } else if (tok == "istoccaption") {
                        lex.next();
                        arg.is_toc_caption = lex.getBool();