commit 4d2074b3785b6fbe51f266218fe8cdb1a3527bb6
Author: Günter Milde <[email protected]>
Date:   Thu Nov 5 10:52:22 2015 +0100

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

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 20e0779..e9b9600 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -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;

Reply via email to