X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FUndo.cpp;h=143af4e83ff0b9f29eac7ecc2f1abbf5e6c8ceb4;hb=fd3a41e035a44a66a3adcb9fa0f970f32e9d260c;hp=7a1c6fdf574474119e403ad72071da4c333c42ce;hpb=7f0ac0932b475e95cac9565cefbcede9e170c7c1;p=lyx.git

diff --git a/src/Undo.cpp b/src/Undo.cpp
index 7a1c6fdf57..143af4e83f 100644
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -21,6 +21,8 @@
 #include "BufferParams.h"
 #include "buffer_funcs.h"
 #include "Cursor.h"
+#include "CutAndPaste.h"
+#include "ErrorList.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
 #include "Text.h"
@@ -29,6 +31,7 @@
 #include "mathed/MathData.h"
 
 #include "insets/Inset.h"
+#include "insets/InsetText.h"
 
 #include "support/debug.h"
 #include "support/gettext.h"
@@ -195,7 +198,7 @@ private:
 struct Undo::Private
 {
 	Private(Buffer & buffer) : buffer_(buffer), undo_finished_(true),
-				   group_id(0), group_level(0) {}
+				   group_id_(0), group_level_(0) {}
 
 	// Do one undo/redo step
 	void doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
@@ -232,9 +235,11 @@ struct Undo::Private
 	bool undo_finished_;
 
 	/// Current group Id.
-	size_t group_id;
+	size_t group_id_;
 	/// Current group nesting nevel.
-	size_t group_level;
+	size_t group_level_;
+	/// the position of cursor before the group was created
+	CursorData group_cur_before_;
 };
 
 
@@ -263,8 +268,8 @@ void Undo::clear()
 	d->undo_finished_ = true;
 	// We used to do that, but I believe it is better to keep
 	// groups (only used in Buffer::reload for now (JMarc)
-	//d->group_id = 0;
-	//d->group_level = 0;
+	//d->group_id_ = 0;
+	//d->group_level_ = 0;
 }
 
 
@@ -308,9 +313,9 @@ void Undo::Private::doRecordUndo(UndoKind kind,
 	CursorData const & cur_before,
 	UndoElementStack & stack)
 {
-	if (!group_level) {
+	if (!group_level_) {
 		LYXERR0("There is no group open (creating one)");
-		++group_id;
+		++group_id_;
 	}
 
 	if (first_pit > last_pit)
@@ -338,10 +343,11 @@ void Undo::Private::doRecordUndo(UndoKind kind,
 		return;
 	}
 
-	LYXERR(Debug::UNDO, "Create undo element of group " << group_id);
+	LYXERR(Debug::UNDO, "Create undo element of group " << group_id_);
 	// create the position information of the Undo entry
-	UndoElement undo(kind, cur_before, cell, from, end, 0, 0,
-	                 buffer_.isClean(), group_id);
+	UndoElement undo(kind,
+	      group_cur_before_.empty() ? cur_before : group_cur_before_,
+	      cell, from, end, 0, 0, buffer_.isClean(), group_id_);
 
 	// fill in the real data to be saved
 	if (cell.inMathed()) {
@@ -390,17 +396,18 @@ void Undo::Private::recordUndo(UndoKind kind,
 
 
 void Undo::Private::doRecordUndoBufferParams(CursorData const & cur_before,
-									   UndoElementStack & stack)
+                                             UndoElementStack & stack)
 {
-	if (!group_level) {
+	if (!group_level_) {
 		LYXERR0("There is no group open (creating one)");
-		++group_id;
+		++group_id_;
 	}
 
-	LYXERR(Debug::UNDO, "Create full buffer undo element of group " << group_id);
+	LYXERR(Debug::UNDO, "Create full buffer undo element of group " << group_id_);
 	// create the position information of the Undo entry
-	UndoElement undo(cur_before, buffer_.params(), buffer_.isClean(),
-					 group_id);
+	UndoElement undo(group_cur_before_.empty() ? cur_before : group_cur_before_,
+                     buffer_.params(), buffer_.isClean(),
+					 group_id_);
 
 	// push the undo entry to undo stack
 	stack.push(undo);
@@ -449,7 +456,13 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
 		// This is a params undo element
 		delete otherstack.top().bparams;
 		otherstack.top().bparams = new BufferParams(buffer_.params());
+		DocumentClassConstPtr olddc = buffer_.params().documentClassPtr();
 		buffer_.params() = *undo.bparams;
+		// The error list is not supposed to be helpful here.
+		ErrorList el;
+		cap::switchBetweenClasses(olddc, buffer_.params().documentClassPtr(),
+			static_cast<InsetText &>(buffer_.inset()), el);
+		LATTEST(el.empty());
 	} else if (dit.inMathed()) {
 		// We stored the full cell here as there is not much to be
 		// gained by storing just 'a few' paragraphs (most if not
@@ -546,34 +559,43 @@ bool Undo::textRedo(CursorData & cur)
 
 void Undo::beginUndoGroup()
 {
-	if (d->group_level == 0) {
+	if (d->group_level_ == 0) {
 		// create a new group
-		++d->group_id;
-		LYXERR(Debug::UNDO, "+++++++Creating new group " << d->group_id);
+		++d->group_id_;
+		LYXERR(Debug::UNDO, "+++++++Creating new group " << d->group_id_);
 	}
-	++d->group_level;
+	++d->group_level_;
+}
+
+
+void Undo::beginUndoGroup(CursorData const & cur_before)
+{
+	beginUndoGroup();
+	if (d->group_cur_before_.empty())
+		d->group_cur_before_ = cur_before;
 }
 
 
 void Undo::endUndoGroup()
 {
-	if (d->group_level == 0) {
+	if (d->group_level_ == 0) {
 		LYXERR0("There is no undo group to end here");
 		return;
 	}
-	--d->group_level;
-	if (d->group_level == 0) {
+	--d->group_level_;
+	if (d->group_level_ == 0) {
 		// real end of the group
-		LYXERR(Debug::UNDO, "-------End of group " << d->group_id);
+		d->group_cur_before_ = CursorData();
+		LYXERR(Debug::UNDO, "-------End of group " << d->group_id_);
 	}
 }
 
 
-void Undo::endUndoGroup(CursorData const & cur)
+void Undo::endUndoGroup(CursorData const & cur_after)
 {
 	endUndoGroup();
 	if (!d->undostack_.empty() && d->undostack_.top().cur_after.empty())
-		d->undostack_.top().cur_after = cur;
+		d->undostack_.top().cur_after = cur_after;
 }