[patch] layout problems again

[Georg Baum]

Jean-Marc,

it looks like the numarticle fix made a bug in the label handling visible: 
View->Navigate contains lines like "@[EMAIL PROTECTED] title" 
for subsection*, i.e. the labelstring is not ignored even if we have 
label = nolabel in the layout file. The attached patch fixes that, but I 
am not sure if it is correct because I don't know this part well.


Georg

Index: src/buffer_funcs.C
===================================================================
--- src/buffer_funcs.C	(Revision 13612)
+++ src/buffer_funcs.C	(Arbeitskopie)
@@ -496,7 +496,9 @@ void setCounter(Buffer const & buf, ParI
 		}
 
 		par.params().labelString(s);
-	} else
+	} else if (layout->labeltype == LABEL_NO_LABEL)
+		par.params().labelString(string());
+	else
 		par.params().labelString(buf.B_(layout->labelstring()));
 }