#include <algorithm>
-using lyx::paroffset_type;
+using std::advance;
+
+using lyx::par_type;
+
+using std::endl;
namespace {
void recordUndo(Undo::undo_kind kind,
- LCursor & cur, paroffset_type first_par, paroffset_type last_par,
+ LCursor & cur, par_type first_par, par_type last_par,
limited_stack<Undo> & stack)
{
BOOST_ASSERT(first_par <= cur.lastpar());
// create the position information of the Undo entry
Undo undo;
undo.kind = kind;
- undo.cursor = StableDocumentIterator(cur);
+ undo.cursor = StableDocIterator(cur);
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
// this implements redo
otherstack.push(undo);
- DocumentIterator dit =
- undo.cursor.asDocumentIterator(&bv.buffer()->inset());
+ DocIterator dit =
+ undo.cursor.asDocIterator(&bv.buffer()->inset());
if (dit.inMathed()) {
- // not much to be done
+ // Easy way out: store a full cell.
+ otherstack.top().array = asString(dit.cell());
} else {
+ // As cells might be too large in texted, store just a part
+ // of the paragraph list.
otherstack.top().pars.clear();
LyXText * text = dit.text();
BOOST_ASSERT(text);
void recordUndo(Undo::undo_kind kind,
- LCursor & cur, paroffset_type first, paroffset_type last)
+ LCursor & cur, par_type first, par_type last)
{
Buffer * buf = cur.bv().buffer();
recordUndo(kind, cur, first, last, buf->undostack());
}
+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());
}
-void recordUndo(LCursor & cur, Undo::undo_kind kind, paroffset_type from)
+void recordUndo(LCursor & cur, Undo::undo_kind kind, par_type from)
{
recordUndo(kind, cur, cur.par(), from);
}
void recordUndo(LCursor & cur, Undo::undo_kind kind,
- paroffset_type from, paroffset_type to)
+ par_type from, par_type to)
{
recordUndo(kind, cur, from, to);
}