LayoutPtr style;
if (runparams_in.verbatim) {
- int const dist = std::distance(paragraphs.begin(), pit);
+ int const dist = distance(paragraphs.begin(), pit);
Font const outerfont = outerFont(dist, paragraphs);
// No newline if only one paragraph in this lyxtext
OutputParams tmp_rp = runparams;
runparams.moving_arg = false;
pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
- *(runparams.encoding), *encoding);
+ *encoding);
runparams = tmp_rp;
// the following is necessary after a CJK environment in a multilingual
// context (nesting issue).
}
Font const outerfont =
- outerFont(std::distance(paragraphs.begin(), pit),
+ outerFont(distance(paragraphs.begin(), pit),
paragraphs);
// FIXME UNICODE
par = TeXOnePar(buf, paragraphs, par, os, texrow,
runparams, everypar);
}
- if (std::distance(lastpar, par) >= std::distance(lastpar, endpar))
+ if (distance(lastpar, par) >= distance(lastpar, endpar))
break;
}
// It might be that we only have a title in this document
pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
- OutputParams const & runparams, Encoding const & oldEnc,
- Encoding const & newEnc)
+ OutputParams const & runparams, Encoding const & newEnc)
{
+ Encoding const oldEnc = *runparams.encoding;
bool moving_arg = runparams.moving_arg;
if ((bparams.inputenc != "auto" && bparams.inputenc != "default")
|| moving_arg)