* LaTeXFeatures.cpp (useLanguage):

- require the CJK package for CJK languages.
* BufferParams.cpp (writeEncodingPreamble):
	- load CJK package if required.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@21651 a592a061-630c-0410-9148-cb99ea01b6c8

src/BufferParams.cpp

@@ -1406,7 +1406,7 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
 			os << "]{inputenc}\n";
 			texrow.newline();
 		}
-		if (package == Encoding::CJK) {
+		if (package == Encoding::CJK || features.mustProvide("CJK")) {
 			os << "\\usepackage{CJK}\n";
 			texrow.newline();
 		}

src/LaTeXFeatures.cpp

@@ -354,6 +354,10 @@ void LaTeXFeatures::useLanguage(Language const * lang)
 {
 	if (!lang->babel().empty())
 		UsedLanguages_.insert(lang);
+	// CJK languages do not have a babel name.
+	// They use the CJK package
+	if (lang->encoding()->package() == Encoding::CJK)
+		require("CJK");
 }
 
 

status.15x

@@ -120,6 +120,8 @@ What's new
 - Fix updating of externally modified files on Windows both in the workarea and
   in the output (bug 3172).
 
+- Fix loading of the CJK package in multilingual documents (part of bug 4337).
+
 - Fix a problem on Windows where invalid names were given to backup files
   (bug 4287).