Move contents of paragraph_funcs.* to Text.h and Text.cpp.

[features.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index cc551d8d1d65e49559a12d38c7d90adb74126ae2..1ff05aa98b2d3071ea83d30eee04438011a4a72f 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -21,7 +21,6 @@
 #include "LyXRC.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
-#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "TextClass.h"
 #include "TexRow.h"
@@ -75,7 +74,7 @@ TeXDeeper(Buffer const & buf,
 
        ParagraphList const & paragraphs = text.paragraphs();
 
-       bool const force_plain_layout = text.inset()->forcePlainLayout();
+       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.
@@ -109,7 +108,7 @@ TeXEnvironment(Buffer const & buf,
 
        // FIXME This test should not be necessary.
        // We should perhaps issue an error if it is.
-       Layout const & style = text.inset()->forcePlainLayout() ?
+       Layout const & style = text.inset().forcePlainLayout() ?
                bparams.documentClass().plainLayout() : pit->layout();
 
        ParagraphList const & paragraphs = text.paragraphs();
@@ -329,7 +328,7 @@ 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 = text.inset()->forcePlainLayout() ?
+       Layout const style = text.inset().forcePlainLayout() ?
                bparams.documentClass().plainLayout() : pit->layout();
 
        runparams.moving_arg |= style.needprotect;
@@ -830,7 +829,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 = text.inset()->forcePlainLayout() ?
+               Layout const & layout = text.inset().forcePlainLayout() ?
                                tclass.plainLayout() : par->layout();
 
                if (layout.intitle) {