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

Properly close and reopen lyxdeleted macro at font change

Browse Source 
Fixes #11867, amends [28da0f4360a/lyxgit]
This commit is contained in:
Juergen Spitzmueller 2020-05-17 14:54:59 +02:00
parent 602ac1401e
commit 0328ecd019
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Paragraph.cpp
View File

@ -2563,6 +2563,10 @@ void Paragraph::latex(BufferParams const & bparams,
Font const current_font = getFont(bparams, i, outerfont);
Font const last_font = running_font;
bool const in_ct_deletion = (bparams.output_changes
&& runningChange == change
&& change.type == Change::DELETED
&& !os.afterParbreak());
// Do we need to close the previous font?
if (open_font &&
@ -2576,10 +2580,23 @@ void Paragraph::latex(BufferParams const & bparams,
alien_script.clear();
}
bool needPar = false;
if (in_ct_deletion) {
// We have to close and then reopen \lyxdeleted,
// as strikeout needs to be on lowest level.
os << '}';
column += 1;
}
column += running_font.latexWriteEndChanges(
os, bparams, runparams, basefont,
(i == body_pos-1) ? basefont : current_font,
needPar);
if (in_ct_deletion) {
// We have to close and then reopen \lyxdeleted,
// as strikeout needs to be on lowest level.
OutputParams rp = runparams;
column += Changes::latexMarkChange(os, bparams,
Change(Change::UNCHANGED), Change(Change::DELETED), rp);
}
running_font = basefont;
open_font = false;
}
@ -2625,13 +2642,9 @@ void Paragraph::latex(BufferParams const & bparams,
// Do we need to change font?
if ((current_font != running_font ||
current_font.language() != running_font.language()) &&
i != body_pos - 1)
current_font.language() != running_font.language())
&& i != body_pos - 1)
{
bool const in_ct_deletion = (bparams.output_changes
&& runningChange == change
&& change.type == Change::DELETED
&& !os.afterParbreak());
if (in_ct_deletion) {
// We have to close and then reopen \lyxdeleted,
// as strikeout needs to be on lowest level.