This was the wrong check.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27213 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 1ff5f81f5c4d0f9ca48f1f9475c66137a4b63f4f..91a4a70b5fc5f52c8f51b8e51e736e7cdf4595c1 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1913,11 +1913,12 @@ bool Paragraph::latex(BufferParams const & bparams,
 
        bool return_value = false;
 
-       bool const asdefault = forcePlainLayout();
+       bool const allowcust = allowParagraphCustomization();
 
-       Layout const & style = asdefault ?
-               bparams.documentClass().plainLayout() :
-               *d->layout_;
+       // FIXME This check should not be needed. Perhaps issue an
+       // error if it triggers.
+       Layout const & style = forcePlainLayout() ?
+               bparams.documentClass().plainLayout() : *d->layout_;
 
        // Current base font for all inherited font changes, without any
        // change caused by an individual character, except for the language:
@@ -1956,7 +1957,7 @@ bool Paragraph::latex(BufferParams const & bparams,
                        os << '{';
                        ++column;
                }
-               if (!asdefault)
+               if (allowcust)
                        column += d->startTeXParParams(bparams, os, texrow,
                                                    runparams);
        }
@@ -1986,7 +1987,7 @@ bool Paragraph::latex(BufferParams const & bparams,
                                ++column;
                        }
 
-                       if (!asdefault)
+                       if (allowcust)
                                column += d->startTeXParParams(bparams, os,
                                                            texrow,
                                                            runparams);
@@ -2164,7 +2165,7 @@ bool Paragraph::latex(BufferParams const & bparams,
                return_value = false;
        }
 
-       if (!asdefault) {
+       if (allowcust) {
                column += d->endTeXParParams(bparams, os, texrow,
                                          runparams);
        }