X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlayout.C;h=4067415a567d32e60d50090222d6b6c19291c406;hb=10ba1b8918e7da14334bb5573ce2a707671c8b51;hp=bb43bd72f17fcf46b1be286148444277a4828f6a;hpb=92a24f6f9966dba3a09b625d4d3d81fb2dd888ba;p=lyx.git

diff --git a/src/lyxlayout.C b/src/lyxlayout.C
index bb43bd72f1..4067415a56 100644
--- a/src/lyxlayout.C
+++ b/src/lyxlayout.C
@@ -23,6 +23,7 @@ using lyx::support::subst;
 using lyx::support::trim;
 
 using std::endl;
+using std::string;
 
 
 //  The order of the LayoutTags enum is no more important. [asierra300396]
@@ -32,6 +33,7 @@ enum LayoutTags {
 	LT_ALIGNPOSSIBLE,
 	LT_MARGIN,
 	LT_BOTTOMSEP,
+	LT_COMMANDDEPTH,
 	LT_COPYSTYLE,
 	LT_DEPENDSON,
 	LT_OBSOLETEDBY,
@@ -78,7 +80,11 @@ enum LayoutTags {
 	LT_RIGHTMARGIN,
 	LT_SPACING,
 	LT_TOPSEP,
-	LT_INTITLE
+	LT_TOCLEVEL,
+	LT_INNERTAG,
+	LT_LABELTAG,
+	LT_ITEMTAG,
+	LT_INTITLE // keep this last!
 };
 
 /////////////////////
@@ -115,6 +121,8 @@ LyXLayout::LyXLayout ()
 	free_spacing = false;
 	pass_thru = false;
 	is_environment = false;
+	toclevel = 0;
+	commanddepth = 0;
 }
 
 
@@ -123,51 +131,56 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass)
 {
 	// This table is sorted alphabetically [asierra 30March96]
 	keyword_item layoutTags[] = {
-		{ "align",		LT_ALIGN },
-		{ "alignpossible",	LT_ALIGNPOSSIBLE },
-		{ "bottomsep",		LT_BOTTOMSEP },
-		{ "copystyle",          LT_COPYSTYLE },
-		{ "dependson",		LT_DEPENDSON },
-		{ "end",		LT_END },
-		{ "endlabelstring",	LT_ENDLABELSTRING },
-		{ "endlabeltype",	LT_ENDLABELTYPE },
-		{ "fill_bottom",	LT_FILL_BOTTOM },
-		{ "fill_top",		LT_FILL_TOP },
-		{ "font",		LT_FONT },
-		{ "freespacing",	LT_FREE_SPACING },
-		{ "intitle",            LT_INTITLE },
-		{ "itemsep",		LT_ITEMSEP },
-		{ "keepempty",		LT_KEEPEMPTY },
-		{ "labelbottomsep",	LT_LABEL_BOTTOMSEP },
-		{ "labelcounter",    LT_LABELCOUNTER },
-		{ "labelfont",		LT_LABELFONT },
-		{ "labelindent",	LT_LABELINDENT },
-		{ "labelsep",		LT_LABELSEP },
-		{ "labelstring",	LT_LABELSTRING },
+		{ "align",          LT_ALIGN },
+		{ "alignpossible",  LT_ALIGNPOSSIBLE },
+		{ "bottomsep",      LT_BOTTOMSEP },
+		{ "commanddepth",   LT_COMMANDDEPTH },
+		{ "copystyle",      LT_COPYSTYLE },
+		{ "dependson",      LT_DEPENDSON },
+		{ "end",            LT_END },
+		{ "endlabelstring", LT_ENDLABELSTRING },
+		{ "endlabeltype",   LT_ENDLABELTYPE },
+		{ "fill_bottom",    LT_FILL_BOTTOM },
+		{ "fill_top",       LT_FILL_TOP },
+		{ "font",           LT_FONT },
+		{ "freespacing",    LT_FREE_SPACING },
+		{ "innertag",       LT_INNERTAG },
+		{ "intitle",        LT_INTITLE },
+		{ "itemsep",        LT_ITEMSEP },
+		{ "itemtag",        LT_ITEMTAG },
+		{ "keepempty",      LT_KEEPEMPTY },
+		{ "labelbottomsep", LT_LABEL_BOTTOMSEP },
+		{ "labelcounter",   LT_LABELCOUNTER },
+		{ "labelfont",      LT_LABELFONT },
+		{ "labelindent",    LT_LABELINDENT },
+		{ "labelsep",       LT_LABELSEP },
+		{ "labelstring",    LT_LABELSTRING },
 		{ "labelstringappendix", LT_LABELSTRING_APPENDIX },
-		{ "labeltype",		LT_LABELTYPE },
-		{ "latexfooter",		LT_LATEXFOOTER },
-		{ "latexheader",		LT_LATEXHEADER },
-		{ "latexname",		LT_LATEXNAME },
-		{ "latexparagraph",		LT_LATEXPARAGRAPH },
-		{ "latexparam",		LT_LATEXPARAM },
-		{ "latextype",		LT_LATEXTYPE },
-		{ "leftmargin",		LT_LEFTMARGIN },
-		{ "margin",		LT_MARGIN },
-		{ "needprotect",	LT_NEED_PROTECT },
-		{ "newline",		LT_NEWLINE },
-		{ "nextnoindent",	LT_NEXTNOINDENT },
-		{ "obsoletedby",	LT_OBSOLETEDBY },
-		{ "optionalargs",	LT_OPTARGS },
-		{ "parindent",		LT_PARINDENT },
-		{ "parsep",		LT_PARSEP },
-		{ "parskip",		LT_PARSKIP },
-		{ "passthru",		LT_PASS_THRU },
-		{ "preamble",		LT_PREAMBLE },
-		{ "rightmargin",	LT_RIGHTMARGIN },
-		{ "spacing",		LT_SPACING },
-		{ "textfont",		LT_TEXTFONT },
-		{ "topsep",		LT_TOPSEP }
+		{ "labeltag",       LT_LABELTAG },
+		{ "labeltype",      LT_LABELTYPE },
+		{ "latexfooter",    LT_LATEXFOOTER },
+		{ "latexheader",    LT_LATEXHEADER },
+		{ "latexname",      LT_LATEXNAME },
+		{ "latexparagraph", LT_LATEXPARAGRAPH },
+		{ "latexparam",     LT_LATEXPARAM },
+		{ "latextype",      LT_LATEXTYPE },
+		{ "leftmargin",     LT_LEFTMARGIN },
+		{ "margin",         LT_MARGIN },
+		{ "needprotect",    LT_NEED_PROTECT },
+		{ "newline",        LT_NEWLINE },
+		{ "nextnoindent",   LT_NEXTNOINDENT },
+		{ "obsoletedby",    LT_OBSOLETEDBY },
+		{ "optionalargs",   LT_OPTARGS },
+		{ "parindent",      LT_PARINDENT },
+		{ "parsep",         LT_PARSEP },
+		{ "parskip",        LT_PARSKIP },
+		{ "passthru",       LT_PASS_THRU },
+		{ "preamble",       LT_PREAMBLE },
+		{ "rightmargin",    LT_RIGHTMARGIN },
+		{ "spacing",        LT_SPACING },
+		{ "textfont",       LT_TEXTFONT },
+		{ "toclevel",       LT_TOCLEVEL },
+		{ "topsep",         LT_TOPSEP }
 	};
 
 	bool error = false;
@@ -241,9 +254,8 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass)
 			break;
 
 		case LT_DEPENDSON:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				depends_on_ = lexrc.getString();
-			}
 			break;
 
 		case LT_MARGIN:		// margin style definition.
@@ -273,10 +285,14 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass)
 			intitle = lexrc.next() && lexrc.getInteger();
 			break;
 
+		case LT_TOCLEVEL:
+			lexrc.next();
+			toclevel = lexrc.getInteger();
+			break;
+
 		case LT_OPTARGS:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				optionalargs = lexrc.getInteger();
-			}
 			break;
 
 		case LT_NEED_PROTECT:
@@ -307,6 +323,11 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass)
 				nextnoindent = false;
 			break;
 
+		case LT_COMMANDDEPTH:
+			lexrc.next();
+			commanddepth = lexrc.getInteger();
+			break;
+
 		case LT_LATEXNAME:
 			if (lexrc.next())
 				latexname_ = lexrc.getString();
@@ -314,7 +335,22 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass)
 
 		case LT_LATEXPARAM:
 			if (lexrc.next())
-				latexparam_ = lexrc.getString();
+				latexparam_ = subst(lexrc.getString(), """, "\"");
+			break;
+
+		case LT_INNERTAG:
+			if (lexrc.next())
+				innertag_ = lexrc.getString();
+			break;
+
+		case LT_LABELTAG:
+			if (lexrc.next())
+				labeltag_ = lexrc.getString();
+			break;
+
+		case LT_ITEMTAG:
+			if (lexrc.next())
+				itemtag_ = lexrc.getString();
 			break;
 
 		case LT_PREAMBLE:
@@ -444,7 +480,7 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass)
 	}
 	lexrc.popTable();
 
-	if (labelstring_appendix_.empty())	
+	if (labelstring_appendix_.empty())
 		labelstring_appendix_ = labelstring_;
 	return error;
 }