Set the logic straight

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";

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