Don't output CJK environment with non-TeX fonts

This amends d193cd05a8.
This commit is contained in:
Juergen Spitzmueller 2019-01-06 16:40:36 +01:00
parent 8c219daeeb
commit c9dd349bee

View File

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