Don't output CJK environment with non-TeX fonts

This amends d193cd05a8e3b.

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index e95cd651b3bc5c20cf6d7592e00a35b7efad9ad5..55e6c67d1d73374705d17df701a67dc4a574ba5a 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1405,7 +1405,7 @@ void latexParagraphs(Buffer const & buf,
        // if the document's language is a CJK language
        // (but not in child documents)
        OutputState * state = getOutputState();
-       if (maintext && !is_child
+       if (maintext && !is_child && !bparams.useNonTeXFonts
            && bparams.language->encoding()->package() == Encoding::CJK) {
                docstring const cjkenc = (bparams.encoding().iconvName() == "UTF-8"
                                          && LaTeXFeatures::isAvailable("CJKutf8")) ?