Kornel's gcc compile fix.

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index cc551d8d1d65e49559a12d38c7d90adb74126ae2..d40874e041959b60141ff60b235caf823f5bfe80 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();
@@ -253,14 +252,22 @@ TeXEnvironment(Buffer const & buf,
                os << "\\end{" << from_ascii(style.latexname()) << "}\n";
                texrow.newline();
                prev_env_language_ = par_language;
-               runparams.encoding = prev_encoding;
+               if (runparams.encoding != prev_encoding) {
+                       runparams.encoding = prev_encoding;
+                       if (!bparams.useXetex)
+                               os << setEncoding(prev_encoding->iconvName());
+               }
        }
 
        if (leftindent_open) {
                os << "\\end{LyXParagraphLeftIndent}\n";
                texrow.newline();
                prev_env_language_ = par_language;
-               runparams.encoding = prev_encoding;
+               if (runparams.encoding != prev_encoding) {
+                       runparams.encoding = prev_encoding;
+                       if (!bparams.useXetex)
+                               os << setEncoding(prev_encoding->iconvName());
+               }
        }
 
        if (par != paragraphs.end())
@@ -314,7 +321,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
 
        if (runparams.verbatim) {
                int const dist = distance(paragraphs.begin(), pit);
-               Font const outerfont = outerFont(dist, paragraphs);
+               Font const outerfont = text.outerFont(dist);
 
                // No newline if only one paragraph in this lyxtext
                if (dist > 0) {
@@ -329,7 +336,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;
@@ -557,8 +564,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
                break;
        }
 
-       Font const outerfont = outerFont(distance(paragraphs.begin(), pit),
-                         paragraphs);
+       Font const outerfont = text.outerFont(distance(paragraphs.begin(), pit));
 
        // FIXME UNICODE
        os << from_utf8(everypar);
@@ -591,7 +597,11 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
                os << "\\par}";
        } else if (is_command) {
                os << '}';
-               runparams.encoding = prev_encoding;
+               if (runparams.encoding != prev_encoding) {
+                       runparams.encoding = prev_encoding;
+                       if (!bparams.useXetex)
+                               os << setEncoding(prev_encoding->iconvName());
+               }
        }
 
        bool pending_newline = false;
@@ -830,7 +840,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) {