From: Günter Milde <milde@lyx.org>
Date: Wed, 21 Aug 2019 10:33:13 +0000 (+0200)
Subject: Fix export with Japanese (platex) and non-TeX fonts.
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~1574
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c5596da758c0def674e874c6bd8a9fbf51a610a5;p=features.git

Fix export with Japanese (platex) and non-TeX fonts.

Revert a change in c83765163f that inserts a spurious "}".
---

diff --git a/src/Font.cpp b/src/Font.cpp
index 0ee6bfe9b0..476ce37275 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -538,8 +538,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 
 	if (closeLanguage
 	    && language() != base.language() && language() != next.language()
-	    && (language()->encoding()->package() != Encoding::CJK
-			|| bparams.useNonTeXFonts)) {
+	    && (language()->encoding()->package() != Encoding::CJK)) {
 		os << '}';
 		++count;
 		bool const using_begin_end =