From: Richard Heck <rgheck@comcast.net>
Date: Fri, 31 Oct 2008 14:58:53 +0000 (+0000)
Subject: This was the wrong check.
X-Git-Tag: 1.6.10~2763
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=fa4801bdc98301d0bb9f1e37123952e32dc22a52;p=features.git

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 1ff5f81f5c..91a4a70b5f 100644
--- 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);
 	}