Fix encoding-setting of child document with LuaTeX and TeX-fonts

This commit is contained in:
Günter Milde 2015-11-05 10:52:22 +01:00
parent 576159156e
commit 4d2074b378

View File

@ -688,9 +688,9 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
// and language. // and language.
Encoding const * const oldEnc = runparams.encoding; Encoding const * const oldEnc = runparams.encoding;
Language const * const oldLang = runparams.master_language; Language const * const oldLang = runparams.master_language;
// If the master has full unicode flavor (XeTeX, LuaTeX), // If the master uses non-TeX fonts (XeTeX, LuaTeX),
// the children must be encoded in plain utf8! // the children must be encoded in plain utf8!
runparams.encoding = runparams.isFullUnicode() ? runparams.encoding = masterBuffer->params().useNonTeXFonts ?
encodings.fromLyXName("utf8-plain") encodings.fromLyXName("utf8-plain")
: &tmp->params().encoding(); : &tmp->params().encoding();
runparams.master_language = buffer().params().language; runparams.master_language = buffer().params().language;