Cleanup: Replace a bunch of Cursor arguments with DocIterators.

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 1aa55e30180e2d55be68708aa1c298506988e57e..59c114042337a39559cfd7dd34b5e1cb5139353f 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -75,12 +75,13 @@ TeXDeeper(Buffer const & buf,
 
        ParagraphList const & paragraphs = text.paragraphs();
 
+       bool const force_plain_layout = text.inset().forcePlainLayout();
        while (par != paragraphs.end() &&
                                        par->params().depth() == pit->params().depth()) {
                // 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();
+               Layout const & style = force_plain_layout
+                       ? buf.params().documentClass().plainLayout() : par->layout();
                if (style.isEnvironment()) {
                        par = TeXEnvironment(buf, text, par,
                                             os, texrow, runparams);
@@ -108,7 +109,7 @@ TeXEnvironment(Buffer const & buf,
 
        // FIXME This test should not be necessary.
        // We should perhaps issue an error if it is.
-       Layout const & style = pit->forcePlainLayout() ?
+       Layout const & style = text.inset().forcePlainLayout() ?
                bparams.documentClass().plainLayout() : pit->layout();
 
        ParagraphList const & paragraphs = text.paragraphs();
@@ -328,12 +329,12 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
 
        // FIXME This check should not really be needed.
        // Perhaps we should issue an error if it is.
-       Layout const style = pit->forcePlainLayout() ?
+       Layout const style = text.inset().forcePlainLayout() ?
                bparams.documentClass().plainLayout() : pit->layout();
 
        runparams.moving_arg |= style.needprotect;
 
-       bool const maintext = text.isMainText(buf);
+       bool const maintext = text.isMainText();
        // we are at the beginning of an inset and CJK is already open;
        // we count inheritation levels to get the inset nesting right.
        if (pit == paragraphs.begin() && !maintext
@@ -798,7 +799,7 @@ void latexParagraphs(Buffer const & buf,
                const_cast<OutputParams&>(runparams).par_end = 0;
        }
 
-       bool const maintext = text.isMainText(buf);
+       bool const maintext = text.isMainText();
        bool const is_child = buf.masterBuffer() != &buf;
 
        // Open a CJK environment at the beginning of the main buffer
@@ -829,7 +830,7 @@ void latexParagraphs(Buffer const & buf,
                lastpar = par;
                // FIXME This check should not be needed. We should
                // perhaps issue an error if it is.
-               Layout const & layout = par->forcePlainLayout() ?
+               Layout const & layout = text.inset().forcePlainLayout() ?
                                tclass.plainLayout() : par->layout();
 
                if (layout.intitle) {