Maintain plain layout for separating paragraphs when switching layouts (#11936)

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 2d1ca0ec4ee0dc6f6a57368e0fd611f22ac2b881..18fc51892afe0b3538e49dcd40ec26461d422723 100644 (file)
--- 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));
        }