[LyX/master] Fix spurious \end{CJK} in LaTeX output.

[Günter Milde]

commit af9838fd32f20f80c8e8af30aa0114abe1412160
Author: Günter Milde <mi...@lyx.org>
Date:   Tue May 7 23:37:30 2019 +0200

    Fix spurious \end{CJK} in LaTeX output.
---
 src/output_latex.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index ab3760f..60bc9f3 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())