From: Günter Milde <milde@lyx.org>
Date: Thu, 5 Nov 2015 09:52:22 +0000 (+0100)
Subject: Fix encoding-setting of child document with LuaTeX and TeX-fonts
X-Git-Tag: 2.2.0alpha1~62
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4d2074b3785b6fbe51f266218fe8cdb1a3527bb6;p=features.git

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

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 20e077976d..e9b9600075 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;