From: Günter Milde <milde@lyx.org>
Date: Wed, 13 Mar 2019 10:13:44 +0000 (+0100)
Subject: Remove special code for CJK that is no longer required (amends e665715fc4).
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f56d7f67a139a868cd1d6368bfd6e5528274fd81;p=features.git

Remove special code for CJK that is no longer required (amends e665715fc4).
---

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index d370e0a1e7..64dfd54af5 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -743,13 +743,10 @@ Encoding const * DocIterator::getEncoding() const
 	Language const * lang =
 		text.getPar(sl.pit()).getFont(bp, sl.pos(),
 										  text.outerFont(sl.pit())).language();
-	// If we have a custom encoding for the buffer, we only switch
-	// encoding for CJK (see output_latex::switchEncoding())
-	bool const customenc =
-		bp.inputenc != "auto" && bp.inputenc != "default";
-	Encoding const * enc =
-		(customenc && lang->encoding()->package() != Encoding::CJK)
-		? &bp.encoding() : lang->encoding();
+	// If we have a custom encoding for the buffer, we don't switch
+	// encodings (see output_latex::switchEncoding())
+	bool const customenc = bp.inputenc != "auto" && bp.inputenc != "default";
+	Encoding const * enc = customenc ? &bp.encoding() : lang->encoding();
 
 	// Some insets force specific encodings sometimes (e.g., listings in
 	// multibyte context forces singlebyte).
@@ -780,9 +777,8 @@ Encoding const * DocIterator::getEncoding() const
 														   otext.outerFont(slices_[i].pit())).language();
 			// Again, if we have a custom encoding, this is used
 			// instead of the language's.
-			Encoding const * oenc =
-					(customenc && olang->encoding()->package() != Encoding::CJK)
-					? &bp.encoding() : olang->encoding();
+			Encoding const * oenc = customenc 
+									? &bp.encoding() : olang->encoding();
 			if (olang->encoding()->name() != "inherit")
 				return oenc;
 		}