Fix spurious \end{CJK} in LaTeX output.

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index ab3760f9eda4c1b3569e8f2c83bd42eb795fec7c..60bc9f3d5970ee92f41b37622e15faf17bee25ce 100644 (file)
--- 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())