anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Günter Milde 2019-03-18 18:16:40 +01:00
parent dae90c6161
commit 553bebc355
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
development/autotests/invertedTests
View File

@ -137,9 +137,6 @@ export/templates/IEEEtran-Journal_lyx16
export/doc/(de|es)/Additional_pdf4_texF export/doc/(de|es)/Additional_pdf4_texF
export/export/latex/xetex-inputenc-utf8_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 #11520 "listerrors" fails with pdflatex, lualatex, and xelatex
# Example for lib/scripts/listerrors # Example for lib/scripts/listerrors
# Requires noweb. Seems to be restricted to plain "latex". # Requires noweb. Seems to be restricted to plain "latex".

3
src/insets/InsetInclude.cpp
View File

@ -841,8 +841,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
// If the master uses non-TeX fonts (XeTeX, LuaTeX), // If the master uses non-TeX fonts (XeTeX, LuaTeX),
// the children must be encoded in plain utf8! // the children must be encoded in plain utf8!
runparams.encoding = masterBuffer->params().useNonTeXFonts ? runparams.encoding = masterBuffer->params().useNonTeXFonts ?
encodings.fromLyXName("utf8-plain") encodings.fromLyXName("utf8-plain") : oldEnc;
: &tmp->params().encoding();
runparams.master_language = buffer().params().language; runparams.master_language = buffer().params().language;
runparams.par_begin = 0; runparams.par_begin = 0;
runparams.par_end = tmp->paragraphs().size(); runparams.par_end = tmp->paragraphs().size();