* load CJKutf8 package, if available, for CJK documents in utf8 encoding

[features.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 08b07c3ba57dd513a62ca3591d72842b44afa729..4d52968de7fcbf537551af8e41e87746c01b2005 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2168,7 +2168,11 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
                        texrow.newline();
                }
                if (package == Encoding::CJK || features.mustProvide("CJK")) {
-                       os << "\\usepackage{CJK}\n";
+                       if (language->encoding()->name() == "utf8-cjk"
+                           && features.isAvailable("CJKutf8"))
+                               os << "\\usepackage{CJKutf8}\n";
+                       else
+                               os << "\\usepackage{CJK}\n";
                        texrow.newline();
                }
        } else if (inputenc != "default") {
@@ -2185,7 +2189,11 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
                        texrow.newline();
                        break;
                case Encoding::CJK:
-                       os << "\\usepackage{CJK}\n";
+                       if (encoding().name() == "utf8-cjk"
+                           && features.isAvailable("CJKutf8"))
+                               os << "\\usepackage{CJKutf8}\n";
+                       else
+                               os << "\\usepackage{CJK}\n";
                        texrow.newline();
                        break;
                }