mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-03 08:28:25 +00:00
* src/text.C: (backspacePos0): rewrite to make it simple and allow
deleting empty paragraphs even when keepempty is true. Do not rely on dEPM, since this was silly (bugs 2587 and 2882) (Delete): simplify also and avoid calling backspace. (backspace): small tweak. (patch by Jean-Marc) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15801 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt
parent
e0fb6ae2cf
commit
4c765ba889
145
src/text.C
145
src/text.C
@ -1630,35 +1630,39 @@ bool LyXText::erase(LCursor & cur)
|
||||
{
|
||||
BOOST_ASSERT(this == cur.text());
|
||||
bool needsUpdate = false;
|
||||
Paragraph & par = cur.paragraph();
|
||||
|
||||
if (cur.pos() != cur.lastpos()) {
|
||||
recordUndo(cur, Undo::DELETE, cur.pit());
|
||||
setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
|
||||
needsUpdate = backspace(cur);
|
||||
// this is the code for a normal delete, not pasting
|
||||
// any paragraphs
|
||||
recordUndo(cur, Undo::DELETE);
|
||||
// FIXME: change tracking (MG)
|
||||
if (cur.paragraph().isDeleted(cur.pos()))
|
||||
cur.posRight();
|
||||
par.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
|
||||
if (par.isDeleted(cur.pos()))
|
||||
cur.forwardPos();
|
||||
needsUpdate = true;
|
||||
} else if (cur.pit() != cur.lastpit()) {
|
||||
LCursor scur = cur;
|
||||
|
||||
setCursorIntern(cur, cur.pit() + 1, 0, false, false);
|
||||
if (pars_[cur.pit()].layout() == pars_[scur.pit()].layout()) {
|
||||
recordUndo(scur, Undo::DELETE, scur.pit());
|
||||
needsUpdate = backspace(cur);
|
||||
if (cur.buffer().params().trackChanges) {
|
||||
// FIXME: Change tracking (MG)
|
||||
// move forward after the paragraph break is DELETED
|
||||
Paragraph & par = cur.paragraph();
|
||||
// FIXME: change tracking (MG)
|
||||
if (par.isDeleted(par.size()))
|
||||
setCursorIntern(cur, cur.pit() + 1, 0);
|
||||
}
|
||||
if (cur.buffer().params().trackChanges
|
||||
&& par.isInserted(cur.pos())) {
|
||||
// mark "carriage return" as deleted:
|
||||
// FIXME: Change tracking (MG)
|
||||
par.setChange(cur.pos(), Change(Change::DELETED));
|
||||
cur.forwardPos();
|
||||
needsUpdate = true;
|
||||
} else {
|
||||
setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
|
||||
setCursorIntern(cur, cur.pit() + 1, 0);
|
||||
needsUpdate = backspacePos0(cur);
|
||||
// FIXME: Change tracking (MG)
|
||||
if (cur.paragraph().isDeleted(cur.pos()))
|
||||
cur.forwardPos();
|
||||
}
|
||||
} else
|
||||
needsUpdate = dissolveInset(cur);
|
||||
|
||||
// Make sure the cursor is correct. Is this really needed?
|
||||
if (needsUpdate)
|
||||
setCursorIntern(cur, cur.pit(), cur.pos());
|
||||
|
||||
return needsUpdate;
|
||||
}
|
||||
|
||||
@ -1666,79 +1670,56 @@ bool LyXText::erase(LCursor & cur)
|
||||
bool LyXText::backspacePos0(LCursor & cur)
|
||||
{
|
||||
BOOST_ASSERT(this == cur.text());
|
||||
if (cur.pit() == 0)
|
||||
return false;
|
||||
|
||||
bool needsUpdate = false;
|
||||
|
||||
Paragraph & par = cur.paragraph();
|
||||
BufferParams const & bufparams = cur.buffer().params();
|
||||
LyXTextClass const & tclass = bufparams.getLyXTextClass();
|
||||
ParagraphList & plist = cur.text()->paragraphs();
|
||||
Paragraph const & par = cur.paragraph();
|
||||
LCursor prevcur = cur;
|
||||
--prevcur.pit();
|
||||
prevcur.pos() = prevcur.lastpos();
|
||||
Paragraph const & prevpar = prevcur.paragraph();
|
||||
|
||||
// is it an empty paragraph?
|
||||
pos_type lastpos = cur.lastpos();
|
||||
if (lastpos == 0 || (lastpos == 1 && par.isSeparator(0))) {
|
||||
// This is an empty paragraph and we delete it just
|
||||
// by moving the cursor one step
|
||||
// left and let the DeleteEmptyParagraphMechanism
|
||||
// handle the actual deletion of the paragraph.
|
||||
|
||||
if (cur.pit() != 0) {
|
||||
// For KeepEmpty layouts we need to get
|
||||
// rid of the keepEmpty setting first.
|
||||
// And the only way to do this is to
|
||||
// reset the layout to something
|
||||
// else: f.ex. the default layout.
|
||||
if (par.allowEmpty()) {
|
||||
Buffer & buf = cur.buffer();
|
||||
BufferParams const & bparams = buf.params();
|
||||
par.layout(bparams.getLyXTextClass().defaultLayout());
|
||||
}
|
||||
|
||||
cursorLeft(cur);
|
||||
return true;
|
||||
}
|
||||
if (cur.lastpos() == 0
|
||||
|| (cur.lastpos() == 1 && par.isSeparator(0))) {
|
||||
recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
|
||||
plist.erase(boost::next(plist.begin(), cur.pit()));
|
||||
needsUpdate = true;
|
||||
}
|
||||
|
||||
if (cur.pit() != 0)
|
||||
recordUndo(cur, Undo::DELETE, cur.pit() - 1);
|
||||
|
||||
pit_type tmppit = cur.pit();
|
||||
// We used to do cursorLeftIntern() here, but it is
|
||||
// not a good idea since it triggers the auto-delete
|
||||
// mechanism. So we do a cursorLeftIntern()-lite,
|
||||
// without the dreaded mechanism. (JMarc)
|
||||
if (cur.pit() != 0) {
|
||||
// steps into the above paragraph.
|
||||
setCursorIntern(cur, cur.pit() - 1,
|
||||
pars_[cur.pit() - 1].size(),
|
||||
false);
|
||||
// is previous par empty?
|
||||
else if (prevcur.lastpos() == 0
|
||||
|| (prevcur.lastpos() == 1 && prevpar.isSeparator(0))) {
|
||||
recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
|
||||
plist.erase(boost::next(plist.begin(), prevcur.pit()));
|
||||
needsUpdate = true;
|
||||
}
|
||||
|
||||
// Pasting is not allowed, if the paragraphs have different
|
||||
// layout. I think it is a real bug of all other
|
||||
// word processors to allow it. It confuses the user.
|
||||
// Correction: Pasting is always allowed with standard-layout
|
||||
// Correction (Jug 20050717): Remove check about alignment!
|
||||
Buffer & buf = cur.buffer();
|
||||
BufferParams const & bufparams = buf.params();
|
||||
LyXTextClass const & tclass = bufparams.getLyXTextClass();
|
||||
pit_type const cpit = cur.pit();
|
||||
|
||||
if (cpit != tmppit
|
||||
&& (pars_[cpit].layout() == pars_[tmppit].layout()
|
||||
|| pars_[tmppit].layout() == tclass.defaultLayout()))
|
||||
{
|
||||
mergeParagraph(bufparams, pars_, cpit);
|
||||
else if (par.layout() == prevpar.layout()
|
||||
|| par.layout() == tclass.defaultLayout()) {
|
||||
recordUndo(cur, Undo::ATOMIC, prevcur.pit());
|
||||
mergeParagraph(bufparams, plist, prevcur.pit());
|
||||
needsUpdate = true;
|
||||
|
||||
if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
|
||||
--cur.pos();
|
||||
|
||||
// the counters may have changed
|
||||
ParIterator par_it(cur);
|
||||
updateLabels(cur.buffer(), par_it);
|
||||
|
||||
setCursor(cur, cur.pit(), cur.pos(), false);
|
||||
}
|
||||
|
||||
if (needsUpdate) {
|
||||
updateLabels(cur.buffer());
|
||||
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
|
||||
}
|
||||
|
||||
return needsUpdate;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
bool LyXText::backspace(LCursor & cur)
|
||||
{
|
||||
BOOST_ASSERT(this == cur.text());
|
||||
@ -1747,11 +1728,7 @@ bool LyXText::backspace(LCursor & cur)
|
||||
if (cur.pit() == 0)
|
||||
return dissolveInset(cur);
|
||||
|
||||
// The cursor is at the beginning of a paragraph, so
|
||||
// the the backspace will collapse two paragraphs into
|
||||
// one.
|
||||
|
||||
if (cur.pit() != 0 && cur.buffer().params().trackChanges) {
|
||||
if (cur.buffer().params().trackChanges) {
|
||||
// FIXME: Change tracking (MG)
|
||||
// Previous paragraph, mark "carriage return" as
|
||||
// deleted:
|
||||
@ -1766,6 +1743,8 @@ bool LyXText::backspace(LCursor & cur)
|
||||
}
|
||||
}
|
||||
|
||||
// The cursor is at the beginning of a paragraph, so
|
||||
// the backspace will collapse two paragraphs into one.
|
||||
needsUpdate = backspacePos0(cur);
|
||||
|
||||
} else {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user