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

Fix crash with polyglossia and intitle commands when lang_auto_end is false

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-11-21 08:38:21 +01:00
parent 772f2a2841
commit ed44bc9b12
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/output_latex.cpp
View File

@ -781,6 +781,10 @@ void TeXOnePar(Buffer const & buf,
? nullptr : &paragraphs.at(pit + 1);
bool const intitle_command = style.intitle && style.isCommand();
// Intitle commands switch languages locally, thus increase
// language nesting level
if (intitle_command)
state->nest_level_ += 1;
if (style.pass_thru) {
Font const outerfont = text.outerFont(pit);
@ -1454,6 +1458,10 @@ void TeXOnePar(Buffer const & buf,
}
}
// Reset language nesting level after intitle command
if (intitle_command)
state->nest_level_ -= 1;
LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " done; ptr "
<< &par << " next " << nextpar);
@ -1645,7 +1653,9 @@ void latexParagraphs(Buffer const & buf,
"$$lang",
mainlang))
<< '\n';
if (using_begin_end)
// If we have language_auto_begin, the stack will
// already be empty, nothing to pop()
if (using_begin_end && !lyxrc.language_auto_begin)
popLanguageName();
}