More requires --> required, for C++2a.

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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index d81acf32670aaf18401ea782aed3186ac5460bcb..dbe290939d94a8d28717eb2a115e46f639adfa04 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -41,7 +41,7 @@ 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),
        needmboxprotect_(false), intoc_(false), spellcheck_(true),
        resetsfont_(false), display_(true), forcelocalfontswitch_(false),
@@ -78,7 +78,8 @@ InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
 } // namespace
 
 
-bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
+bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
+       bool validating)
 {
        enum {
                IL_ADDTOTOC,
@@ -128,6 +129,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_NEWLINE_CMD,
                IL_PASSTHRU,
                IL_PASSTHRU_CHARS,
+               IL_PARBREAKIGNORED,
                IL_PARBREAKISNEWLINE,
                IL_PREAMBLE,
                IL_REQUIRES,
@@ -187,6 +189,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                { "needprotect", IL_NEEDPROTECT },
                { "newlinecmd", IL_NEWLINE_CMD },
                { "obsoletedby", IL_OBSOLETEDBY },
+               { "parbreakignored", IL_PARBREAKIGNORED },
                { "parbreakisnewline", IL_PARBREAKISNEWLINE },
                { "passthru", IL_PASSTHRU },
                { "passthruchars", IL_PASSTHRU_CHARS },
@@ -214,6 +217,8 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                switch (le) {
                case Lexer::LEX_UNDEF:
                        lex.printError("Unknown InsetLayout tag");
+                       if (validating)
+                               return false;
                        continue;
                default:
                        break;
@@ -230,13 +235,20 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                                LYXERR0("Flex insets must have names of the form `Flex:<name>'.\n"
                                        "This one has the name `" << to_utf8(name_) << "'\n"
                                        "Ignoring LyXType declaration.");
+                               // this is not really a reason to abort
+                               if (validating)
+                                       return false;
                                break;
                        }
                        string lt;
                        lex >> lt;
                        lyxtype_ = translateLyXType(lt);
-                       if (lyxtype_  == NOLYXTYPE)
+                       if (lyxtype_  == NOLYXTYPE) {
                                LYXERR0("Unknown LyXType `" << lt << "'.");
+                               // this is not really a reason to abort
+                               if (validating)
+                                       return false;
+                       }
                        if (lyxtype_ == CHARSTYLE) {
                                // by default, charstyles force the plain layout
                                multipar_ = false;
@@ -248,8 +260,12 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                        string lt;
                        lex >> lt;
                        latextype_ = translateLaTeXType(lt);
-                       if (latextype_  == ILT_ERROR)
+                       if (latextype_  == ILT_ERROR) {
                                LYXERR0("Unknown LaTeXType `" << lt << "'.");
+                               // this is not really a reason to abort
+                               if (validating)
+                                       return false;
+                       }
                        break;
                }
                case IL_LABELSTRING:
@@ -327,6 +343,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_NEWLINE_CMD:
                        lex >> newline_cmd_;
                        break;
+               case IL_PARBREAKIGNORED:
+                       lex >> parbreakignored_;
+                       break;
                case IL_PARBREAKISNEWLINE:
                        lex >> parbreakisnewline_;
                        break;
@@ -373,6 +392,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                                                tclass.insetLayouts().end();
                                for (; lit != len; ++lit)
                                        lyxerr << lit->second.name() << "\n";
+                               // this is not really a reason to abort
+                               if (validating)
+                                       return false;
                        }
                        break;
                }
@@ -403,6 +425,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                                                tclass.insetLayouts().end();
                                for (; lit != len; ++lit)
                                        lyxerr << lit->second.name() << "\n";
+                               // this is not really a reason to abort
+                               if (validating)
+                                       return false;
                        }
                        break;
                }