From: Juergen Spitzmueller <spitz@lyx.org>
Date: Thu, 28 Jun 2012 14:52:13 +0000 (+0200)
Subject: do not output empty language switch commands (bug #8216, the actual fix)
X-Git-Tag: 2.0.5~141
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e4b5af90b97162472cad1d9b9e8a9772c20805f8;p=features.git

do not output empty language switch commands (bug #8216, the actual fix)
---

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 103a8bc42a..e6deb6179a 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -583,7 +583,8 @@ void TeXOnePar(Buffer const & buf,
 					os << "\\L{";
 			}
 			// With CJK, the CJK tag has to be closed first (see below)
-			if (runparams.encoding->package() != Encoding::CJK) {
+			if (runparams.encoding->package() != Encoding::CJK
+			    && !par_lang.empty()) {
 				os << from_ascii(subst(
 					lang_begin_command,
 					"$$lang",
@@ -644,7 +645,8 @@ void TeXOnePar(Buffer const & buf,
 					os << "%\n";
 				}
 				// With CJK, the CJK tag had to be closed first (see above)
-				if (runparams.encoding->package() == Encoding::CJK) {
+				if (runparams.encoding->package() == Encoding::CJK
+				    && !par_lang.empty()) {
 					os << from_ascii(subst(
 						lang_begin_command,
 						"$$lang",