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

inset-split: consider that freeSpacing() doesn't DEPM

Browse Source
This commit is contained in:
Juergen Spitzmueller 2020-12-27 14:28:03 +01:00
parent 11740f6fc0
commit 4886c0370b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Text.cpp
View File

@ -1950,10 +1950,13 @@ bool Text::splitInset(Cursor & cur)
cur.setMark(false);
cur.selHandle(false);
cur.resetAnchor();
Cursor dummy = cur;
dummy.pos() = dummy.pit() = 0;
if (cur.bv().checkDepm(dummy, cur))
bool atlastpos;
if (cur.pos() == 0 && cur.pit() > 0) {
// if we are at par start, remove this par
cur.text()->backspace(cur);
cur.forceBufferUpdate();
} else if (cur.pos() == cur.lastpos())
atlastpos = true;
// Move out of and jump over inset
cur.popBackward();
++cur.pos();
@ -1966,6 +1969,11 @@ bool Text::splitInset(Cursor & cur)
cutSelection(cur, false);
cap::pasteFromTemp(cur, cur.buffer()->errorList("Paste"));
cur.text()->setCursor(cur, 0, 0);
if (atlastpos && cur.paragraph().isFreeSpacing() && cur.paragraph().empty()) {
// We started from par end, remove extra empty par in free spacing insets
cur.text()->erase(cur);
cur.forceBufferUpdate();
}
}
cur.finishUndo();