Cmake build:

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index 46cba97231dfea6949b0cb8875f2e54b1894cd5f..08501759c710797b4740e1d8e2c05b47482c4a79 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -539,8 +539,9 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
                open_encoding_ = false;
        }
 
-       if (closeLanguage &&
-                       language() != base.language() && language() != next.language()) {
+       if (closeLanguage
+           && language() != base.language() && language() != next.language()
+           && language()->encoding()->package() != Encoding::CJK) {
                os << '}';
                ++count;
        }
@@ -701,9 +702,10 @@ void Font::validate(LaTeXFeatures & features) const
 
        // FIXME: Do something for background and soul package?
 
-       if (lang_->babel() != doc_language->babel() &&
-               lang_ != ignore_language &&
-               lang_ != latex_language)
+       if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
+            || (features.useBabel(true) && lang_->babel() != doc_language->babel()))
+           && lang_ != ignore_language
+           && lang_ != latex_language)
        {
                features.useLanguage(lang_);
                LYXERR(Debug::LATEX, "Found language " << lang_->lang());