}
// 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);
}
features.require(feat);
}
} else
- features.addPreambleSnippet(mathpreamble);
+ features.addPreambleSnippet(from_utf8(mathpreamble));
}
}
// with utf8-plain, we do not load packages (see #7766)
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));
}
}
}