#include <algorithm>
-using std::advance;
-
using lyx::par_type;
+using std::advance;
using std::endl;
std::ostream & operator<<(std::ostream & os, Undo const & undo)
{
- return os << " from: " << undo.from
- << " end: " << undo.end
+ return os << " from: " << undo.from << " end: " << undo.end
<< " cursor:\n" << undo.cursor;
}
// create the position information of the Undo entry
Undo undo;
undo.kind = kind;
- undo.cursor = StableDocumentIterator(cur);
+ undo.cursor = StableDocIterator(cur);
+ lyxerr << "recordUndo: cur: " << cur << endl;
+ lyxerr << "recordUndo: undo.cursor: " << undo.cursor << endl;
undo.from = first_par;
undo.end = cur.lastpar() - last_par;
undo.pars = ParagraphList(first, last);
}
- // push the undo entry to undo stack
+ // push the undo entry to undo stack
//lyxerr << "undo record: " << stack.top() << std::endl;
stack.push(undo);
{
LCursor & cur = bv.cursor();
lyxerr << "undo, performing: " << undo << std::endl;
- cur.setCursor(undo.cursor.asDocumentIterator(&bv.buffer()->inset()), false);
+ cur.setCursor(undo.cursor.asDocIterator(&bv.buffer()->inset()));
+ cur.selection() = false;
if (cur.inMathed()) {
// We stored the full cell here as there is not much to be
}
-// returns false if no undo possible
+// Returns false if no undo possible.
bool textUndoOrRedo(BufferView & bv,
limited_stack<Undo> & stack, limited_stack<Undo> & otherstack)
{
if (stack.empty()) {
- // nothing to do
+ // Nothing to do.
finishUndo();
return false;
}
stack.pop();
finishUndo();
- // this implements redo
+ // This implements redo
otherstack.push(undo);
- DocumentIterator dit =
- undo.cursor.asDocumentIterator(&bv.buffer()->inset());
+ // FIXME: This triggers the error in dociterator.C +454
+ // could the reason be that we rebuild the dit _before_ the
+ // contents is actually 'undone'?
+ // I.e. state now is 'A', state on undo stack is 'B'.
+ // dit is created according to positions from undo.cursor, i.e. B
+ // but current buffer contents is more likely 'A'.
+ DocIterator dit = undo.cursor.asDocIterator(&bv.buffer()->inset());
if (dit.inMathed()) {
// Easy way out: store a full cell.
otherstack.top().array = asString(dit.cell());
void finishUndo()
{
- // makes sure the next operation will be stored
+ // Make sure the next operation will be stored.
undo_finished = true;
}
Buffer * buf = cur.bv().buffer();
recordUndo(kind, cur, first, last, buf->undostack());
buf->redostack().clear();
- //lyxerr << "undostack:\n";
- //for (size_t i = 0, n = buf->undostack().size(); i != n && i < 6; ++i)
- // lyxerr << " " << i << ": " << buf->undostack()[i] << std::endl;
+ lyxerr << "undostack:\n";
+ for (size_t i = 0, n = buf->undostack().size(); i != n && i < 6; ++i)
+ lyxerr << " " << i << ": " << buf->undostack()[i] << std::endl;
}
}
+void recordUndoInset(LCursor & cur, Undo::undo_kind kind)
+{
+ LCursor c = cur;
+ c.pop();
+ recordUndo(c, kind);
+}
+
+
void recordUndoSelection(LCursor & cur, Undo::undo_kind kind)
{
recordUndo(kind, cur, cur.selBegin().par(), cur.selEnd().par());