X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLayout.cpp;h=ff123dc32ef74c84eb76b00956dfdec4b67026c3;hb=5887601f6836ebf6f2b16cc7587a98cc3aa6c391;hp=bfd6863397b493a186f57dce4c0747fc50e7a1ee;hpb=149e1ccc02368f3c7089bd2742b2bd28990904d8;p=lyx.git

diff --git a/src/Layout.cpp b/src/Layout.cpp
index bfd6863397..ff123dc32e 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -138,7 +138,7 @@ enum LayoutTags {
 	LT_REFPREFIX,
 	LT_RESETARGS,
 	LT_RESUMECOUNTER,
-	LT_STEPMASTERCOUNTER,
+	LT_STEPPARENTCOUNTER,
 	LT_RIGHTDELIM,
 	LT_FORCELOCAL,
 	LT_TOGGLE_INDENT,
@@ -156,7 +156,7 @@ Layout::Layout()
 	margintype = MARGIN_STATIC;
 	latextype = LATEX_PARAGRAPH;
 	resumecounter = false;
-	stepmastercounter = false;
+	stepparentcounter = false;
 	intitle = false;
 	inpreamble = false;
 	needprotect = false;
@@ -327,7 +327,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
 		{ "rightmargin",    LT_RIGHTMARGIN },
 		{ "spacing",        LT_SPACING },
 		{ "spellcheck",     LT_SPELLCHECK },
-		{ "stepmastercounter",  LT_STEPMASTERCOUNTER },
+		{ "stepparentcounter",  LT_STEPPARENTCOUNTER },
 		{ "textfont",       LT_TEXTFONT },
 		{ "toclevel",       LT_TOCLEVEL },
 		{ "toggleindent",   LT_TOGGLE_INDENT },
@@ -447,8 +447,8 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
 			lex >> resumecounter;
 			break;
 
-		case LT_STEPMASTERCOUNTER:
-			lex >> stepmastercounter;
+		case LT_STEPPARENTCOUNTER:
+			lex >> stepparentcounter;
 			break;
 
 		case LT_ARGUMENT:
@@ -1400,7 +1400,7 @@ void Layout::write(ostream & os) const
 	      "\tInPreamble " << inpreamble << "\n"
 	      "\tTocLevel " << toclevel << "\n"
 	      "\tResumeCounter " << resumecounter << "\n"
-	     "\tStepMasterCounter " << stepmastercounter << '\n';
+	      "\tStepParentCounter " << stepparentcounter << '\n';
 	// ResetArgs does not make sense here
 	for (LaTeXArgMap::const_iterator it = latexargs_.begin();
 	     it != latexargs_.end(); ++it)
@@ -1885,7 +1885,7 @@ string const & Layout::docbookattr() const
 }
 
 
-bool isValidTagType(std::string type)
+bool isValidTagType(std::string const & type)
 {
 	return !(type.empty() || (type != "block" && type != "paragraph" && type != "inline"));
 }