From: Enrico Forestieri <forenr@lyx.org>
Date: Wed, 11 Oct 2017 07:13:11 +0000 (+0200)
Subject: Fix issue with language switch in Arguments insets
X-Git-Tag: 2.3.0rc1~52
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b79d07f4a591f960625bef8cae760e08add6f549;p=features.git

Fix issue with language switch in Arguments insets

In some insets such as Arguments, a local language switch has to be
used. However, if the language inside the inset was set to be equal
to the outer language, the code decided not to switch language. But
then got confused and tried to close a switch that was never opened.
This patch forces the switch even if the outer language is the same.

(cherry picked from commit ce4f39d414a26edcf54c1e24d6142e6b929586d7)
---

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index e0163ad2fa..02667aae9f 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -882,7 +882,7 @@ void TeXOnePar(Buffer const & buf,
 			}
 			// With CJK, the CJK tag has to be closed first (see below)
 			if (runparams.encoding->package() != Encoding::CJK
-			    && par_lang != openLanguageName(state)
+			    && (par_lang != openLanguageName(state) || localswitch)
 			    && !par_lang.empty()) {
 				string bc = use_polyglossia ?
 					  getPolyglossiaBegin(lang_begin_command, par_lang, par_language->polyglossiaOpts())