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 9e03fcb42d5f77ba70f5419a1135eea2a8f4f305..acef3d143955f4a093acac6d9976104ae744b8ac 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -42,9 +42,9 @@ 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),
-       forcelocalfontswitch_(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)
 {
        labelfont_.setColor(Color_error);
 }
@@ -74,12 +74,13 @@ InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
        return InsetLayout::ILT_ERROR;
 }
 
-} // namespace anon
+} // namespace
 
 
 bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 {
        enum {
+               IL_ADDTOTOC,
                IL_ARGUMENT,
                IL_BABELPREAMBLE,
                IL_BGCOLOR,
@@ -89,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,
@@ -106,6 +108,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_HTMLSTYLE,
                IL_HTMLPREAMBLE,
                IL_INTOC,
+               IL_ISTOCCAPTION,
                IL_LABELFONT,
                IL_LABELSTRING,
                IL_LANGPREAMBLE,
@@ -117,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,
@@ -133,6 +137,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 
 
        LexerKeyword elementTags[] = {
+               { "addtotoc", IL_ADDTOTOC },
                { "argument", IL_ARGUMENT },
                { "babelpreamble", IL_BABELPREAMBLE },
                { "bgcolor", IL_BGCOLOR },
@@ -142,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 },
@@ -160,6 +166,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                { "htmlstyle", IL_HTMLSTYLE },
                { "htmltag", IL_HTMLTAG },
                { "intoc", IL_INTOC },
+               { "istoccaption", IL_ISTOCCAPTION },
                { "keepempty", IL_KEEPEMPTY },
                { "labelfont", IL_LABELFONT },
                { "labelstring", IL_LABELSTRING },
@@ -170,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 },
@@ -222,8 +230,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                        lyxtype_ = translateLyXType(lt);
                        if (lyxtype_  == NOLYXTYPE)
                                LYXERR0("Unknown LyXType `" << lt << "'.");
-                       if (lyxtype_ == CHARSTYLE)
+                       if (lyxtype_ == CHARSTYLE) {
+                               // by default, charstyles force the plain layout
                                multipar_ = false;
+                               forceplain_ = true;
+                       }
                        break;
                }
                case IL_LATEXTYPE:  {
@@ -315,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;
@@ -400,13 +414,13 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                        bgcolor_ = lcolor.getFromLyXName(tmp);
                        break;
                case IL_PREAMBLE:
-                       preamble_ = from_utf8(lex.getLongString("EndPreamble"));
+                       preamble_ = lex.getLongString(from_ascii("EndPreamble"));
                        break;
                case IL_BABELPREAMBLE:
-                       babelpreamble_ = from_utf8(lex.getLongString("EndBabelPreamble"));
+                       babelpreamble_ = lex.getLongString(from_ascii("EndBabelPreamble"));
                        break;
                case IL_LANGPREAMBLE:
-                       langpreamble_ = from_utf8(lex.getLongString("EndLangPreamble"));
+                       langpreamble_ = lex.getLongString(from_ascii("EndLangPreamble"));
                        break;
                case IL_REFPREFIX:
                        lex >> refprefix_;
@@ -433,10 +447,10 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                        lex >> htmlisblock_;
                        break;
                case IL_HTMLSTYLE:
-                       htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle"));
+                       htmlstyle_ = lex.getLongString(from_ascii("EndHTMLStyle"));
                        break;
                case IL_HTMLPREAMBLE:
-                       htmlpreamble_ = from_utf8(lex.getLongString("EndPreamble"));
+                       htmlpreamble_ = lex.getLongString(from_ascii("EndPreamble"));
                        break;
                case IL_REQUIRES: {
                        lex.eatLine();
@@ -454,6 +468,16 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_DISPLAY:
                        lex >> display_;
                        break;
+               case IL_ADDTOTOC:
+                       lex >> toc_type_;
+                       add_to_toc_ = !toc_type_.empty();
+                       break;
+               case IL_ISTOCCAPTION:
+                       lex >> is_toc_caption_;
+                       break;
+               case IL_EDITEXTERNAL:
+                       lex >> edit_external_;
+                       break;
                case IL_END:
                        getout = true;
                        break;
@@ -569,6 +593,9 @@ void InsetLayout::readArgument(Lexer & lex)
        bool finished = false;
        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:");
@@ -595,9 +622,6 @@ void InsetLayout::readArgument(Lexer & lex)
                } else if (tok == "insertcotext") {
                        lex.next();
                        arg.insertcotext = lex.getBool();
-               } else if (tok == "insertcotext") {
-                       lex.next();
-                       arg.insertcotext = lex.getBool();
                } else if (tok == "leftdelim") {
                        lex.next();
                        arg.ldelim = lex.getDocString();
@@ -630,6 +654,18 @@ 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();
                } else {
                        lex.printError("Unknown tag");
                        error = true;