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

Amend 448e5efab4

Browse Source 
Only set langClosed to true if it really has been closed.
This commit is contained in:
Juergen Spitzmueller 2020-09-26 12:12:09 +02:00
parent bf0f662e93
commit b38500353c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Paragraph.cpp
View File

@ -2638,10 +2638,10 @@ void Paragraph::latex(BufferParams const & bparams,
if (closeLanguage) if (closeLanguage)
// Force language closing // Force language closing
current_font.setLanguage(basefont.language()); current_font.setLanguage(basefont.language());
Font const nextfont = (i == body_pos-1) ? basefont : current_font;
column += running_font.latexWriteEndChanges( column += running_font.latexWriteEndChanges(
os, bparams, runparams, basefont, os, bparams, runparams, basefont,
(i == body_pos-1) ? basefont : current_font, nextfont, needPar);
needPar);
if (in_ct_deletion) { if (in_ct_deletion) {
// We have to close and then reopen \lyxdeleted, // We have to close and then reopen \lyxdeleted,
// as strikeout needs to be on lowest level. // as strikeout needs to be on lowest level.
@ -2649,9 +2649,12 @@ void Paragraph::latex(BufferParams const & bparams,
column += Changes::latexMarkChange(os, bparams, column += Changes::latexMarkChange(os, bparams,
Change(Change::UNCHANGED), Change(Change::DELETED), rp); Change(Change::UNCHANGED), Change(Change::DELETED), rp);
} }
running_font = basefont;
open_font = false; open_font = false;
langClosed = true; // Has the language been closed in the latexWriteEndChanges() call above?
langClosed = running_font.language() != basefont.language()
&& running_font.language() != nextfont.language()
&& (running_font.language()->encoding()->package() != Encoding::CJK);
running_font = basefont;
} }
// if necessary, close language environment before opening CJK // if necessary, close language environment before opening CJK