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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index b48a0625f5..dee7e29f7a 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -31,13 +31,15 @@ namespace lyx {
 
 InsetLayout::InsetLayout() :
 	name_(from_ascii("undefined")), lyxtype_(STANDARD),
-	labelstring_(from_ascii("UNDEFINED")), decoration_(DEFAULT),
-	latextype_(NOLATEXTYPE), font_(sane_font), 
+	labelstring_(from_ascii("UNDEFINED")), contentaslabel_(false),
+	decoration_(DEFAULT), latextype_(NOLATEXTYPE), font_(sane_font), 
 	labelfont_(sane_font), bgcolor_(Color_error), 
 	htmlforcecss_ (false), htmlisblock_(true),
-	multipar_(false), custompars_(true), forceplain_(false), 
-	passthru_(false), needprotect_(false), freespacing_(false), 
-	keepempty_(false), forceltr_(false), intoc_(false)
+	multipar_(true), custompars_(true), forceplain_(false), 
+	passthru_(false), parbreakisnewline_(false), freespacing_(false), 
+	keepempty_(false), forceltr_(false), 
+	needprotect_(false), intoc_(false), spellcheck_(true), 
+	resetsfont_(true), display_(true)
 { 
 	labelfont_.setColor(Color_error);
 }
@@ -74,10 +76,12 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 {
 	enum {
 		IL_BGCOLOR,
+		IL_CONTENTASLABEL,
 		IL_COPYSTYLE,
 		IL_COUNTER,
 		IL_CUSTOMPARS,
 		IL_DECORATION,
+		IL_DISPLAY,
 		IL_FONT,
 		IL_FORCELTR,
 		IL_FORCEPLAIN,
@@ -102,18 +106,24 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		IL_MULTIPAR,
 		IL_NEEDPROTECT,
 		IL_PASSTHRU,
+		IL_PARBREAKISNEWLINE,
 		IL_PREAMBLE,
 		IL_REQUIRES,
+		IL_SPELLCHECK,
+		IL_REFPREFIX,
+		IL_RESETSFONT,
 		IL_END
 	};
 
 
 	LexerKeyword elementTags[] = {
 		{ "bgcolor", IL_BGCOLOR },
+		{ "contentaslabel", IL_CONTENTASLABEL },
 		{ "copystyle", IL_COPYSTYLE }, 
 		{ "counter", IL_COUNTER},
 		{ "custompars", IL_CUSTOMPARS },
 		{ "decoration", IL_DECORATION },
+		{ "display", IL_DISPLAY },
 		{ "end", IL_END },
 		{ "font", IL_FONT },
 		{ "forceltr", IL_FORCELTR },
@@ -138,14 +148,17 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		{ "lyxtype", IL_LYXTYPE },
 		{ "multipar", IL_MULTIPAR },
 		{ "needprotect", IL_NEEDPROTECT },
+		{ "parbreakisnewline", IL_PARBREAKISNEWLINE },
 		{ "passthru", IL_PASSTHRU },
 		{ "preamble", IL_PREAMBLE },
-		{ "requires", IL_REQUIRES }
+		{ "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;
@@ -169,11 +182,21 @@ 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);
 			if (lyxtype_  == NOLYXTYPE)
 				LYXERR0("Unknown LyXType `" << lt << "'.");
+			if (lyxtype_ == CHARSTYLE)
+				multipar_ = false;
 			break;
 		}
 		case IL_LATEXTYPE:  {
@@ -226,10 +249,13 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 			break;
 		case IL_FORCEPLAIN:
 			lex >> forceplain_;
+			readCustomOrPlain = true;
 			break;
 		case IL_PASSTHRU:
 			lex >> passthru_;
-			readCustomOrPlain = true;
+			break;
+		case IL_PARBREAKISNEWLINE:
+			lex >> parbreakisnewline_;
 			break;
 		case IL_KEEPEMPTY:
 			lex >> keepempty_;
@@ -240,7 +266,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		case IL_NEEDPROTECT:
 			lex >> needprotect_;
 			break;
-		case IL_COPYSTYLE: {     // initialize with a known style
+		case IL_CONTENTASLABEL:
+			lex >> contentaslabel_;
+			break;
+		case IL_COPYSTYLE: {
+			// initialize with a known style
 			docstring style;
 			lex >> style;
 			style = support::subst(style, '_', ' ');
@@ -281,6 +311,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		case IL_PREAMBLE:
 			preamble_ = from_utf8(lex.getLongString("EndPreamble"));
 			break;
+		case IL_REFPREFIX:
+			lex >> refprefix_;
+			break;
 		case IL_HTMLTAG:
 			lex >> htmltag_;
 			break;
@@ -315,6 +348,15 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 			requires_.insert(req.begin(), req.end());
 			break;
 		}
+		case IL_SPELLCHECK:
+			lex >> spellcheck_;
+			break;
+		case IL_RESETSFONT:
+			lex >> resetsfont_;
+			break;
+		case IL_DISPLAY:
+			lex >> display_;
+			break;
 		case IL_END:
 			getout = true;
 			break;
@@ -354,7 +396,7 @@ InsetLayout::InsetLyXType translateLyXType(std::string const & str)
 string const & InsetLayout::htmltag() const
 {
 	if (htmltag_.empty())
-		htmltag_ = "span";
+		htmltag_ = multipar_ ? "div" : "span";
 	return htmltag_; 
 }
 
@@ -406,16 +448,6 @@ void InsetLayout::makeDefaultCSS() const
 		htmldefaultstyle_ = 
 				from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
 				mainfontCSS + from_ascii("\n}\n");
-	/* 
-	At present, we do not have default tags, etc, for the label.
-	if (labelfont_ == font_)
-			return;
-	docstring const labelfontCSS = labelfont_.asCSS();
-	if (!labelfontCSS.empty())
-		htmldefaultstyle_ +=
-			from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
-			labelfontCSS + from_ascii("\n}\n");
-	*/
 }