From b343f81deaf689f65f87e3b4e0d30065d4bbf418 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnter=20Milde?= Date: Fri, 5 Apr 2019 16:14:58 +0200 Subject: [PATCH] Amend 6def81f30ff4f73. Never switch encodings with XeTeX or LuaTeX. --- src/output_latex.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 784a9e58bb..3816e65718 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -1337,15 +1337,13 @@ void TeXOnePar(Buffer const & buf, } // Information about local language is stored as a font feature. - // If this is the last paragraph, and a local_font was set upon entering - // the inset and we're using "auto" or "default" encoding (and not - // compiling with LuaTeX), ensure the encoding is set back to the default - // encoding of the local language. + // If this is the last paragraph of the inset and a local_font was set upon entering + // and we are mixing encodings ("auto" or "default" and no XeTeX or LuaTeX), + // ensure the encoding is set back to the default encoding of the local language. if (runparams.isLastPar && runparams_in.local_font != 0 && runparams_in.encoding != runparams_in.local_font->language()->encoding() && (bparams.inputenc == "auto" || bparams.inputenc == "default") - && runparams.flavor != OutputParams::LUATEX - && runparams.flavor != OutputParams::DVILUATEX + && !runparams.isFullUnicode() ) { runparams_in.encoding = runparams_in.local_font->language()->encoding(); os << setEncoding(runparams_in.encoding->iconvName()); -- 2.39.5