From 426ed23ec0a0a939aa27caf86f59af4f6da8ce49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Milde?= <milde@lyx.org>
Date: Tue, 5 Feb 2019 20:27:38 +0100
Subject: [PATCH] Fix CJK preamble.

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

Load CJK (not CJKutf8) with traditional Chinese and "language-default".
---
 src/BufferParams.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index aad6ecef0d..011009693b 100644
--- 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";