X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=ed4b133ff53f4fc34fe994bf16264615979815e0;hb=0fa93fe55a85e901215ea783e3baf2b465fb67bd;hp=6adbb515538b6ec22d7213b804baf6178018ddf4;hpb=c75674999127c58b5132e3ab713bd91bd88e75c6;p=lyx.git

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 6adbb51553..ed4b133ff5 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -182,7 +182,11 @@ void Text::setLayout(pit_type start, pit_type end,
 
 	for (pit_type pit = start; pit != end; ++pit) {
 		Paragraph & par = pars_[pit];
-		par.applyLayout(lyxlayout);
+		// Is this a separating paragraph? If so,
+		// this needs to be standard layout
+		bool const is_separator = par.size() == 1
+				&& par.isEnvSeparator(0);
+		par.applyLayout(is_separator ? bp.documentClass().defaultLayout() : lyxlayout);
 		if (lyxlayout.margintype == MARGIN_MANUAL)
 			par.setLabelWidthString(par.expandLabel(lyxlayout, bp));
 	}
@@ -917,7 +921,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 	               min(old.pit() + 1, old.lastpit()));
 	ParagraphList & plist = old.text()->paragraphs();
 	bool const soa = oldpar.params().startOfAppendix();
-	plist.erase(lyx::next(plist.begin(), old.pit()));
+	plist.erase(plist.iterator_at(old.pit()));
 	// do not lose start of appendix marker (bug 4212)
 	if (soa && old.pit() < pit_type(plist.size()))
 		plist[old.pit()].params().startOfAppendix(true);
@@ -989,7 +993,7 @@ void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool tra
 			continue;
 
 		if (par.empty() || (par.size() == 1 && par.isLineSeparator(0))) {
-			pars_.erase(lyx::next(pars_.begin(), pit));
+			pars_.erase(pars_.iterator_at(pit));
 			--pit;
 			--last;
 			continue;