fix reading the author field.

[lyx.git] / src / undo.C

diff --git a/src/undo.C b/src/undo.C
index ab798f3dfe8d32c6d60eedb02da7bef9a09f4310..d7a36941d0b6769fd933840b2475f3ce4f988c80 100644 (file)
--- a/src/undo.C
+++ b/src/undo.C
@@ -27,13 +27,14 @@
 
 #include <algorithm>
 
-using lyx::paroffset_type;
+using std::advance;
 
+using lyx::par_type;
+
+using std::endl;
 
-namespace {
 
-/// Whether actions are not added to the undo stacks.
-bool undo_frozen;
+namespace {
 
 /// The flag used by finishUndo().
 bool undo_finished;
@@ -48,7 +49,7 @@ std::ostream & operator<<(std::ostream & os, Undo const & undo)
 
 
 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());
@@ -60,7 +61,7 @@ void recordUndo(Undo::undo_kind kind,
        // 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;
 
@@ -94,7 +95,7 @@ void recordUndo(Undo::undo_kind kind,
                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);
 
@@ -107,7 +108,8 @@ void performUndoOrRedo(BufferView & bv, Undo const & 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
@@ -153,32 +155,31 @@ bool textUndoOrRedo(BufferView & bv,
        finishUndo();
 
        // this implements redo
-       if (!undo_frozen) {
-               otherstack.push(undo);
-               DocumentIterator dit =
-                       undo.cursor.asDocumentIterator(&bv.buffer()->inset());
-               if (dit.inMathed()) {
-                       // not much to be done
-               } else {
-                       otherstack.top().pars.clear();
-                       LyXText * text = dit.text();
-                       BOOST_ASSERT(text);
-                       ParagraphList & plist = text->paragraphs();
-                       if (undo.from + undo.end <= int(plist.size())) {
-                               ParagraphList::iterator first = plist.begin();
-                               advance(first, undo.from);
-                               ParagraphList::iterator last = plist.begin();
-                               advance(last, plist.size() - undo.end);
-                               otherstack.top().pars.insert(otherstack.top().pars.begin(), first, last);
-                       }
+       otherstack.push(undo);
+       DocIterator dit =
+               undo.cursor.asDocIterator(&bv.buffer()->inset());
+       if (dit.inMathed()) {
+               // 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);
+               ParagraphList & plist = text->paragraphs();
+               if (undo.from + undo.end <= int(plist.size())) {
+                       ParagraphList::iterator first = plist.begin();
+                       advance(first, undo.from);
+                       ParagraphList::iterator last = plist.begin();
+                       advance(last, plist.size() - undo.end);
+                       otherstack.top().pars.insert(otherstack.top().pars.begin(), first, last);
                }
-               otherstack.top().cursor = bv.cursor();
-               //lyxerr << " undo other: " << otherstack.top() << std::endl;
        }
+       otherstack.top().cursor = bv.cursor();
+       //lyxerr << " undo other: " << otherstack.top() << std::endl;
 
-       undo_frozen = true;
        performUndoOrRedo(bv, undo);
-       undo_frozen = false;
        return true;
 }
 
@@ -207,16 +208,14 @@ bool textRedo(BufferView & bv)
 
 
 void recordUndo(Undo::undo_kind kind,
-       LCursor & cur, paroffset_type first, paroffset_type last)
+       LCursor & cur, par_type first, par_type last)
 {
-       if (undo_frozen)
-               return;
        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;
 }
 
 
@@ -226,20 +225,28 @@ void recordUndo(LCursor & cur, Undo::undo_kind kind)
 }
 
 
+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);
 }