X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.cpp;h=3c1a9bd955515d321e847e1a7c408a50e59de9f8;hb=6f8298b1658106c6536a6532af27822e74d41649;hp=3d1d78136018f859af6d41d801ab3854443b37c1;hpb=1fb0a5f436a861175f7c7f719b936f51178f5ad6;p=lyx.git

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 3d1d781360..3c1a9bd955 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -40,6 +40,8 @@ enum LayoutTags {
 	LT_ALIGN = 1,
 	LT_ALIGNPOSSIBLE,
 	LT_ARGUMENT,
+	LT_AUTONESTS,
+	LT_AUTONESTEDBY,
 	LT_MARGIN,
 	LT_BOTTOMSEP,
 	LT_CATEGORY,
@@ -72,6 +74,8 @@ enum LayoutTags {
 	LT_LATEXTYPE,
 	LT_LEFTDELIM,
 	LT_LEFTMARGIN,
+	LT_NEED_CPROTECT,
+	LT_NEED_MBOXPROTECT,
 	LT_NEED_PROTECT,
 	LT_NEWLINE,
 	LT_NEXTNOINDENT,
@@ -95,7 +99,7 @@ enum LayoutTags {
 	LT_HTMLITEM,
 	LT_HTMLITEMATTR,
 	LT_HTMLLABEL,
-	LT_HTMLLABELATTR, 
+	LT_HTMLLABELATTR,
 	LT_HTMLLABELFIRST,
 	LT_HTMLPREAMBLE,
 	LT_HTMLSTYLE,
@@ -118,7 +122,7 @@ enum LayoutTags {
 /////////////////////
 
 Layout::Layout()
-	: add_to_toc_(false), is_toc_caption_(false)
+	: add_to_toc_(false), is_toc_caption_(true)
 {
 	unknown_ = false;
 	margintype = MARGIN_STATIC;
@@ -128,6 +132,8 @@ Layout::Layout()
 	intitle = false;
 	inpreamble = false;
 	needprotect = false;
+	needcprotect = false;
+	needmboxprotect = false;
 	keepempty = false;
 	font = inherit_font;
 	labelfont = inherit_font;
@@ -191,6 +197,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 		{ "align",          LT_ALIGN },
 		{ "alignpossible",  LT_ALIGNPOSSIBLE },
 		{ "argument",       LT_ARGUMENT },
+		{ "autonests",      LT_AUTONESTS },
 		{ "babelpreamble",  LT_BABELPREAMBLE },
 		{ "bottomsep",      LT_BOTTOMSEP },
 		{ "category",       LT_CATEGORY },
@@ -217,6 +224,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 		{ "innertag",       LT_INNERTAG },
 		{ "inpreamble",     LT_INPREAMBLE },
 		{ "intitle",        LT_INTITLE },
+		{ "isautonestedby", LT_AUTONESTEDBY },
 		{ "istoccaption",   LT_ISTOCCAPTION },
 		{ "itemcommand",    LT_ITEMCOMMAND },
 		{ "itemsep",        LT_ITEMSEP },
@@ -238,6 +246,8 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 		{ "leftdelim",      LT_LEFTDELIM },
 		{ "leftmargin",     LT_LEFTMARGIN },
 		{ "margin",         LT_MARGIN },
+		{ "needcprotect",    LT_NEED_CPROTECT },
+		{ "needmboxprotect", LT_NEED_MBOXPROTECT },
 		{ "needprotect",    LT_NEED_PROTECT },
 		{ "newline",        LT_NEWLINE },
 		{ "nextnoindent",   LT_NEXTNOINDENT },
@@ -283,7 +293,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 			error = true;
 			continue;
 
-		default: 
+		default:
 			break;
 		}
 		switch (static_cast<LayoutTags>(le)) {
@@ -328,7 +338,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 				if (obsoleted_by().empty())
 					obsoleted_by_ = style;
 			} else {
-				LYXERR0("Cannot replace with unknown style `" 
+				LYXERR0("Cannot replace with unknown style `"
 					<< style << '\'');
 
 				//lex.printError("Cannot replace with"
@@ -370,6 +380,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 				latexargs_.clear();
 				itemargs_.clear();
 				postcommandargs_.clear();
+				listpreamble_.clear();
 			}
 			break;
 
@@ -389,6 +400,14 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 			lex >> needprotect;
 			break;
 
+		case LT_NEED_CPROTECT:
+			lex >> needcprotect;
+			break;
+
+		case LT_NEED_MBOXPROTECT:
+			lex >> needmboxprotect;
+			break;
+
 		case LT_KEEPEMPTY:
 			lex >> keepempty;
 			break;
@@ -536,7 +555,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 		case LT_ALIGN:
 			readAlign(lex);
 			break;
-	
+
 		case LT_ALIGNPOSSIBLE:
 			readAlignPossible(lex);
 			break;
@@ -545,23 +564,19 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 			// FIXME: this means LT_LABELSTRING_APPENDIX may only
 			// occur after LT_LABELSTRING
 			lex >> labelstring_;
-			labelstring_ = trim(labelstring_);
 			labelstring_appendix_ = labelstring_;
 			break;
 
 		case LT_ENDLABELSTRING:
-			lex >> endlabelstring_;	
-			endlabelstring_ = trim(endlabelstring_);
+			lex >> endlabelstring_;
 			break;
 
 		case LT_LABELSTRING_APPENDIX:
-			lex >> labelstring_appendix_;	
-			labelstring_appendix_ = trim(labelstring_appendix_);
+			lex >> labelstring_appendix_;
 			break;
 
 		case LT_LABELCOUNTER:
-			lex >> counter;	
-			counter = trim(counter);
+			lex >> counter;
 			break;
 
 		case LT_PAR_GROUP:
@@ -595,7 +610,31 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 			requires_.insert(req.begin(), req.end());
 			break;
 		}
-			
+
+		case LT_AUTONESTS: {
+			docstring autonest = lex.getLongString(from_ascii("EndAutoNests"));
+			autonest = subst(autonest, from_ascii("\n"), docstring());
+			autonest = subst(autonest, from_ascii("\t"), docstring());
+			autonest = subst(autonest, from_ascii("\""), docstring());
+			autonest = subst(autonest, '_', ' ');
+			vector<docstring> const autonests =
+				getVectorFromString(autonest, from_ascii(","), false, true);
+			autonests_.insert(autonests.begin(), autonests.end());
+			break;
+		}
+
+		case LT_AUTONESTEDBY: {
+			docstring autonest = lex.getLongString(from_ascii("EndIsAutoNestedBy"));
+			autonest = subst(autonest, from_ascii("\n"), docstring());
+			autonest = subst(autonest, from_ascii("\t"), docstring());
+			autonest = subst(autonest, from_ascii("\""), docstring());
+			autonest = subst(autonest, '_', ' ');
+			vector<docstring> const autonests =
+				getVectorFromString(autonest, from_ascii(","), false, true);
+			autonested_by_.insert(autonests.begin(), autonests.end());
+			break;
+		}
+
 		case LT_REFPREFIX: {
 			docstring arg;
 			lex >> arg;
@@ -609,7 +648,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 		case LT_HTMLTAG:
 			lex >> htmltag_;
 			break;
-	
+
 		case LT_HTMLATTR:
 			lex >> htmlattr_;
 			break;
@@ -617,23 +656,23 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 		case LT_HTMLITEM:
 			lex >> htmlitemtag_;
 			break;
-	
+
 		case LT_HTMLITEMATTR:
 			lex >> htmlitemattr_;
 			break;
-	
+
 		case LT_HTMLLABEL:
 			lex >> htmllabeltag_;
 			break;
 
-		case LT_HTMLLABELATTR: 
+		case LT_HTMLLABELATTR:
 			lex >> htmllabelattr_;
 			break;
 
 		case LT_HTMLLABELFIRST:
 			lex >> htmllabelfirst_;
 			break;
-			
+
 		case LT_HTMLSTYLE:
 			htmlstyle_ = lex.getLongString(from_ascii("EndHTMLStyle"));
 			break;
@@ -645,7 +684,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 		case LT_HTMLPREAMBLE:
 			htmlpreamble_ = lex.getLongString(from_ascii("EndPreamble"));
 			break;
-		
+
 		case LT_HTMLTITLE:
 			lex >> htmltitle_;
 			break;
@@ -974,18 +1013,22 @@ void Layout::readArgument(Lexer & lex)
 	latexarg arg;
 	// writeArgument() makes use of these default values
 	arg.mandatory = false;
+	arg.nodelims = false;
 	arg.autoinsert = false;
 	arg.insertcotext = false;
+	arg.insertonnewline = false;
 	bool error = false;
 	bool finished = false;
 	arg.font = inherit_font;
 	arg.labelfont = inherit_font;
 	arg.is_toc_caption = false;
 	arg.passthru = PT_INHERITED;
+	arg.free_spacing = false;
 	string id;
 	lex >> id;
 	bool const itemarg = prefixIs(id, "item:");
 	bool const postcmd = prefixIs(id, "post:");
+	bool const listpreamble = prefixIs(id, "listpreamble:");
 
 	while (!finished && lex.isOK() && !error) {
 		lex.next();
@@ -1035,6 +1078,9 @@ void Layout::readArgument(Lexer & lex)
 		} else if (tok == "decoration") {
 			lex.next();
 			arg.decoration = lex.getString();
+		} else if (tok == "newlinecmd") {
+			lex.next();
+			arg.newlinecmd = lex.getString();
 		} else if (tok == "font") {
 			arg.font = lyxRead(lex, arg.font);
 		} else if (tok == "labelfont") {
@@ -1054,6 +1100,9 @@ void Layout::readArgument(Lexer & lex)
 		} else if (tok == "istoccaption") {
 			lex.next();
 			arg.is_toc_caption = lex.getBool();
+		} else if (tok == "freespacing") {
+			lex.next();
+			arg.free_spacing = lex.getBool();
 		} else {
 			lex.printError("Unknown tag");
 			error = true;
@@ -1065,7 +1114,11 @@ void Layout::readArgument(Lexer & lex)
 		itemargs_[id] = arg;
 	else if (postcmd)
 		postcommandargs_[id] = arg;
-	else
+	else if (listpreamble) {
+		// list preamble has no delimiters by default
+		arg.nodelims = true;
+		listpreamble_[id] = arg;
+	} else
 		latexargs_[id] = arg;
 }
 
@@ -1101,6 +1154,8 @@ void writeArgument(ostream & os, string const & id, Layout::latexarg const & arg
 		os << "\t\tRequires \"" << arg.requires << "\"\n";
 	if (!arg.decoration.empty())
 		os << "\t\tDecoration \"" << arg.decoration << "\"\n";
+	if (!arg.newlinecmd.empty())
+		os << "\t\tNewlineCmd \"" << arg.newlinecmd << "\"\n";
 	if (arg.font != inherit_font)
 		lyxWrite(os, arg.font, "Font", 2);
 	if (arg.labelfont != inherit_font)
@@ -1118,6 +1173,8 @@ void writeArgument(ostream & os, string const & id, Layout::latexarg const & arg
 	}
 	if (!arg.pass_thru_chars.empty())
 		os << "\t\tPassThruChars \"" << to_utf8(arg.pass_thru_chars) << "\"\n";
+	if (arg.free_spacing)
+		os << "\t\tFreeSpacing " << arg.free_spacing << "\n";
 	os << "\tEndArgument\n";
 }
 
@@ -1187,7 +1244,12 @@ void Layout::write(ostream & os) const
 	for (LaTeXArgMap::const_iterator it = postcommandargs_.begin();
 	     it != postcommandargs_.end(); ++it)
 		writeArgument(os, it->first, it->second);
+	for (LaTeXArgMap::const_iterator it = listpreamble_.begin();
+	     it != listpreamble_.end(); ++it)
+		writeArgument(os, it->first, it->second);
 	os << "\tNeedProtect " << needprotect << "\n"
+	      "\tNeedCProtect " << needcprotect << "\n"
+	      "\tNeedMBoxProtect " << needmboxprotect << "\n"
 	      "\tKeepEmpty " << keepempty << '\n';
 	if (labelfont == font)
 		lyxWrite(os, font, "Font", 1);
@@ -1391,6 +1453,26 @@ void Layout::write(ostream & os) const
 		}
 		os << '\n';
 	}
+	if (!autonests_.empty()) {
+		os << "\tAutoNests\n\t";
+		for (set<docstring>::const_iterator it = autonests_.begin();
+		     it != autonests_.end(); ++it) {
+			if (it != autonests_.begin())
+				os << ',';
+			os << to_utf8(*it);
+		}
+		os << "\n\tEndAutoNests\n";
+	}
+	if (!autonested_by_.empty()) {
+		os << "\tIsAutoNestedBy\n\t\t";
+		for (set<docstring>::const_iterator it = autonested_by_.begin();
+		     it != autonested_by_.end(); ++it) {
+			if (it != autonested_by_.begin())
+				os << ',';
+			os << to_utf8(*it);
+		}
+		os << "\n\tEndIsAutoNestedBy\n";
+	}
 	if (refprefix.empty())
 		os << "\tRefPrefix OFF\n";
 	else
@@ -1427,7 +1509,7 @@ void Layout::write(ostream & os) const
 bool Layout::hasArgs() const
 {
 	return !latexargs_.empty() || !postcommandargs_.empty() ||
-		!itemargs_.empty();
+		!itemargs_.empty() || !listpreamble_.empty();
 }
 
 
@@ -1436,6 +1518,8 @@ Layout::LaTeXArgMap Layout::args() const
 	LaTeXArgMap args = latexargs_;
 	if (!postcommandargs_.empty())
 		args.insert(postcommandargs_.begin(), postcommandargs_.end());
+	if (!listpreamble_.empty())
+		args.insert(listpreamble_.begin(), listpreamble_.end());
 	if (!itemargs_.empty())
 		args.insert(itemargs_.begin(), itemargs_.end());
 	return args;
@@ -1476,56 +1560,51 @@ int Layout::requiredArgs() const
 }
 
 
-string const & Layout::htmltag() const 
-{ 
+string const & Layout::htmltag() const
+{
 	if (htmltag_.empty())
 		htmltag_ =  "div";
 	return htmltag_;
 }
 
 
-string const & Layout::htmlattr() const 
-{ 
+string const & Layout::htmlattr() const
+{
 	if (htmlattr_.empty())
 		htmlattr_ = "class=\"" + defaultCSSClass() + "\"";
-	return htmlattr_; 
+	return htmlattr_;
 }
 
 
-string const & Layout::htmlitemtag() const 
-{ 
+string const & Layout::htmlitemtag() const
+{
 	if (htmlitemtag_.empty())
 		htmlitemtag_ = "div";
-	return htmlitemtag_; 
+	return htmlitemtag_;
 }
 
 
-string const & Layout::htmlitemattr() const 
-{ 
+string const & Layout::htmlitemattr() const
+{
 	if (htmlitemattr_.empty())
 		htmlitemattr_ = "class=\"" + defaultCSSItemClass() + "\"";
-	return htmlitemattr_; 
+	return htmlitemattr_;
 }
 
 
-string const & Layout::htmllabeltag() const 
-{ 
-	if (htmllabeltag_.empty()) {
-		if (labeltype != LABEL_ABOVE &&
-		    labeltype != LABEL_CENTERED)
+string const & Layout::htmllabeltag() const
+{
+	if (htmllabeltag_.empty())
 			htmllabeltag_ = "span";
-		else
-			htmllabeltag_ = "div";
-	}
-	return htmllabeltag_; 
+	return htmllabeltag_;
 }
 
 
-string const & Layout::htmllabelattr() const 
-{ 
+string const & Layout::htmllabelattr() const
+{
 	if (htmllabelattr_.empty())
 		htmllabelattr_ = "class=\"" + defaultCSSLabelClass() + "\"";
-	return htmllabelattr_; 
+	return htmllabelattr_;
 }
 
 
@@ -1533,7 +1612,7 @@ docstring Layout::htmlstyle() const
 {
 	if (!htmlstyle_.empty() && !htmlforcecss_)
 		return htmlstyle_;
-	if (htmldefaultstyle_.empty()) 
+	if (htmldefaultstyle_.empty())
 		makeDefaultCSS();
 	docstring retval = htmldefaultstyle_;
 	if (!htmlstyle_.empty())
@@ -1543,7 +1622,7 @@ docstring Layout::htmlstyle() const
 
 
 string Layout::defaultCSSClass() const
-{ 
+{
 	if (!defaultcssclass_.empty())
 		return defaultcssclass_;
 	docstring d;
@@ -1578,19 +1657,19 @@ string makeMarginValue(char const * side, double d)
 	return os.str();
 }
 
-}
+} // namespace
 
 
 void Layout::makeDefaultCSS() const
 {
 	// this never needs to be redone, since reloading layouts will
 	// wipe out what we did before.
-	if (!htmldefaultstyle_.empty()) 
+	if (!htmldefaultstyle_.empty())
 		return;
-	
+
 	// main font
 	htmldefaultstyle_ = font.asCSS();
-	
+
 	// bottom margins
 	string tmp;
 	if (topsep > 0)
@@ -1598,7 +1677,7 @@ void Layout::makeDefaultCSS() const
 	if (bottomsep > 0)
 		tmp += makeMarginValue("bottom", bottomsep);
 	if (!leftmargin.empty()) {
-		// we can't really do what LyX does with the margin, so 
+		// we can't really do what LyX does with the margin, so
 		// we'll just figure out how many characters it is
 		int const len = leftmargin.length();
 		tmp += makeMarginValue("left", len);
@@ -1607,7 +1686,7 @@ void Layout::makeDefaultCSS() const
 		int const len = rightmargin.length();
 		tmp += makeMarginValue("right", len);
 	}
-		
+
 	if (!tmp.empty()) {
 		if (!htmldefaultstyle_.empty())
 			htmldefaultstyle_ += from_ascii("\n");
@@ -1622,21 +1701,21 @@ void Layout::makeDefaultCSS() const
 
 	// wrap up what we have, if anything
 	if (!htmldefaultstyle_.empty())
-		htmldefaultstyle_ = 
+		htmldefaultstyle_ =
 			from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
 			htmldefaultstyle_ + from_ascii("\n}\n");
-	
+
 	if (labeltype == LABEL_NO_LABEL || htmllabeltag() == "NONE")
 		return;
-	
+
 	docstring labelCSS;
-	
+
 	// label font
 	if (labelfont != font)
 		labelCSS = labelfont.asCSS() + from_ascii("\n");
 	if (labeltype == LABEL_CENTERED)
 		labelCSS += from_ascii("text-align: center;\n");
-	
+
 	if (!labelCSS.empty())
 		htmldefaultstyle_ +=
 			from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +