* 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/trunk@21652 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index c4d3158d14513624e38a8b02f53bbd5084c3dc70..a713f84c52a74bfec1853b65c883c76c8500f224 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1620,7 +1620,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();
                }

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 69ecf92cbede64609025b2e80c4532dae17827bf..b5b71ff77cec66c338060f8c66d3401411d07530 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/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");
 }