anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-20 14:40:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend 6def81f30ff4f73. Never switch encodings with XeTeX or LuaTeX.

Browse Source
This commit is contained in:
Günter Milde 2019-04-05 16:14:58 +02:00
parent 38fbbf07cd
commit 2183978f1a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output_latex.cpp
View File

@ -1337,15 +1337,13 @@ void TeXOnePar(Buffer const & buf,
} }
// Information about local language is stored as a font feature. // Information about local language is stored as a font feature.
// If this is the last paragraph, and a local_font was set upon entering // If this is the last paragraph of the inset and a local_font was set upon entering
// the inset and we're using "auto" or "default" encoding (and not // and we are mixing encodings ("auto" or "default" and no XeTeX or LuaTeX),
// compiling with LuaTeX), ensure the encoding is set back to the default // ensure the encoding is set back to the default encoding of the local language.
// encoding of the local language.
if (runparams.isLastPar && runparams_in.local_font != 0 if (runparams.isLastPar && runparams_in.local_font != 0
&& runparams_in.encoding != runparams_in.local_font->language()->encoding() && runparams_in.encoding != runparams_in.local_font->language()->encoding()
&& (bparams.inputenc == "auto" || bparams.inputenc == "default") && (bparams.inputenc == "auto" || bparams.inputenc == "default")
&& runparams.flavor != OutputParams::LUATEX && !runparams.isFullUnicode()
&& runparams.flavor != OutputParams::DVILUATEX
) { ) {
runparams_in.encoding = runparams_in.local_font->language()->encoding(); runparams_in.encoding = runparams_in.local_font->language()->encoding();
os << setEncoding(runparams_in.encoding->iconvName()); os << setEncoding(runparams_in.encoding->iconvName());