X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=dee7e29f7a6083ff0fa4caa306c5a018b85b3353;hb=2906a35663b92030b0668a42ab370dba8ffca4cf;hp=5433db83d99fee108b021fd343a13a121cc7805d;hpb=6aa26820fd2fc809c2928f7d1f52d9ee3ef9fb18;p=lyx.git

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 5433db83d9..dee7e29f7a 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -38,7 +38,8 @@ InsetLayout::InsetLayout() :
 	multipar_(true), custompars_(true), forceplain_(false), 
 	passthru_(false), parbreakisnewline_(false), freespacing_(false), 
 	keepempty_(false), forceltr_(false), 
-	needprotect_(false), intoc_(false), spellcheck_(true)
+	needprotect_(false), intoc_(false), spellcheck_(true), 
+	resetsfont_(true), display_(true)
 { 
 	labelfont_.setColor(Color_error);
 }
@@ -80,6 +81,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		IL_COUNTER,
 		IL_CUSTOMPARS,
 		IL_DECORATION,
+		IL_DISPLAY,
 		IL_FONT,
 		IL_FORCELTR,
 		IL_FORCEPLAIN,
@@ -109,6 +111,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		IL_REQUIRES,
 		IL_SPELLCHECK,
 		IL_REFPREFIX,
+		IL_RESETSFONT,
 		IL_END
 	};
 
@@ -120,6 +123,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		{ "counter", IL_COUNTER},
 		{ "custompars", IL_CUSTOMPARS },
 		{ "decoration", IL_DECORATION },
+		{ "display", IL_DISPLAY },
 		{ "end", IL_END },
 		{ "font", IL_FONT },
 		{ "forceltr", IL_FORCELTR },
@@ -149,12 +153,12 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		{ "preamble", IL_PREAMBLE },
 		{ "refprefix", IL_REFPREFIX },
 		{ "requires", IL_REQUIRES },
+		{ "resetsfont", IL_RESETSFONT },
 		{ "spellcheck", IL_SPELLCHECK }
 	};
 
 	lex.pushTable(elementTags);
 
-	FontInfo font = inherit_font;
 	labelfont_ = inherit_font;
 	bgcolor_ = Color_none;
 	bool getout = false;
@@ -178,6 +182,14 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		// way this sort of thing is handled in Layout::read(), namely, by
 		// using the Lexer.
 		case IL_LYXTYPE: {
+			// make sure that we have the right sort of name.
+			if (name_ != from_ascii("undefined")
+			    && name_.substr(0,5) != from_ascii("Flex:")) {
+				LYXERR0("Flex insets must have names of the form `Flex:<name>'.\n"
+				        "This one has the name `" << to_utf8(name_) << "'\n"
+				        "Ignoring LyXType declaration.");
+				break;
+			}
 			string lt;
 			lex >> lt;
 			lyxtype_ = translateLyXType(lt);
@@ -257,7 +269,8 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		case IL_CONTENTASLABEL:
 			lex >> contentaslabel_;
 			break;
-		case IL_COPYSTYLE: {     // initialize with a known style
+		case IL_COPYSTYLE: {
+			// initialize with a known style
 			docstring style;
 			lex >> style;
 			style = support::subst(style, '_', ' ');
@@ -338,6 +351,12 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		case IL_SPELLCHECK:
 			lex >> spellcheck_;
 			break;
+		case IL_RESETSFONT:
+			lex >> resetsfont_;
+			break;
+		case IL_DISPLAY:
+			lex >> display_;
+			break;
 		case IL_END:
 			getout = true;
 			break;