X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferEncodings.cpp;h=dcf422d54bbe4888142e74584c2fb7cdf161b291;hb=447a1056b4f97b102db9666a131ce85001c0676c;hp=d883990df1ef721fb2439086412b5607bc4ec790;hpb=2e23774c6c65376512b31ec8a5248242a68c20e3;p=lyx.git

diff --git a/src/BufferEncodings.cpp b/src/BufferEncodings.cpp
index d883990df1..dcf422d54b 100644
--- a/src/BufferEncodings.cpp
+++ b/src/BufferEncodings.cpp
@@ -35,21 +35,15 @@ void BufferEncodings::initUnicodeMath(Buffer const & buffer, bool for_master)
 	}
 
 	// Check this buffer
-	Inset & inset = buffer.inset();
-	InsetIterator it = inset_iterator_begin(inset);
-	InsetIterator const end = inset_iterator_end(inset);
-	for (; it != end; ++it)
-		it->initUnicodeMath();
+	for (Inset const & it : buffer.inset())
+		it.initUnicodeMath();
 
 	if (!for_master)
 		return;
 
 	// Check children
-	ListOfBuffers blist = buffer.getDescendents();
-	ListOfBuffers::const_iterator bit = blist.begin();
-	ListOfBuffers::const_iterator const bend = blist.end();
-	for (; bit != bend; ++bit)
-		initUnicodeMath(**bit, false);
+	for (Buffer * buf : buffer.getDescendants())
+		initUnicodeMath(*buf, false);
 }
 
 
@@ -58,7 +52,7 @@ void BufferEncodings::validate(char_type c, LaTeXFeatures & features, bool for_m
 	CharInfo const & ci = Encodings::unicodeCharInfo(c);
 	if (ci.isUnicodeSymbol()) {
 		// In mathed, c could be used both in textmode and mathmode
-		docstring const textcommand = ci.textcommand;
+		docstring const textcommand = ci.textcommand();
 		bool const math_mode = for_mathed && isMathCmd(c);
 		bool const use_math = math_mode ||
 		                      (!for_mathed && textcommand.empty());
@@ -71,7 +65,7 @@ void BufferEncodings::validate(char_type c, LaTeXFeatures & features, bool for_m
 		// and if we do not use unicode-math
 		if ((math_mode && !unicode_math)
 		     || (use_math && !plain_utf8)) {
-			string const mathpreamble = ci.mathpreamble;
+			string const mathpreamble = ci.mathpreamble();
 			if (!mathpreamble.empty()) {
 				if (ci.mathfeature()) {
 					string feats = mathpreamble;
@@ -81,22 +75,25 @@ 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)
 		if (use_text && !plain_utf8) {
-			string const textpreamble = ci.textpreamble;
+			string const textpreamble = ci.textpreamble();
 			if (!textpreamble.empty()) {
 				if (ci.textfeature()) {
 					string feats = textpreamble;
 					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));
 			}
 		}
 	}