From a7e31230700185ed4ff53a3ca947c6a7aa8c8abb Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnter=20Milde?= Date: Mon, 18 Mar 2019 18:16:40 +0100 Subject: [PATCH] Fix #11520 Wrong inpute encoding when master and child use different setting. --- development/autotests/invertedTests | 3 --- src/insets/InsetInclude.cpp | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index c1f5cbb1dd..7d135e4228 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -137,9 +137,6 @@ export/templates/IEEEtran-Journal_lyx16 export/doc/(de|es)/Additional_pdf4_texF export/export/latex/xetex-inputenc-utf8_pdf4_texF -#11519 Wrong input encoding when parent and child use different setting.q -export/export/latex/parent-with-other-inputenc_pdf2 - #11520 "listerrors" fails with pdflatex, lualatex, and xelatex # Example for lib/scripts/listerrors # Requires noweb. Seems to be restricted to plain "latex". diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 87a817337b..9e70cd7cdd 100755 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -841,8 +841,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const // If the master uses non-TeX fonts (XeTeX, LuaTeX), // the children must be encoded in plain utf8! runparams.encoding = masterBuffer->params().useNonTeXFonts ? - encodings.fromLyXName("utf8-plain") - : &tmp->params().encoding(); + encodings.fromLyXName("utf8-plain") : oldEnc; runparams.master_language = buffer().params().language; runparams.par_begin = 0; runparams.par_end = tmp->paragraphs().size(); -- 2.39.5