From ae9ef7c30f08d8a9f830e5a1adcec166ebc8fb8d Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Fri, 31 Oct 2008 15:36:08 +0000
Subject: [PATCH] If we're doing this test elsewhere, we should also do it
 here.

(All of these commits, by the way, are just stuff I'm stumbling
across while trying to deal with the newline bug.)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27216 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/output_latex.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 6c63d2da18..164d8886ac 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -82,9 +82,14 @@ TeXDeeper(Buffer const & buf,
 
 	ParagraphList const & paragraphs = text.paragraphs();
 
+	// FIXME This test should not be necessary.
+	// We should perhaps issue an error if it is.
+	Layout const & style = par->forcePlainLayout() ?
+		buf.params().documentClass().plainLayout() : par->layout();
+
 	while (par != paragraphs.end() &&
 		     par->params().depth() == pit->params().depth()) {
-		if (par->layout().isEnvironment()) {
+		if (style.isEnvironment()) {
 			par = TeXEnvironment(buf, text, par,
 					     os, texrow, runparams);
 		} else {
-- 
2.39.2