Fix CJK preamble.

Don't load the CJK package with utf8x (feature clash).

Load CJK (not CJKutf8) with traditional Chinese and "language-default".

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index aad6ecef0d87dd1c17ece530092739658ff50b04..011009693b5727375b960e1281a751ee5243af15 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1747,9 +1747,9 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 
        // load CJK support package before font selection
        // (see autotests/export/latex/CJK/micro-sign_utf8-cjk-libertine.lyx)
-       if (!useNonTeXFonts && encoding().package() != Encoding::none
+       if (!useNonTeXFonts && encoding().package() != Encoding::none && inputenc != "utf8x"
                && (encoding().package() == Encoding::CJK || features.mustProvide("CJK"))) {
-               if (encoding().iconvName() == "UTF-8")
+               if (inputenc == "utf8-cjk" || inputenc == "utf8")
                        os << "\\usepackage{CJKutf8}\n";
                else
                        os << "\\usepackage[encapsulated]{CJK}\n";