BufferParams const & bparams = buf.params();
- Layout const & style = pit->forceEmptyLayout() ?
+ Layout const & style = pit->forcePlainLayout() ?
bparams.documentClass().emptyLayout() : pit->layout();
ParagraphList const & paragraphs = text.paragraphs();
return nextpit;
}
- Layout const style = pit->forceEmptyLayout() ?
+ Layout const style = pit->forcePlainLayout() ?
bparams.documentClass().emptyLayout() : pit->layout();
OutputParams runparams = runparams_in;
// the inset, and we're using "auto" or "default" encoding, the encoding
// should be set back to that local_font's encoding.
if (nextpit == paragraphs.end() && runparams_in.local_font != 0
+ && runparams_in.encoding != runparams_in.local_font->language()->encoding()
&& (bparams.inputenc == "auto" || bparams.inputenc == "default")) {
runparams_in.encoding = runparams_in.local_font->language()->encoding();
os << setEncoding(runparams_in.encoding->iconvName());
-
}
// Otherwise, the current encoding should be set for the next paragraph.
else
// if only_body
while (par != endpar) {
lastpar = par;
- Layout const & layout = par->forceEmptyLayout() ?
+ Layout const & layout = par->forcePlainLayout() ?
tclass.emptyLayout() :
par->layout();
was_title = false;
}
- if (layout.is_environment) {
- par = TeXOnePar(buf, text, par, os, texrow,
- runparams, everypar);
- } else if (layout.isEnvironment() ||
+ if (layout.isEnvironment() ||
!par->params().leftIndent().zero()) {
par = TeXEnvironment(buf, text, par, os,
texrow, runparams);
pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
- OutputParams const & runparams, Encoding const & newEnc)
+ OutputParams const & runparams, Encoding const & newEnc,
+ bool force)
{
Encoding const oldEnc = *runparams.encoding;
bool moving_arg = runparams.moving_arg;
- if ((bparams.inputenc != "auto" && bparams.inputenc != "default")
- || moving_arg)
+ if (!force && ((bparams.inputenc != "auto" && bparams.inputenc != "default")
+ || moving_arg))
return make_pair(false, 0);
// Do nothing if the encoding is unchanged.