]> git.lyx.org Git - features.git/commitdiff
Fix encoding-setting of child document with LuaTeX and TeX-fonts
authorGünter Milde <milde@lyx.org>
Thu, 5 Nov 2015 09:52:22 +0000 (10:52 +0100)
committerGünter Milde <milde@lyx.org>
Thu, 5 Nov 2015 09:55:43 +0000 (10:55 +0100)
src/insets/InsetInclude.cpp

index 20e077976dece98b262ae481230c628367da1bd6..e9b96000754c4ce4ade9176208ff93a08f10473d 100644 (file)
@@ -688,9 +688,9 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                // and language.
                Encoding const * const oldEnc = runparams.encoding;
                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!
-               runparams.encoding = runparams.isFullUnicode() ?
+               runparams.encoding = masterBuffer->params().useNonTeXFonts ?
                        encodings.fromLyXName("utf8-plain")
                        : &tmp->params().encoding();
                runparams.master_language = buffer().params().language;