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

Properly nest \lyxdeleted within text markup

Browse Source 
Fixes #8807
This commit is contained in:
Juergen Spitzmueller 2019-12-27 13:56:53 +01:00
parent 6964886daf
commit 28da0f4360
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Paragraph.cpp
View File

@ -2613,6 +2613,21 @@ void Paragraph::latex(BufferParams const & bparams,
current_font.language() != running_font.language()) && current_font.language() != running_font.language()) &&
i != body_pos - 1) 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.
bool needPar = false;
OutputParams rp = runparams;
column += running_font.latexWriteEndChanges(
os, bparams, rp, basefont,
basefont, needPar);
os << '}';
column += 1;
}
odocstringstream ods; odocstringstream ods;
column += current_font.latexWriteStartChanges(ods, bparams, column += current_font.latexWriteStartChanges(ods, bparams,
runparams, basefont, runparams, basefont,
@ -2641,6 +2656,13 @@ void Paragraph::latex(BufferParams const & bparams,
<< from_ascii("{}"); << from_ascii("{}");
else else
os << fontchange; os << fontchange;
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, rp);
}
} }
// FIXME: think about end_pos implementation... // FIXME: think about end_pos implementation...