[LyX/2.1.x] Set the logic straight

[Juergen Spitzmueller]

commit e715055373a66a3e10d263111b577c010a1b3714
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sun Mar 15 10:38:37 2015 +0100

    Set the logic straight

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 5f2d6ae..9960ef6 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2856,7 +2856,7 @@ void BufferParams::writeEncodingPreamble(otexstream & os,
                        // do not load inputenc if japanese is used
                        // or if the class provides inputenc
                        if (features.isRequired("japanese")
-                           && features.isProvided("inputenc"))
+                           || features.isProvided("inputenc"))
                                break;
                        os << "\\usepackage[" << 
from_ascii(encoding().latexName())
                           << "]{inputenc}\n";
diff --git a/status.21x b/status.21x
index 9a866f5..bf36dc4 100644
--- a/status.21x
+++ b/status.21x
@@ -30,6 +30,8 @@ What's new
 
 - Add low-resolution PDF export format (needs an installed ghostscript).
 
+- Add possibility via the layout file to prevent LyX from loading inputenc.
+
 
 
 * TEX2LYX IMPROVEMENTS