Fix #11520 Wrong inpute encoding when master and child use different setting.

diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index c1f5cbb1dd69bff3c9bc07adb076b6e99b5fb68d..7d135e4228b743f094d887c83000dd30af1121aa 100644 (file)
--- 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 87a817337bae5210abb59510f95728aa652494e1..9e70cd7cdd8d9cf0ac44d0de08c4bf6f5fd4f9f9 100755 (executable)
--- 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();