if (language()->encoding()->package() == Encoding::CJK) {
pair<bool, int> const c = switchEncoding(os, bparams,
- runparams, *(runparams.encoding),
- *(language()->encoding()));
+ runparams, *(language()->encoding()));
if (c.first) {
open_encoding_ = true;
count += c.second;
// to do correct environment nesting
Encoding const * const ascii = encodings.getFromLyXName("ascii");
pair<bool, int> const c = switchEncoding(os, bparams,
- runparams, *(runparams.encoding),
- *ascii);
+ runparams, *ascii);
BOOST_ASSERT(c.first);
count += c.second;
runparams.encoding = ascii;
runparams.encoding->package() == Encoding::none &&
font.language()->encoding()->package() == Encoding::none) {
pair<bool, int> const enc_switch = switchEncoding(os, bparams,
- runparams, *(runparams.encoding),
- *(font.language()->encoding()));
+ runparams, *(font.language()->encoding()));
if (enc_switch.first) {
column += enc_switch.second;
runparams.encoding = font.language()->encoding();
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).
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)
OutputParams const &,
std::string const & everypar = std::string());
-/// Switch the encoding of \p os from \p oldEnc to \p newEnc if needed.
+/// Switch the encoding of \p os from runparams.encoding to \p newEnc if needed.
/// \return (did the encoding change?, number of characters written to \p os)
-std::pair<bool, int> switchEncoding(odocstream & os,
+std::pair<bool, int> switchEncoding(odocstream & os,
BufferParams const & bparams,
- OutputParams const &, Encoding const & oldEnc,
- Encoding const & newEnc);
+ OutputParams const &, Encoding const & newEnc);
} // namespace lyx