X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlayout.C;h=0a95c43811397b8ab0be3de73fefdd4746959213;hb=2523638092e2024bac408eee98ad2094bc4e4089;hp=ca31bee99ced9f6a1830ab3d3905b1cd56f67ccc;hpb=11953d373474f9a82737c66c275f4b85c0a3a028;p=lyx.git

diff --git a/src/lyxlayout.C b/src/lyxlayout.C
index ca31bee99c..0a95c43811 100644
--- a/src/lyxlayout.C
+++ b/src/lyxlayout.C
@@ -121,7 +121,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
 		{ "alignpossible",	LT_ALIGNPOSSIBLE },
 		{ "bottomsep",		LT_BOTTOMSEP },
 		{ "copystyle",          LT_COPYSTYLE },
-		{ "dependson", 		LT_DEPENDSON },
+		{ "dependson",		LT_DEPENDSON },
 		{ "end",		LT_END },
 		{ "endlabelstring",	LT_ENDLABELSTRING },
 		{ "endlabeltype",	LT_ENDLABELTYPE },
@@ -221,7 +221,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
 					if (obsoleted_by().empty())
 						obsoleted_by_ = style;
 				} else {
-					lyxerr << "Cannot replace with unknown style `" << style << "'" << endl;
+					lyxerr << "Cannot replace with unknown style `" << style << '\'' << endl;
 
 					//lexrc.printError("Cannot replace with"
 					//		 " unknown style "
@@ -230,7 +230,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
 			}
 			break;
 
-		case LT_DEPENDSON: 
+		case LT_DEPENDSON:
 			if (lexrc.next()) {
 				depends_on_ = lexrc.getString();
 			}
@@ -249,7 +249,9 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
 			break;
 
 		case LT_OPTARGS:
-			optionalargs = lexrc.next() && lexrc.getInteger();
+			if (lexrc.next()) {
+				optionalargs = lexrc.getInteger();
+			}
 			break;
 
 		case LT_NEED_PROTECT: