X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=4883d1b4f7a96329e52d99cad39a4545375fbed1;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=0b45b5ae1c48605ba67443fb717630203e719a55;hpb=a78bed06eb3d9ee0b5644944450bad4fbcfd0474;p=lyx.git

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.