X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=d00cbf2f5d6eb0e3ac9ed49bb4f8fe2471945aba;hb=d1ce71d3983608bd19d207de3744318f4f5ddfe3;hp=6b072d8b6761ce5811e64061ad7a1c35a5508093;hpb=f67cf6f4bb3e3d22ac9aebfa22027c3537cbdf61;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index 6b072d8b67..d00cbf2f5d 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -537,7 +537,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 		Encoding const * const ascii = encodings.fromLyXName("ascii");
 		pair<bool, int> const c = switchEncoding(os.os(), bparams,
 				runparams, *ascii);
-		LASSERT(c.first, /**/);
+		LATTEST(c.first);
 		count += c.second;
 		runparams.encoding = ascii;
 		open_encoding_ = false;
@@ -707,7 +707,8 @@ void Font::validate(LaTeXFeatures & features) const
 	// FIXME: Do something for background and soul package?
 
 	if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
-	     || (features.useBabel(true) && lang_->babel() != doc_language->babel()))
+	     || (features.useBabel() && lang_->babel() != doc_language->babel())
+	     || (doc_language->encoding()->package() == Encoding::CJK && lang_ != doc_language))
 	    && lang_ != ignore_language
 	    && lang_ != latex_language)
 	{