Don't output CJK environment with non-TeX fonts

This amends d193cd05a8e3b.

(cherry picked from commit c9dd349bee71d9a3952f36246f684ead9ca43c2b)

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 526dfc1a34fd24faf4bbfce83368ba003e08a102..fce573e1abe60776a83336da72f7a83889340965 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1383,7 +1383,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")) ?