X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferEncodings.cpp;h=82fd3dc7159906a1e98bedbbd39b15359d9b682f;hb=0c05432284f144bcb6c278a60d54d9bc777829e0;hp=87000ac9c82402e7f24443f580926dc6c2340bf1;hpb=88d0939166f5945c14f9c64717f86447961c5eac;p=lyx.git

diff --git a/src/BufferEncodings.cpp b/src/BufferEncodings.cpp
index 87000ac9c8..82fd3dc715 100644
--- a/src/BufferEncodings.cpp
+++ b/src/BufferEncodings.cpp
@@ -81,7 +81,7 @@ void BufferEncodings::validate(char_type c, LaTeXFeatures & features, bool for_m
 						features.require(feat);
 					}
 				} else
-					features.addPreambleSnippet(mathpreamble);
+					features.addPreambleSnippet(from_utf8(mathpreamble));
 			}
 		}
 		// with utf8-plain, we do not load packages (see #7766)
@@ -93,10 +93,13 @@ void BufferEncodings::validate(char_type c, LaTeXFeatures & features, bool for_m
 					while (!feats.empty()) {
 						string feat;
 						feats = split(feats, feat, ',');
-						features.require(feat);
+						// context-dependent features are handled
+						// in Paragraph::Private::validate()
+						if (!contains(feat, '='))
+							features.require(feat);
 					}
 				} else
-					features.addPreambleSnippet(textpreamble);
+					features.addPreambleSnippet(from_utf8(textpreamble));
 			}
 		}
 	}