From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 20 May 2013 09:07:47 +0000 (+0200)
Subject: Handle secondary babel languages when main language is CJK
X-Git-Tag: 2.1.0beta1~202
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b65d5f201287ab09628007333f5c399835cbd624;p=features.git

Handle secondary babel languages when main language is CJK
---

diff --git a/src/Font.cpp b/src/Font.cpp
index c29156d10f..d00cbf2f5d 100644
--- 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)
 	{