Customization.lyx: last step of merging/updating

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index c29156d10f1991a58bcfcdea829b77b5e294494a..d00cbf2f5d6eb0e3ac9ed49bb4f8fe2471945aba 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -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() && 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)
        {