#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
+#include "frontends/Selection.h"
#include "insets/insettext.h"
#include "insets/insetbibitem.h"
cur.resetAnchor();
setCursor(cur, to.pit(), to.pos());
cur.setSelection();
+ theSelection().haveSelection(cur.selection());
}
}
-void LyXText::acceptChange(LCursor & cur)
+void LyXText::acceptOrRejectChange(LCursor & cur, bool accept)
{
- // FIXME: change tracking (MG)
-
BOOST_ASSERT(this == cur.text());
- if (!cur.selection() && cur.lastpos() != 0)
+ if (!cur.selection())
return;
- // FIXME: we must handle start = end = 0
-
- recordUndoSelection(cur, Undo::INSERT);
-
- DocIterator it = cur.selectionBegin();
- DocIterator et = cur.selectionEnd();
- pit_type pit = it.pit();
- for (; pit <= et.pit(); ++pit) {
- pos_type left = (pit == it.pit() ? it.pos() : 0);
- pos_type right = (pit == et.pit() ? et.pos() : pars_[pit].size());
-
- // handle imaginary end-of-par character first
- if (right == pars_[pit].size() && !pars_[pit].isUnchanged(right)) {
- if (pars_[pit].isInserted(right)) {
- pars_[pit].setChange(right, Change(Change::UNCHANGED));
- } else {
- // if (pit + 1 < et.pit()) {
- // setCursorIntern(cur, pit + 1, 0);
- // backspacePos0(cur);
- // }
- }
- }
+ recordUndoSelection(cur, Undo::ATOMIC);
- pars_[pit].acceptChanges(left, right);
- }
- finishUndo();
- cur.clearSelection();
- setCursorIntern(cur, it.pit(), it.pos());
- cur.updateFlags(Update::Force);
-}
+ pit_type begPit = cur.selectionBegin().pit();
+ pit_type endPit = cur.selectionEnd().pit();
+ pos_type begPos = cur.selectionBegin().pos();
+ pos_type endPos = cur.selectionEnd().pos();
-void LyXText::rejectChange(LCursor & cur)
-{
- // FIXME: change tracking (MG)
+ // keep selection info, because endPos becomes invalid after the first loop
+ bool endsBeforeEndOfPar = (endPos < pars_[endPit].size());
- BOOST_ASSERT(this == cur.text());
+ // first, accept/reject changes within each individual paragraph (do not consider end-of-par)
+
+ for (pit_type pit = begPit; pit <= endPit; ++pit) {
+ pos_type parSize = pars_[pit].size();
- if (!cur.selection() && cur.lastpos() != 0)
- return;
+ // ignore empty paragraphs; otherwise, an assertion will fail for
+ // acceptChanges(bparams, 0, 0) or rejectChanges(bparams, 0, 0)
+ if (parSize == 0)
+ continue;
- // FIXME: we must handle start = end = 0
+ // do not consider first paragraph if the cursor starts at pos size()
+ if (pit == begPit && begPos == parSize)
+ continue;
- recordUndoSelection(cur, Undo::INSERT);
+ // do not consider last paragraph if the cursor ends at pos 0
+ if (pit == endPit && endPos == 0)
+ break; // last iteration anyway
- DocIterator it = cur.selectionBegin();
- DocIterator et = cur.selectionEnd();
- pit_type pit = it.pit();
- for (; pit <= et.pit(); ++pit) {
- pos_type left = (pit == it.pit() ? it.pos() : 0);
- pos_type right = (pit == et.pit() ? et.pos() : pars_[pit].size());
+ pos_type left = (pit == begPit ? begPos : 0);
+ pos_type right = (pit == endPit ? endPos : parSize);
- // handle imaginary end-of-par character first
- if (right == pars_[pit].size() && !pars_[pit].isUnchanged(right)) {
- if (pars_[pit].isDeleted(right)) {
- pars_[pit].setChange(right, Change(Change::UNCHANGED));
- } else {
- // if (pit + 1 < et.pit()) {
- // setCursorIntern(cur, pit + 1, 0);
- // backspacePos0(cur);
- // }
+ if (accept) {
+ pars_[pit].acceptChanges(cur.buffer().params(), left, right);
+ } else {
+ pars_[pit].rejectChanges(cur.buffer().params(), left, right);
+ }
+ }
+
+ // next, accept/reject imaginary end-of-par characters
+
+ for (pit_type pit = begPit; pit <= endPit; ++pit) {
+ pos_type pos = pars_[pit].size();
+
+ // skip if the selection ends before the end-of-par
+ if (pit == endPit && endsBeforeEndOfPar)
+ break; // last iteration anyway
+
+ // skip if this is not the last paragraph of the document
+ // note: the user should be able to accept/reject the par break of the last par!
+ if (pit == endPit && pit != pars_.size() - 1)
+ break; // last iteration anway
+
+ if (accept) {
+ if (pars_[pit].isInserted(pos)) {
+ pars_[pit].setChange(pos, Change(Change::UNCHANGED));
+ } else if (pars_[pit].isDeleted(pos)) {
+ if (pit == pars_.size() - 1) {
+ // we cannot remove a par break at the end of the last paragraph;
+ // instead, we mark it unchanged
+ pars_[pit].setChange(pos, Change(Change::UNCHANGED));
+ } else {
+ mergeParagraph(cur.buffer().params(), pars_, pit);
+ --endPit;
+ --pit;
+ }
+ }
+ } else {
+ if (pars_[pit].isDeleted(pos)) {
+ pars_[pit].setChange(pos, Change(Change::UNCHANGED));
+ } else if (pars_[pit].isInserted(pos)) {
+ if (pit == pars_.size() - 1) {
+ // we mark the par break at the end of the last paragraph unchanged
+ pars_[pit].setChange(pos, Change(Change::UNCHANGED));
+ } else {
+ mergeParagraph(cur.buffer().params(), pars_, pit);
+ --endPit;
+ --pit;
+ }
}
}
-
- pars_[pit].rejectChanges(left, right);
}
+
+ // finally, invoke the DEPM
+ // FIXME: the following code will be changed in the near future
+ setCursorIntern(cur, endPit, 0);
+ for (pit_type pit = endPit - 1; pit >= begPit; --pit) {
+ bool dummy;
+ LCursor old = cur;
+ setCursorIntern(cur, pit, 0);
+ deleteEmptyParagraphMechanism(cur, old, dummy);
+ }
+
finishUndo();
cur.clearSelection();
- setCursorIntern(cur, it.pit(), it.pos());
+ setCursorIntern(cur, begPit, begPos);
cur.updateFlags(Update::Force);
+ updateLabels(cur.buffer());
}
// this is the code for a normal delete, not pasting
// any paragraphs
recordUndo(cur, Undo::DELETE);
- par.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
- if (par.isDeleted(cur.pos()))
+ if(!par.eraseChar(cur.pos(), cur.buffer().params().trackChanges)) {
+ // the character has been logically deleted only => skip it
cur.forwardPosNoDescend();
+ }
needsUpdate = true;
} else {
if (cur.pit() == cur.lastpit())
odocstringstream os;
if (buf.params().trackChanges)
- os << "[C] ";
+ os << _("[Change Tracking] ");
Change change = par.lookupChange(cur.pos());
<< endl;
setCursor(cur, pit, pos, true, bound);
+ // remember new position.
+ cur.setTargetX();
}