]> git.lyx.org Git - lyx.git/commitdiff
Don't add localswitch if no language changes
authorJuergen Spitzmueller <spitz@lyx.org>
Fri, 27 Apr 2018 16:27:21 +0000 (18:27 +0200)
committerJuergen Spitzmueller <spitz@lyx.org>
Fri, 27 Apr 2018 16:27:21 +0000 (18:27 +0200)
src/output_latex.cpp

index dcf10a718da3217c896bca66342fdeafaa80d416..c36ed2587b8d1a6718455e49595b1be7dbb5630f 100644 (file)
@@ -838,9 +838,11 @@ void TeXOnePar(Buffer const & buf,
                lang_end_command = "}";
                lang_command_termination.clear();
        }
+       
+       bool const localswitch_needed = localswitch && par_lang != outer_lang;
 
        // localswitches need to be closed and reopened at each par
-       if ((par_lang != prev_lang || localswitch)
+       if ((par_lang != prev_lang || localswitch_needed)
             // check if we already put language command in TeXEnvironment()
             && !(style.isEnvironment()
                  && (pit == 0 || (priorpar->layout() != par.layout()
@@ -1115,7 +1117,7 @@ void TeXOnePar(Buffer const & buf,
                &&((nextpar && par_lang != nextpar_lang)
                   || (runparams.isLastPar && par_lang != outer_lang));
 
-       if (localswitch
+       if (localswitch_needed
            || (intitle_command && using_begin_end)
            || closing_rtl_ltr_environment
            || ((runparams.isLastPar || close_lang_switch)