From 89d9334e03c311a4a7585f40ad81880304d174d4 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 15 Aug 2020 08:14:17 +0200
Subject: [PATCH] Maintain plain layout for separating paragraphs when
 switching layouts (#11936)

---
 src/Text2.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 2d1ca0ec4e..18fc51892a 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -182,7 +182,10 @@ 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?
+		bool const is_separator = par.size() == 1
+				&& par.isEnvSeparator(0);
+		par.applyLayout(is_separator ? bp.documentClass().plainLayout() : lyxlayout);
 		if (lyxlayout.margintype == MARGIN_MANUAL)
 			par.setLabelWidthString(par.expandLabel(lyxlayout, bp));
 	}
-- 
2.39.2