This comment is wrong and causes bug in revision control.

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 3e4d299262d7e2213ee75f8dd5dd6dbdcb04ceed..4ffcda59a8b652d4b09528672cb7a4d93efef662 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -109,7 +109,7 @@ TeXEnvironment(Buffer const & buf,
 
        BufferParams const & bparams = buf.params();
 
-       Layout const & style = pit->forceEmptyLayout() ?
+       Layout const & style = pit->forcePlainLayout() ?
                bparams.documentClass().emptyLayout() : pit->layout();
 
        ParagraphList const & paragraphs = text.paragraphs();
@@ -309,7 +309,7 @@ TeXOnePar(Buffer const & buf,
                return nextpit;
        }
 
-       Layout const style = pit->forceEmptyLayout() ?
+       Layout const style = pit->forcePlainLayout() ?
                bparams.documentClass().emptyLayout() : pit->layout();
 
        OutputParams runparams = runparams_in;
@@ -784,7 +784,7 @@ void latexParagraphs(Buffer const & buf,
        // if only_body
        while (par != endpar) {
                lastpar = par;
-               Layout const & layout = par->forceEmptyLayout() ?
+               Layout const & layout = par->forcePlainLayout() ?
                                tclass.emptyLayout() :
                                par->layout();
 
@@ -870,12 +870,13 @@ void latexParagraphs(Buffer const & buf,
 
 
 pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
-                  OutputParams const & runparams, Encoding const & newEnc)
+                  OutputParams const & runparams, Encoding const & newEnc,
+                  bool force)
 {
        Encoding const oldEnc = *runparams.encoding;
        bool moving_arg = runparams.moving_arg;
-       if ((bparams.inputenc != "auto" && bparams.inputenc != "default")
-               || moving_arg)
+       if (!force && ((bparams.inputenc != "auto" && bparams.inputenc != "default")
+               || moving_arg))
                return make_pair(false, 0);
 
        // Do nothing if the encoding is unchanged.