From: Günter Milde <milde@lyx.org>
Date: Tue, 7 May 2019 21:37:30 +0000 (+0200)
Subject: Fix spurious \end{CJK} in LaTeX output.
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2070
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=af9838fd32f20f80c8e8af30aa0114abe1412160;p=lyx.git

Fix spurious \end{CJK} in LaTeX output.
---

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index ab3760f9ed..60bc9f3d59 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -305,8 +305,10 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 
 	// in multilingual environments, the CJK tags have to be nested properly
 	data.cjk_nested = false;
-	if (data.par_language->encoding()->package() == Encoding::CJK &&
-	    state->open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
+	if (!bparams.useNonTeXFonts && (bparams.inputenc == "auto-legacy"
+									|| bparams.inputenc == "auto-legacy-plain")
+		&& data.par_language->encoding()->package() == Encoding::CJK
+		&& state->open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
 		if (prev_par_language->encoding()->package() == Encoding::CJK) {
 			os << "\\begin{CJK}{"
 			   << from_ascii(data.par_language->encoding()->latexName())