X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flayout.C;h=58fd7f1bb93ec9b31cc1b7a8965196533bbf3521;hb=9f7498dbdf16f61cd5c9ee82e0cb6576d2bf620f;hp=bad3b274118812ec634e630be50b5cb6c8520857;hpb=cff99d6de19ea170ab8e8928ac9f3de9337ecb90;p=lyx.git

diff --git a/src/layout.C b/src/layout.C
index bad3b27411..58fd7f1bb9 100644
--- a/src/layout.C
+++ b/src/layout.C
@@ -188,7 +188,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
 	while (!finished && lexrc.IsOK() && !error) {
 		int le = lexrc.lex();
 		// See comment in lyxrc.C.
-		switch(le) {
+		switch (le) {
 		case LyXLex::LEX_FEOF:
 			continue; 
 
@@ -198,7 +198,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
 			continue; 
 		default: break;
 		}
-		switch(static_cast<LayoutTags>(le)) {
+		switch (static_cast<LayoutTags>(le)) {
 		case LT_END:		// end of structure
 			finished = true;
 			break;
@@ -429,7 +429,7 @@ void LyXLayout::readAlign(LyXLex & lexrc)
 		return; 
 	default: break;
 	};
-	switch(static_cast<AlignTags>(le)) {
+	switch (static_cast<AlignTags>(le)) {
 	case AT_BLOCK:
 		align = LYX_ALIGN_BLOCK;
 		break;
@@ -598,19 +598,25 @@ void LyXLayout::readLabelType(LyXLex & lexrc)
 	}
 }
 
-static keyword_item endlabelTypeTags[] = {
+
+namespace {
+
+keyword_item endlabelTypeTags[] = {
 	{ "box",	END_LABEL_BOX },
 	{ "filled_box",	END_LABEL_FILLED_BOX },
 	{ "no_label",	END_LABEL_NO_LABEL },
 	{ "static",     END_LABEL_STATIC }
 };
 
+} // namespace anon
+
+
 void LyXLayout::readEndLabelType(LyXLex & lexrc)
 {
 	pushpophelper pph(lexrc, endlabelTypeTags,
 			  END_LABEL_ENUM_LAST-END_LABEL_ENUM_FIRST+1);
 	int le = lexrc.lex();
-	switch(le) {
+	switch (le) {
 	case LyXLex::LEX_UNDEF:
 		lexrc.printError("Unknown labeltype tag `$$Token'");
 		break;
@@ -641,7 +647,7 @@ void LyXLayout::readMargin(LyXLex & lexrc)
 	pushpophelper pph(lexrc, marginTags, MARGIN_RIGHT_ADDRESS_BOX);
 
 	int le = lexrc.lex();
-	switch(le) {
+	switch (le) {
 	case LyXLex::LEX_UNDEF:
 		lexrc.printError("Unknown margin type tag `$$Token'");
 		return;
@@ -710,13 +716,13 @@ void LyXLayout::readSpacing(LyXLex & lexrc)
 
 	pushpophelper pph(lexrc, spacingTags, ST_OTHER);
 	int le = lexrc.lex();
-	switch(le) {
+	switch (le) {
 	case LyXLex::LEX_UNDEF:
 		lexrc.printError("Unknown spacing token `$$Token'");
 		return;
 	default: break;
 	}
-	switch(static_cast<SpacingTags>(le)) {
+	switch (static_cast<SpacingTags>(le)) {
 	case ST_SPACING_SINGLE:
 		spacing.set(Spacing::Single);
 		break;
@@ -835,7 +841,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 	// parsing
 	while (lexrc.IsOK() && !error) {
 		int le = lexrc.lex();
-		switch(le) {
+		switch (le) {
 		case LyXLex::LEX_FEOF:
 			continue; 
 
@@ -845,7 +851,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 			continue; 
 		default: break;
 		}
-		switch(static_cast<TextClassTags>(le)) {
+		switch (static_cast<TextClassTags>(le)) {
 		case TC_OUTPUTTYPE:   // output type definition
 			readOutputType(lexrc);
 			break;
@@ -901,7 +907,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 			
 		case TC_SIDES:
 			if (lexrc.next()) {
-				switch(lexrc.GetInteger()) {
+				switch (lexrc.GetInteger()) {
 				case 1: sides_ = OneSide; break;
 				case 2: sides_ = TwoSides; break;
 				default:
@@ -1003,7 +1009,7 @@ void LyXTextClass::readOutputType(LyXLex & lexrc)
 	pushpophelper pph(lexrc, outputTypeTags, LITERATE);
 
 	int le = lexrc.lex();
-	switch(le) {
+	switch (le) {
 	case LyXLex::LEX_UNDEF:
 		lexrc.printError("Unknown output type `$$Token'");
 		return;
@@ -1053,7 +1059,7 @@ void LyXTextClass::readMaxCounter(LyXLex & lexrc)
 
 	pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV);
 	int le = lexrc.lex();
-	switch(le) {
+	switch (le) {
 	case LyXLex::LEX_UNDEF:
 		lexrc.printError("Unknown MaxCounter tag `$$Token'");
 		return; 
@@ -1237,7 +1243,7 @@ LyXTextClassList::NumberOfLayout(LyXTextClassList::size_type textclass,
 				 string const & name) const
 {
 	classlist[textclass].load();
-	for(unsigned int i = 0; i < classlist[textclass].numLayouts(); ++i) {
+	for (unsigned int i = 0; i < classlist[textclass].numLayouts(); ++i) {
 		if (classlist[textclass][i].name() == name)
 			return make_pair(true, i);
 	}