From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 20 May 2013 11:40:40 +0000 (+0200)
Subject: Force encoding switch when switching from/to CJK, even if we use a customized encodin... 
X-Git-Tag: 2.1.0beta1~200
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a8a2bd463c1ae7a14f1273604186131ff3798777;p=features.git

Force encoding switch when switching from/to CJK, even if we use a customized encoding (#8558)
---

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 0b45b5ae1c..4883d1b4f7 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1196,8 +1196,12 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 {
 	Encoding const & oldEnc = *runparams.encoding;
 	bool moving_arg = runparams.moving_arg;
-	if (!force && ((bparams.inputenc != "auto" && bparams.inputenc != "default")
-		|| moving_arg))
+	// If we switch from/to CJK, we need to switch anyway, despite custom inputenc
+	bool const from_to_cjk = 
+		(oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
+		|| (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK);
+	if (!force && !from_to_cjk
+	    && ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg))
 		return make_pair(false, 0);
 
 	// Do nothing if the encoding is unchanged.