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 a16a270432583205c2765fe68ff653662b33faaf..60361f5bc9341c2d1551aaba34911e14bc79422c 100644 (file)
--- 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 aeee86118f62d5deec37b4ff19594223f1de987a..f8420a1b050a06c737db6ab3537336661889928f 100644 (file)
--- 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