From 72f24353fadc00743af54b78c53dda5479dd8cf5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Sun, 28 Nov 2010 14:20:45 +0000 Subject: [PATCH] * InsetInclude.cpp: - if a master is compiled with XeteX or LuaTeX, all children must have plain utf8 encoding (bug #6774). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36554 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetInclude.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 8129aff8c7..f0e2f99807 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -20,6 +20,7 @@ #include "BufferView.h" #include "Cursor.h" #include "DispatchResult.h" +#include "Encoding.h" #include "ErrorList.h" #include "Exporter.h" #include "Format.h" @@ -579,7 +580,11 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const // and language. Encoding const * const oldEnc = runparams.encoding; Language const * const oldLang = runparams.master_language; - runparams.encoding = &tmp->params().encoding(); + // If the master has full unicode flavor (XeTeX, LuaTeX), + // the children must be encoded in plain utf8! + runparams.encoding = runparams.isFullUnicode() ? + encodings.fromLyXName("utf8-plain") + : &tmp->params().encoding(); runparams.master_language = buffer().params().language; tmp->makeLaTeXFile(writefile, masterFileName(buffer()).onlyPath().absFileName(), -- 2.39.2