From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 6 Jan 2019 15:40:36 +0000 (+0100)
Subject: Don't output CJK environment with non-TeX fonts
X-Git-Tag: 2.3.3~48
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7e2b29682c36abb72f33812b5feec0c013835028;p=features.git

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 526dfc1a34..fce573e1ab 100644
--- 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")) ?