Fix bug 4166: Crash when middle button click on inset label

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 0391e6d1ee68669e27fb183e5460cca8b4ef309e..4ff671633d00e85f3a1b4db4f2234a65d0c9fcb0 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -110,7 +110,7 @@ TeXEnvironment(Buffer const & buf,
        BufferParams const & bparams = buf.params();
 
        Layout const & style = pit->forcePlainLayout() ?
-               bparams.documentClass().emptyLayout() : pit->layout();
+               bparams.documentClass().plainLayout() : pit->layout();
 
        ParagraphList const & paragraphs = text.paragraphs();
 
@@ -310,7 +310,7 @@ TeXOnePar(Buffer const & buf,
        }
 
        Layout const style = pit->forcePlainLayout() ?
-               bparams.documentClass().emptyLayout() : pit->layout();
+               bparams.documentClass().plainLayout() : pit->layout();
 
        OutputParams runparams = runparams_in;
        runparams.moving_arg |= style.needprotect;
@@ -785,7 +785,7 @@ void latexParagraphs(Buffer const & buf,
        while (par != endpar) {
                lastpar = par;
                Layout const & layout = par->forcePlainLayout() ?
-                               tclass.emptyLayout() :
+                               tclass.plainLayout() :
                                par->layout();
 
                if (layout.intitle) {
@@ -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.