From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 15 Aug 2020 06:35:26 +0000 (+0200)
Subject: Amend 89d9334e03
X-Git-Tag: 2.3.6~52
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=65c8e70588e7bbc22e0f07af2c6d9a53e9c14b93;p=features.git

Amend 89d9334e03

This needs to be default layout, not plain layout

(cherry picked from commit ea122aa8fa2381cac9858fc9dfe71062acb7218e)
---

diff --git a/src/Text2.cpp b/src/Text2.cpp
index a16a270432..60361f5bc9 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -182,10 +182,11 @@ void Text::setLayout(pit_type start, pit_type end,
 
 	for (pit_type pit = start; pit != end; ++pit) {
 		Paragraph & par = pars_[pit];
-		// Is this a separating paragraph?
+		// 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().plainLayout() : lyxlayout);
+		par.applyLayout(is_separator ? bp.documentClass().defaultLayout() : lyxlayout);
 		if (lyxlayout.margintype == MARGIN_MANUAL)
 			par.setLabelWidthString(par.expandLabel(lyxlayout, bp));
 	}
diff --git a/status.23x b/status.23x
index aeee86118f..f8420a1b05 100644
--- a/status.23x
+++ b/status.23x
@@ -88,6 +88,8 @@ What's new
 
 - Do not allow editing of math package list in Document > Settings > Math Options,
   thus preventing a crash (bug 11931).
+  
+- Maintain standard layout for separating paragraphs when switching layouts (bug 11936).
 
 
 * INTERNALS