X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=b9d5b2dc4e6d78aab7d98b30cf3e8ceac07533ae;hb=dae8555234f0e5c8358b91c307d91b219c664617;hp=b6dcf582dd51a9eb6578ba0c16276b2545a573f8;hpb=e5ebe17b92eed6b27f22e444f98d0c6da1db812b;p=lyx.git

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index b6dcf582dd..b9d5b2dc4e 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -34,15 +34,15 @@ namespace lyx {
 InsetLayout::InsetLayout() :
 	name_(from_ascii("undefined")), lyxtype_(STANDARD),
 	labelstring_(from_ascii("UNDEFINED")), contentaslabel_(false),
-	decoration_(DEFAULT), latextype_(NOLATEXTYPE), font_(sane_font), 
+	decoration_(DEFAULT), latextype_(NOLATEXTYPE), font_(inherit_font), 
 	labelfont_(sane_font), bgcolor_(Color_error), 
 	htmlforcecss_ (false), htmlisblock_(true),
 	multipar_(true), custompars_(true), forceplain_(false), 
 	passthru_(false), parbreakisnewline_(false), freespacing_(false), 
-	keepempty_(false), forceltr_(false), 
+	keepempty_(false), forceltr_(false), forceownlines_(false),
 	needprotect_(false), intoc_(false), spellcheck_(true), 
-	resetsfont_(true), display_(true), forcelocalfontswitch_(false)
-{ 
+	resetsfont_(false), display_(true), forcelocalfontswitch_(false)
+{
 	labelfont_.setColor(Color_error);
 }
 
@@ -89,6 +89,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		IL_FONT,
 		IL_FORCE_LOCAL_FONT_SWITCH,
 		IL_FORCELTR,
+		IL_FORCEOWNLINES,
 		IL_FORCEPLAIN,
 		IL_FREESPACING,
 		IL_HTMLTAG,
@@ -109,6 +110,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		IL_LATEXTYPE,
 		IL_LEFTDELIM,
 		IL_LYXTYPE,
+		IL_OBSOLETEDBY,
 		IL_KEEPEMPTY,
 		IL_MULTIPAR,
 		IL_NEEDPROTECT,
@@ -139,6 +141,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		{ "font", IL_FONT },
 		{ "forcelocalfontswitch", IL_FORCE_LOCAL_FONT_SWITCH },
 		{ "forceltr", IL_FORCELTR },
+		{ "forceownlines", IL_FORCEOWNLINES },
 		{ "forceplain", IL_FORCEPLAIN },
 		{ "freespacing", IL_FREESPACING },
 		{ "htmlattr", IL_HTMLATTR },
@@ -162,6 +165,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		{ "lyxtype", IL_LYXTYPE },
 		{ "multipar", IL_MULTIPAR },
 		{ "needprotect", IL_NEEDPROTECT },
+		{ "obsoletedby", IL_OBSOLETEDBY },
 		{ "parbreakisnewline", IL_PARBREAKISNEWLINE },
 		{ "passthru", IL_PASSTHRU },
 		{ "preamble", IL_PREAMBLE },
@@ -256,6 +260,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		case IL_FORCELTR:
 			lex >> forceltr_;
 			break;
+		case IL_FORCEOWNLINES:
+			lex >> forceownlines_;
+			break;
 		case IL_INTOC:
 			lex >> intoc_;
 			break;
@@ -314,6 +321,37 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 				name_ = tmpname;
 			} else {
 				LYXERR0("Cannot copy unknown InsetLayout `"
+					<< style << "' to InsetLayout `"
+					<< name() << "'\n"
+					<< "All InsetLayouts so far:");
+				TextClass::InsetLayouts::const_iterator lit = 
+						tclass.insetLayouts().begin();
+				TextClass::InsetLayouts::const_iterator len = 
+						tclass.insetLayouts().end();
+				for (; lit != len; ++lit)
+					lyxerr << lit->second.name() << "\n";
+			}
+			break;
+		}
+		case IL_OBSOLETEDBY: {
+			docstring style;
+			lex >> style;
+			style = support::subst(style, '_', ' ');
+
+			// We don't want to apply the algorithm in DocumentClass::insetLayout()
+			// here. So we do it the long way.
+			TextClass::InsetLayouts::const_iterator it =
+					tclass.insetLayouts().find(style);
+			if (it != tclass.insetLayouts().end()) {
+				docstring const tmpname = name_;
+				this->operator=(it->second);
+				name_ = tmpname;
+				if (obsoleted_by().empty())
+					obsoleted_by_ = style;
+			} else {
+				LYXERR0("Cannot replace InsetLayout `"
+					<< name()
+					<< "' with unknown InsetLayout `"
 					<< style << "'\n"
 					<< "All InsetLayouts so far:");
 				TextClass::InsetLayouts::const_iterator lit = 
@@ -336,8 +374,10 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		case IL_RESETARGS:
 			bool reset;
 			lex >> reset;
-			if (reset)
+			if (reset) {
 				latexargs_.clear();
+				postcommandargs_.clear();
+			}
 			break;
 		case IL_ARGUMENT:
 			readArgument(lex);
@@ -518,6 +558,7 @@ void InsetLayout::readArgument(Lexer & lex)
 	arg.labelfont = inherit_font;
 	string nr;
 	lex >> nr;
+	bool const postcmd = support::prefixIs(nr, "post:");
 	while (!finished && lex.isOK() && !error) {
 		lex.next();
 		string const tok = support::ascii_lowercase(lex.getString());
@@ -548,6 +589,9 @@ void InsetLayout::readArgument(Lexer & lex)
 			arg.rdelim = lex.getDocString();
 			arg.rdelim = support::subst(arg.rdelim,
 						    from_ascii("<br/>"), from_ascii("\n"));
+		} else if (tok == "defaultarg") {
+			lex.next();
+			arg.defaultarg = lex.getDocString();
 		} else if (tok == "presetarg") {
 			lex.next();
 			arg.presetarg = lex.getDocString();
@@ -571,15 +615,28 @@ void InsetLayout::readArgument(Lexer & lex)
 	}
 	if (arg.labelstring.empty())
 		LYXERR0("Incomplete Argument definition!");
+	else if (postcmd)
+		postcommandargs_[nr] = arg;
 	else
 		latexargs_[nr] = arg;
 }
 
+
+Layout::LaTeXArgMap InsetLayout::args() const
+{
+	Layout::LaTeXArgMap args = latexargs_;
+	if (!postcommandargs_.empty())
+		args.insert(postcommandargs_.begin(), postcommandargs_.end());
+	return args;
+}
+
+
 unsigned int InsetLayout::optArgs() const
 {
 	unsigned int nr = 0;
-	Layout::LaTeXArgMap::const_iterator it = latexargs_.begin();
-	for (; it != latexargs_.end(); ++it) {
+	Layout::LaTeXArgMap const args = InsetLayout::args();
+	Layout::LaTeXArgMap::const_iterator it = args.begin();
+	for (; it != args.end(); ++it) {
 		if (!(*it).second.mandatory)
 			++nr;
 	}
@@ -590,8 +647,9 @@ unsigned int InsetLayout::optArgs() const
 unsigned int InsetLayout::requiredArgs() const
 {
 	unsigned int nr = 0;
-	Layout::LaTeXArgMap::const_iterator it = latexargs_.begin();
-	for (; it != latexargs_.end(); ++it) {
+	Layout::LaTeXArgMap const args = InsetLayout::args();
+	Layout::LaTeXArgMap::const_iterator it = args.begin();
+	for (; it != args.end(); ++it) {
 		if ((*it).second.mandatory)
 			++nr;
 	}