do what the FIXME suggested

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 4865845b455ff465dc363271949719ad74d625c9..335c7d01f9a82a43a7b76b1d89d50db6389189ad 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -109,8 +109,7 @@ TeXEnvironment(Buffer const & buf,
        BufferParams const & bparams = buf.params();
 
        LayoutPtr const & style = pit->forceEmptyLayout() ?
-                       bparams.getTextClass().emptyLayout() :
-                       pit->layout();
+                       bparams.documentClass().emptyLayout() : pit->layout();
 
        ParagraphList const & paragraphs = text.paragraphs();
 
@@ -159,7 +158,7 @@ TeXEnvironment(Buffer const & buf,
        if (style->isEnvironment()) {
                os << "\\begin{" << from_ascii(style->latexname()) << '}';
                if (style->optionalargs > 0) {
-                       int ret = latexOptArgInsets(buf, *pit, os, runparams,
+                       int ret = latexOptArgInsets(*pit, os, runparams,
                                                    style->optionalargs);
                        while (ret > 0) {
                                texrow.newline();
@@ -254,8 +253,8 @@ TeXEnvironment(Buffer const & buf,
 }
 
 
-int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
-                     odocstream & os, OutputParams const & runparams, int number)
+int latexOptArgInsets(Paragraph const & par, odocstream & os,
+       OutputParams const & runparams, int number)
 {
        int lines = 0;
 
@@ -265,7 +264,7 @@ int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
                if (it->inset->lyxCode() == OPTARG_CODE) {
                        InsetOptArg * ins =
                                static_cast<InsetOptArg *>(it->inset);
-                       lines += ins->latexOptional(buf, os, runparams);
+                       lines += ins->latexOptional(os, runparams);
                        --number;
                }
        }
@@ -298,7 +297,7 @@ TeXOnePar(Buffer const & buf,
                        texrow.newline();
                }
 
-               /*bool need_par = */ pit->latex(buf, bparams, outerfont,
+               /*bool need_par = */ pit->latex(bparams, outerfont,
                        os, texrow, runparams_in);
 
                return ++pit;
@@ -310,8 +309,7 @@ TeXOnePar(Buffer const & buf,
        // In an inset with unlimited length (all in one row),
        // force layout to default
        LayoutPtr const style = pit->forceEmptyLayout() ?
-               bparams.getTextClass().emptyLayout() :
-               pit->layout();
+               bparams.documentClass().emptyLayout() : pit->layout();
 
        OutputParams runparams = runparams_in;
        runparams.moving_arg |= style->needprotect;
@@ -479,7 +477,7 @@ TeXOnePar(Buffer const & buf,
                }
        }
 
-       bool const useSetSpace = bparams.getTextClass().provides("SetSpace");
+       bool const useSetSpace = bparams.documentClass().provides("SetSpace");
        if (pit->allowParagraphCustomization()) {
                if (pit->params().startOfAppendix()) {
                        os << "\\appendix\n";
@@ -507,7 +505,7 @@ TeXOnePar(Buffer const & buf,
 
                // Separate handling of optional argument inset.
                if (style->optionalargs > 0) {
-                       int ret = latexOptArgInsets(buf, *pit, os, runparams,
+                       int ret = latexOptArgInsets(*pit, os, runparams,
                                                    style->optionalargs);
                        while (ret > 0) {
                                texrow.newline();
@@ -528,13 +526,12 @@ TeXOnePar(Buffer const & buf,
                break;
        }
 
-       Font const outerfont =
-               outerFont(distance(paragraphs.begin(), pit),
+       Font const outerfont = outerFont(distance(paragraphs.begin(), pit),
                          paragraphs);
 
        // FIXME UNICODE
        os << from_utf8(everypar);
-       bool need_par = pit->latex(buf, bparams, outerfont,
+       bool need_par = pit->latex(bparams, outerfont,
                                             os, texrow, runparams);
 
        // Make sure that \\par is done with the font of the last
@@ -547,10 +544,9 @@ TeXOnePar(Buffer const & buf,
        // We do not need to use to change the font for the last paragraph
        // or for a command.
 
-       Font const font =
-               (pit->empty()
+       Font const font = pit->empty()
                 ? pit->getLayoutFont(bparams, outerfont)
-                : pit->getFont(bparams, pit->size() - 1, outerfont));
+                : pit->getFont(bparams, pit->size() - 1, outerfont);
 
        bool is_command = style->isCommand();
 
@@ -745,7 +741,7 @@ void latexParagraphs(Buffer const & buf,
        bool was_title = false;
        bool already_title = false;
        BufferParams const & bparams = buf.params();
-       TextClass const & tclass = bparams.getTextClass();
+       DocumentClass const & tclass = bparams.documentClass();
        ParagraphList const & paragraphs = text.paragraphs();
        ParagraphList::const_iterator par = paragraphs.begin();
        ParagraphList::const_iterator endpar = paragraphs.end();