* 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 35bf6111a9b21aba2f884540b56555a742e09d1d..375780cb8a0ba8e7b28e8f8d0a3e4c841654030a 100644 (file)
--- 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();
                }