fix reading the author field.

[lyx.git] / src / undo.h

diff --git a/src/undo.h b/src/undo.h
index 07f177fe36d7193669b4fc36ac0e10b90ba31926..501ace924e1b0bc713d4d9b6ff9ea66ace85b1ed 100644 (file)
--- a/src/undo.h
+++ b/src/undo.h
@@ -16,9 +16,13 @@
 #ifndef UNDO_H
 #define UNDO_H
 
+#include "dociterator.h"
 #include "ParagraphList_fwd.h"
+
 #include "support/types.h"
 
+#include <string>
+
 class LCursor;
 class BufferView;
 
@@ -28,8 +32,7 @@ class BufferView;
  * contains complete paragraphs and sufficient information
  * to restore the state.
  */
-class Undo {
-public:
+struct Undo {
        /// This is used to combine consecutive undo recordings of the same kind.
        enum undo_kind {
                /**
@@ -46,27 +49,18 @@ public:
                ATOMIC
        };
 
-       /// constructor
-       Undo(undo_kind kind, int text, int index,
-               int first_par, int end_par, int cursor_par, int cursor_pos);
-
-public:
-       /// which kind of operation are we recording for?
+       /// Which kind of operation are we recording for?
        undo_kind kind;
-       /// hosting LyXText counted from buffer begin
-       int text;
-       /// cell in a tabular or similar
-       int index;
-       /// offset to the first paragraph in the paragraph list
-       int first_par;
-       /// offset to the last paragraph from the end of paragraph list
-       int end_par;
-       /// offset to the first paragraph in the paragraph list
-       int cursor_par;
-       /// the position of the cursor in the hosting paragraph
-       int cursor_pos;
-       /// the contents of the paragraphs saved
+       /// the position of the cursor
+       StableDocIterator cursor;
+       /// counted from begin of buffer
+       lyx::par_type from;
+       /// complement to end of this cell
+       lyx::par_type end;
+       /// the contents of the saved paragraphs (for texted)
        ParagraphList pars;
+       /// the contents of the saved matharray (for mathed)
+       std::string array;
 };
 
 
@@ -79,12 +73,6 @@ bool textRedo(BufferView &);
 /// makes sure the next operation will be stored
 void finishUndo();
 
-/// whilst undo is frozen, all actions do not get added to the undo stack
-void freezeUndo();
-
-/// track undos again
-void unFreezeUndo();
-
 
 /**
  * Record undo information - call with the current cursor and the 'other
@@ -93,20 +81,22 @@ void unFreezeUndo();
  * will record the original information of the paragraphs in the undo stack.
  */
 
-/// the common case: prepare undo for an arbitrary range
+/// The general case: prepare undo for an arbitrary range.
 void recordUndo(LCursor & cur, Undo::undo_kind kind,
-       lyx::paroffset_type from, lyx::paroffset_type to);
+       lyx::par_type from, lyx::par_type to);
 
-/// convienience: prepare undo for the range between 'from' and cursor.
-void recordUndo(LCursor & cur, Undo::undo_kind kind, lyx::paroffset_type from);
+/// Convenience: prepare undo for the range between 'from' and cursor.
+void recordUndo(LCursor & cur, Undo::undo_kind kind, lyx::par_type from);
 
-/// convienience: prepare undo for the single paragraph containing the cursor
+/// Convenience: prepare undo for the single paragraph or cell
+/// containing the cursor
 void recordUndo(LCursor & cur, Undo::undo_kind kind = Undo::ATOMIC);
+/// Convenience: prepare undo for the inset containing the cursor
+void recordUndoInset(LCursor & cur, Undo::undo_kind kind = Undo::ATOMIC);
+/// Convenience: prepare undo for the selected paragraphs
+void recordUndoSelection(LCursor & cur, Undo::undo_kind kind = Undo::ATOMIC);
 
-/// convienience: prepare undo for the single paragraph containing the cursor
+/// Convenience: prepare undo for the single paragraph containing the cursor
 void recordUndoFullDocument(LCursor & cur);
 
-/// are we avoiding tracking undos currently?
-extern bool undo_frozen;
-
 #endif // UNDO_FUNCS_H