From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 27 Apr 2018 07:48:14 +0000 (+0200)
Subject: Close/reopen local language switches at each par
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~3549
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f77887033871b3c561c85d9acb07f07f911150ec;p=features.git

Close/reopen local language switches at each par

Fixes: #11128
---

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index f8da22ca5c..dcf10a718d 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -839,22 +839,22 @@ void TeXOnePar(Buffer const & buf,
 		lang_command_termination.clear();
 	}
 
-	if (par_lang != prev_lang
-		// check if we already put language command in TeXEnvironment()
-		&& !(style.isEnvironment()
-		     && (pit == 0 || (priorpar->layout() != par.layout()
-			                  && priorpar->getDepth() <= par.getDepth())
-		                  || priorpar->getDepth() < par.getDepth())))
-	{
-		if ((!using_begin_end || langOpenedAtThisLevel(state)) &&
-		    !lang_end_command.empty() &&
-		    prev_lang != outer_lang &&
-		    !prev_lang.empty() &&
-		    (!using_begin_end || !style.isEnvironment()))
-		{
+	// localswitches need to be closed and reopened at each par
+	if ((par_lang != prev_lang || localswitch)
+	     // check if we already put language command in TeXEnvironment()
+	     && !(style.isEnvironment()
+		  && (pit == 0 || (priorpar->layout() != par.layout()
+			           && priorpar->getDepth() <= par.getDepth())
+		      || priorpar->getDepth() < par.getDepth()))) {
+		if (!localswitch
+		    && (!using_begin_end || langOpenedAtThisLevel(state))
+		    && !lang_end_command.empty()
+		    && prev_lang != outer_lang 
+		    && !prev_lang.empty()
+		    && (!using_begin_end || !style.isEnvironment())) {
 			os << from_ascii(subst(lang_end_command,
-				"$$lang",
-				prev_lang))
+					       "$$lang",
+					       prev_lang))
 			   << lang_command_termination;
 			if (using_begin_end)
 				popLanguageName();
@@ -1115,7 +1115,8 @@ void TeXOnePar(Buffer const & buf,
 		&&((nextpar && par_lang != nextpar_lang)
 		   || (runparams.isLastPar && par_lang != outer_lang));
 
-	if ((intitle_command && using_begin_end)
+	if (localswitch
+	    || (intitle_command && using_begin_end)
 	    || closing_rtl_ltr_environment
 	    || ((runparams.isLastPar || close_lang_switch)
 	        && (par_lang != outer_lang || (using_begin_end
@@ -1125,7 +1126,7 @@ void TeXOnePar(Buffer const & buf,
 		// we need to reset the language at the end of footnote or
 		// float.
 
-		if (pending_newline || close_lang_switch)
+		if (!localswitch && (pending_newline || close_lang_switch))
 			os << '\n';
 
 		// when the paragraph uses CJK, the language has to be closed earlier