From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Wed, 9 Feb 2011 18:21:43 +0000 (+0000)
Subject: * BufferParams.cpp: do not load luainputenc if inputenc has explicitly being disabled.
X-Git-Tag: 2.0.0~811
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=58fd91390c05922fc7ecf48b53e5cc23a11d7445;p=features.git

* BufferParams.cpp: do not load luainputenc if inputenc has explicitly being disabled.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37578 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 35bf6111a9..375780cb8a 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2494,7 +2494,9 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
 	// LuaTeX neither, but with tex fonts, we need to load
 	// the luainputenc package.
 	if (features.runparams().flavor == OutputParams::LUATEX) {
-		if (!useNonTeXFonts) {
+		if (!useNonTeXFonts && inputenc != "default"
+		    && ((inputenc == "auto" && language->encoding()->package() == Encoding::inputenc)
+		        || (inputenc != "auto" && encoding().package() == Encoding::inputenc))) {
 			os << "\\usepackage[utf8]{luainputenc}\n";
 			texrow.newline();
 		}