Try even harder to obtain an instant preview

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 3595a089fa60e03224e83c7a749ae4046ca9dab2..4b4b6cdc72a8516dcd2d8cc878b0d41e46f24540 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -672,7 +672,7 @@ void TeXOnePar(Buffer const & buf,
 
        // In some insets (such as Arguments), we cannot use \selectlanguage
        bool const localswitch = !use_polyglossia
-               && text.inset().getLayout().forcelocalfontswitch();
+               && text.inset().forceLocalFontSwitch();
        if (localswitch) {
                lang_begin_command = lyxrc.language_command_local;
                lang_end_command = "}";
@@ -1073,6 +1073,7 @@ void TeXOnePar(Buffer const & buf,
                        DocumentClass const & tclass = bparams.documentClass();
                        if ((style == next_layout
                             && !style.parbreak_is_newline
+                            && !text.inset().getLayout().parbreakIsNewline()
                             && style.latextype != LATEX_ITEM_ENVIRONMENT
                             && style.latextype != LATEX_LIST_ENVIRONMENT
                             && style.align == par.getAlign()