X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.C;h=d5306afd315e153d959a6ce4765c403075a11cff;hb=98c966c64594611e469313314abd1e59524adb4a;hp=8d1b336fcffd45a066242366db8a140e8ae03668;hpb=fc8465aa1f6f29774d2f35d627b40198fa489cb1;p=lyx.git

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 8d1b336fcf..d5306afd31 100644
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -1,27 +1,35 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
- *           Copyright 1995-2000 The LyX Team.
+ *
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include "CutAndPaste.h"
+//#include "debug.h"
 #include "BufferView.h"
 #include "buffer.h"
-#include "lyxparagraph.h"
-#include "insets/inseterror.h"
-#include "lyx_gui_misc.h"
+#include "paragraph.h"
+#include "ParagraphParameters.h"
+#include "lyxtext.h"
 #include "lyxcursor.h"
+#include "gettext.h"
+#include "iterators.h"
+#include "lyxtextclasslist.h"
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include "insets/inseterror.h"
 
 using std::pair;
+using lyx::pos_type;
+using lyx::textclass_type;
 
 extern BufferView * current_view;
 
@@ -29,7 +37,7 @@ extern BufferView * current_view;
 // of selections cut/copied. So IMHO later we should have a
 // list/vector/deque that we could store
 // struct selection_item {
-//       LyXParagraph * buf;
+//       Paragraph * buf;
 //       LyXTextClassList::size_type textclass;
 // };
 // in and some method of choosing beween them (based on the first few chars
@@ -46,8 +54,8 @@ extern BufferView * current_view;
 
 namespace {
 
-LyXParagraph * buf = 0;
-LyXTextClassList::size_type textclass = 0;
+Paragraph * buf = 0;
+textclass_type textclass = 0;
 
 // for now here this should be in another Cut&Paste Class!
 // Jürgen, I moved this out of CutAndPaste since it does not operate on any
@@ -55,509 +63,392 @@ LyXTextClassList::size_type textclass = 0;
 // Perhaps it even should take a parameter? (Lgb)
 void DeleteBuffer()
 {
-    if (!buf)
-	return;
-	
-    LyXParagraph * tmppar;
-	
-    while (buf) {
-	tmppar =  buf;
-#ifndef NEW_INSETS
-	buf = buf->next_;
-#else
-	buf = buf->next();
-#endif
-	delete tmppar;
-    }
-    buf = 0;
+	if (!buf)
+		return;
+
+	Paragraph * tmppar;
+
+	while (buf) {
+		tmppar =  buf;
+		buf = buf->next();
+		delete tmppar;
+	}
+	buf = 0;
 }
 
 } // namespace anon
 
-bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
-			       int start, int & end, char tc, bool doclear)
+
+bool CutAndPaste::cutSelection(Paragraph * startpar, Paragraph ** endpar,
+			       int start, int & end, char tc, bool doclear,
+							   bool realcut)
 {
-#ifndef NEW_INSETS
-    if (!startpar || (start > startpar->Last()))
-	return false;
-#else
-    if (!startpar || (start > startpar->size()))
-	return false;
-#endif
+	if (!startpar || (start > startpar->size()))
+		return false;
 
-    DeleteBuffer();
+	if (realcut)
+		DeleteBuffer();
 
-    textclass = tc;
+	textclass = tc;
 
-    if (!(*endpar) ||
-#ifndef NEW_INSETS
-	(startpar->ParFromPos(start) ==
-	 (*endpar)->ParFromPos(end))
-#else
-	(startpar == (*endpar))
-#endif
-	   ) {
-	// only within one paragraph
-	buf = new LyXParagraph;
-	LyXParagraph::size_type i = start;
-#ifndef NEW_INSETS
-	if (end > startpar->Last())
-	    end = startpar->Last();
-#else
-	if (end > startpar->size())
-	    end = startpar->size();
-#endif
-	for (; i < end; ++i) {
-	    startpar->CopyIntoMinibuffer(*current_view->buffer(), start);
-	    startpar->Erase(start);
-
-#ifndef NEW_INSETS
-	    buf->InsertFromMinibuffer(buf->Last());
-#else
-	    buf->InsertFromMinibuffer(buf->size());
-#endif
-	}
-	end = start-1;
-    } else {
-	// more than one paragraph
-	(*endpar)->BreakParagraphConservative(current_view->buffer()->params,
-					      end);
-	*endpar = (*endpar)->next();
-	end = 0;
-   
-	startpar->BreakParagraphConservative(current_view->buffer()->params,
-					     start);
-
-	// store the selection
-#ifndef NEW_INSETS
-	buf = startpar->ParFromPos(start)->next_;
-#else
-	buf = startpar->next();
-#endif
-	buf->previous(0);
-	(*endpar)->previous()->next(0);
-
-	// cut the selection
-#ifndef NEW_INSETS
-	startpar->ParFromPos(start)->next(*endpar);
-	
-	(*endpar)->previous(startpar->ParFromPos(start));
-#else
-	startpar->next(*endpar);
-	
-	(*endpar)->previous(startpar);
-#endif
+	if (!(*endpar) || startpar == (*endpar)) {
+		// only within one paragraph
+		if (realcut) {
+			buf = new Paragraph;
+			buf->layout(startpar->layout());
+		}
+		pos_type i = start;
+		if (end > startpar->size())
+			end = startpar->size();
+		for (; i < end; ++i) {
+			if (realcut)
+				startpar->copyIntoMinibuffer(*current_view->buffer(),
+							     start);
+			startpar->erase(start);
+			if (realcut)
+				buf->insertFromMinibuffer(buf->size());
+		}
+		end = start - 1;
+	} else {
+		// more than one paragraph
+		(*endpar)->breakParagraphConservative(current_view->buffer()->params,
+						      end);
+		*endpar = (*endpar)->next();
+		end = 0;
+
+		startpar->breakParagraphConservative(current_view->buffer()->params,
+						     start);
+
+		// store the selection
+		if (realcut) {
+			buf = startpar->next();
+			buf->previous(0);
+		} else {
+			startpar->next()->previous(0);
+		}
+		(*endpar)->previous()->next(0);
 
-#ifndef NEW_INSETS
-	// care about footnotes
-	if (buf->footnoteflag) {
-	    LyXParagraph * tmppar = buf;
-	    while (tmppar){
-		tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE;
-		tmppar = tmppar->next_;
-	    }
-	}
-#endif
+		// cut the selection
+		startpar->next(*endpar);
 
-	// the cut selection should begin with standard layout
-	buf->Clear(); 
-   
-	// paste the paragraphs again, if possible
-	if (doclear)
-	    startpar->next()->StripLeadingSpaces(textclass);
-#ifndef NEW_INSETS
-	if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->next()) ||
-	    !startpar->next()->Last()) {
-#else
-	if (startpar->HasSameLayout(startpar->next()) ||
-	    !startpar->next()->size()) {
-#endif
-#ifndef NEW_INSETS
-	    startpar->ParFromPos(start)->PasteParagraph(current_view->buffer()->params);
-#else
-	    startpar->PasteParagraph(current_view->buffer()->params);
-#endif
-	    (*endpar) = startpar; // this because endpar gets deleted here!
+		(*endpar)->previous(startpar);
+
+		// the cut selection should begin with standard layout
+		if (realcut) {
+			buf->params().clear();
+			buf->bibkey = 0;
+			buf->layout(textclasslist[current_view->buffer()->params.textclass].defaultLayoutName());
+		}
+
+		// paste the paragraphs again, if possible
+		if (doclear)
+			startpar->next()->stripLeadingSpaces(textclass);
+		if (startpar->hasSameLayout(startpar->next()) ||
+		    !startpar->next()->size()) {
+			startpar->pasteParagraph(current_view->buffer()->params);
+			(*endpar) = startpar; // this because endpar gets deleted here!
+		}
+		// this paragraph's are of noone's owner!
+		Paragraph * p = buf;
+		while (p) {
+			p->setInsetOwner(0);
+			p = p->next();
+		}
 	}
-    }
-    return true;
+	return true;
 }
 
 
-bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
+bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
 				int start, int end, char tc)
 {
-#ifndef NEW_INSETS
-    if (!startpar || (start > startpar->Last()))
-	return false;
-#else
-    if (!startpar || (start > startpar->size()))
-	return false;
-#endif
-
-    DeleteBuffer();
-
-    textclass = tc;
+	if (!startpar || (start > startpar->size()))
+		return false;
+
+	DeleteBuffer();
+
+	textclass = tc;
+
+	if (!endpar || startpar == endpar) {
+		// only within one paragraph
+		buf = new Paragraph;
+		buf->layout(startpar->layout());
+		pos_type i = start;
+		if (end > startpar->size())
+			end = startpar->size();
+		for (; i < end; ++i) {
+			startpar->copyIntoMinibuffer(*current_view->buffer(), i);
+			buf->insertFromMinibuffer(buf->size());
+		}
+	} else {
+		// copy more than one paragraph
+		// clone the paragraphs within the selection
+		Paragraph * tmppar = startpar;
+		buf = new Paragraph(*tmppar, false);
+		Paragraph * tmppar2 = buf;
+
+		while (tmppar != endpar
+		       && tmppar->next()) {
+			tmppar = tmppar->next();
+			tmppar2->next(new Paragraph(*tmppar, false));
+			tmppar2->next()->previous(tmppar2);
+			tmppar2 = tmppar2->next();
+		}
+		tmppar2->next(0);
 
-    if (!(endpar) ||
-#ifndef NEW_INSETS
-	(startpar->ParFromPos(start) ==
-		       (endpar)->ParFromPos(end))
-#else
-	(startpar == endpar)
-#endif
-	   ) {
-	// only within one paragraph
-	buf = new LyXParagraph;
-	LyXParagraph::size_type i = start;
-#ifndef NEW_INSETS
-	if (end > startpar->Last())
-	    end = startpar->Last();
-#else
-	if (end > startpar->size())
-	    end = startpar->size();
-#endif
-	for (; i < end; ++i) {
-	    startpar->CopyIntoMinibuffer(*current_view->buffer(), i);
-#ifndef NEW_INSETS
-	    buf->InsertFromMinibuffer(buf->Last());
-#else
-	    buf->InsertFromMinibuffer(buf->size());
-#endif
-	}
-    } else {
-	// copy more than one paragraph
-	// clone the paragraphs within the selection
-#ifndef NEW_INSETS
-	LyXParagraph * tmppar = startpar->ParFromPos(start);
-#else
-	LyXParagraph * tmppar = startpar;
-#endif
-	buf = tmppar->Clone();
-	LyXParagraph * tmppar2 = buf;
-     
-#ifndef NEW_INSETS
-	while (tmppar != endpar->ParFromPos(end)
-	       && tmppar->next_) {
-		tmppar = tmppar->next_;
-		tmppar2->next(tmppar->Clone());
-		tmppar2->next_->previous(tmppar2);
-		tmppar2 = tmppar2->next_;
-	}
-	tmppar2->next(0);
-#else
-	while (tmppar != endpar
-	       && tmppar->next()) {
-		tmppar = tmppar->next();
-		tmppar2->next(tmppar->Clone());
-		tmppar2->next()->previous(tmppar2);
-		tmppar2 = tmppar2->next();
-	}
-	tmppar2->next(0);
-#endif
+		// the buf paragraph is too big
+		pos_type tmpi2 = start;
+		for (; tmpi2; --tmpi2)
+			buf->erase(0);
 
-#ifndef NEW_INSETS
-	// care about footnotes
-	if (buf->footnoteflag) {
-	    tmppar = buf;
-	    while (tmppar) {
-		tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE;
-		tmppar = tmppar->next_;
-	    }
-	}
-#endif
-	
-	// the buf paragraph is too big
-#ifndef NEW_INSETS
-	LyXParagraph::size_type tmpi2 = startpar->PositionInParFromPos(start);
-#else
-	LyXParagraph::size_type tmpi2 = start;
-#endif
-	for (; tmpi2; --tmpi2)
-	    buf->Erase(0);
-	
-	// now tmppar 2 is too big, delete all after end
-#ifndef NEW_INSETS
-	tmpi2 = endpar->PositionInParFromPos(end);
-#else
-	tmpi2 = end;
-#endif
-	while (tmppar2->size() > tmpi2) {
-	    tmppar2->Erase(tmppar2->size() - 1);
+		// now tmppar 2 is too big, delete all after end
+		tmpi2 = end;
+		while (tmppar2->size() > tmpi2) {
+			tmppar2->erase(tmppar2->size() - 1);
+		}
+		// this paragraph's are of noone's owner!
+		tmppar = buf;
+		while (tmppar) {
+			tmppar->setInsetOwner(0);
+			tmppar = tmppar->next();
+		}
 	}
-    }
-    return true;
+	return true;
 }
 
 
-bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
+bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
 				 int & pos, char tc)
 {
-    if (!checkPastePossible(*par))
-	return false;
-
-#ifndef NEW_INSETS
-    if (pos > (*par)->Last())
-	pos = (*par)->Last();
-#else
-    if (pos > (*par)->size())
-	pos = (*par)->size();
-#endif
-    
-    LyXParagraph * tmpbuf;
-    LyXParagraph * tmppar = *par;
-    int tmppos = pos;
-
-    // There are two cases: cutbuffer only one paragraph or many
-#ifndef NEW_INSETS
-    if (!buf->next_) {
-#else
-    if (!buf->next()) {
+	if (!checkPastePossible(*par))
+		return false;
+
+	if (pos > (*par)->size())
+		pos = (*par)->size();
+
+#if 0
+	// Paragraph * tmpbuf;
+	Paragraph * tmppar = *par;
+	int tmppos = pos;
+
+	// There are two cases: cutbuffer only one paragraph or many
+	if (!buf->next()) {
+		// only within a paragraph
+		Paragraph * tmpbuf = new Paragraph(*buf, false);
+
+		// Some provisions should be done here for checking
+		// if we are inserting at the beginning of a
+		// paragraph. If there are a space at the beginning
+		// of the text to insert and we are inserting at
+		// the beginning of the paragraph the space should
+		// be removed.
+		while (buf->size()) {
+			// This is an attempt to fix the
+			// "never insert a space at the
+			// beginning of a paragraph" problem.
+			if (!tmppos && buf->isLineSeparator(0)) {
+				buf->erase(0);
+			} else {
+				buf->cutIntoMinibuffer(current_view->buffer()->params, 0);
+				buf->erase(0);
+				if (tmppar->insertFromMinibuffer(tmppos))
+					++tmppos;
+			}
+		}
+		delete buf;
+		buf = tmpbuf;
+		*endpar = tmppar->next();
+		pos = tmppos;
+	} else
 #endif
-	// only within a paragraph
-	tmpbuf = buf->Clone();
-	// Some provisions should be done here for checking
-	// if we are inserting at the beginning of a
-	// paragraph. If there are a space at the beginning
-	// of the text to insert and we are inserting at
-	// the beginning of the paragraph the space should
-	// be removed.
-	while (buf->size()) {
-		// This is an attempt to fix the
-		// "never insert a space at the
-		// beginning of a paragraph" problem.
-		if (!tmppos && buf->IsLineSeparator(0)) {
-			buf->Erase(0);
-		} else {
-			buf->CutIntoMinibuffer(current_view->buffer()->params, 0);
-			buf->Erase(0);
-			if (tmppar->InsertFromMinibuffer(tmppos))
-				++tmppos;
+	{
+		// many paragraphs
+
+		// make a copy of the simple cut_buffer
+		Paragraph * tmpbuf = buf;
+		Paragraph * simple_cut_clone = new Paragraph(*tmpbuf, false);
+		Paragraph * tmpbuf2 = simple_cut_clone;
+
+		while (tmpbuf->next()) {
+			tmpbuf = tmpbuf->next();
+			tmpbuf2->next(new Paragraph(*tmpbuf, false));
+			tmpbuf2->next()->previous(tmpbuf2);
+			tmpbuf2 = tmpbuf2->next();
 		}
-	}
-	delete buf;
-	buf = tmpbuf;
-	*endpar = tmppar->next();
-	pos = tmppos;
-    } else {
-	// many paragraphs
-
-	// make a copy of the simple cut_buffer
-	tmpbuf = buf;
-	LyXParagraph * simple_cut_clone = tmpbuf->Clone();
-	LyXParagraph * tmpbuf2 = simple_cut_clone;
-#ifndef NEW_INSETS
-	if ((*par)->footnoteflag) {
-		tmpbuf->footnoteflag = (*par)->footnoteflag;
-		tmpbuf->footnotekind = (*par)->footnotekind;
-	}
-	while (tmpbuf->next_) {
-		tmpbuf = tmpbuf->next_;
-		tmpbuf2->next(tmpbuf->Clone());
-		tmpbuf2->next_->previous(tmpbuf2);
-		tmpbuf2 = tmpbuf2->next_;
-		if ((*par)->footnoteflag){
-			tmpbuf->footnoteflag = (*par)->footnoteflag;
-			tmpbuf->footnotekind = (*par)->footnotekind;
+
+		// now remove all out of the buffer which is NOT allowed in the
+		// new environment and set also another font if that is required
+		tmpbuf = buf;
+		int depth_delta = (*par)->params().depth() - tmpbuf->params().depth();
+		// temporary set *par as previous of tmpbuf as we might have to realize
+		// the font.
+		tmpbuf->previous(*par);
+ 
+		// make sure there is no class difference
+		SwitchLayoutsBetweenClasses(textclass, tc, tmpbuf,
+		                            current_view->buffer()->params);
+		
+		Paragraph::depth_type max_depth = (*par)->getMaxDepthAfter(current_view->buffer());
+ 
+		while(tmpbuf) {
+			// if we have a negative jump so that the depth would go below
+			// 0 depth then we have to redo the delta to this new max depth
+			// level so that subsequent paragraphs are aligned correctly to
+			// this paragraph at level 0.
+			if ((static_cast<int>(tmpbuf->params().depth()) + depth_delta) < 0)
+				depth_delta = 0;
+			// set the right depth so that we are not too deep or shallow.
+			tmpbuf->params().depth(tmpbuf->params().depth() + depth_delta);
+			if (tmpbuf->params().depth() > max_depth)
+				tmpbuf->params().depth(max_depth);
+			// only set this from the 2nd on as the 2nd depends for maxDepth
+			// still on *par
+			if (tmpbuf->previous() != (*par))
+				max_depth = tmpbuf->getMaxDepthAfter(current_view->buffer());
+			// set the inset owner of this paragraph
+			tmpbuf->setInsetOwner((*par)->inInset());
+			for(pos_type i = 0; i < tmpbuf->size(); ++i) {
+				if (tmpbuf->getChar(i) == Paragraph::META_INSET) {
+					if (!(*par)->insetAllowed(tmpbuf->getInset(i)->lyxCode()))
+					{
+						tmpbuf->erase(i--);
+					}
+				} else {
+					LyXFont f1 = tmpbuf->getFont(current_view->buffer()->params,i);
+					LyXFont f2 = f1;
+					if (!(*par)->checkInsertChar(f1)) {
+						tmpbuf->erase(i--);
+					} else if (f1 != f2) {
+						tmpbuf->setFont(i, f1);
+					}
+				}
+			}
+			tmpbuf = tmpbuf->next();
 		}
+		// now reset it to 0
+		buf->previous(0);
+
+		// make the buf exactly the same layout than
+		// the cursor paragraph
+		buf->makeSameLayout(*par);
+
+		// find the end of the buffer
+		Paragraph * lastbuffer = buf;
+		while (lastbuffer->next())
+			lastbuffer = lastbuffer->next();
+
+		bool paste_the_end = false;
+
+		// open the paragraph for inserting the buf
+		// if necessary
+		if (((*par)->size() > pos) || !(*par)->next()) {
+			(*par)->breakParagraphConservative(current_view->buffer()->params,
+							   pos);
+			paste_the_end = true;
+		}
+		// set the end for redoing later
+		*endpar = (*par)->next()->next();
+
+		// paste it!
+		lastbuffer->next((*par)->next());
+		(*par)->next()->previous(lastbuffer);
+
+		(*par)->next(buf);
+		buf->previous(*par);
+
+		if ((*par)->next() == lastbuffer)
+			lastbuffer = *par;
+
+		(*par)->pasteParagraph(current_view->buffer()->params);
+		// store the new cursor position
+		*par = lastbuffer;
+		pos = lastbuffer->size();
+		// maybe some pasting
+		if (lastbuffer->next() && paste_the_end) {
+			if (lastbuffer->next()->hasSameLayout(lastbuffer)) {
+				lastbuffer->pasteParagraph(current_view->buffer()->params);
+			} else if (!lastbuffer->next()->size()) {
+				lastbuffer->next()->makeSameLayout(lastbuffer);
+				lastbuffer->pasteParagraph(current_view->buffer()->params);
+			} else if (!lastbuffer->size()) {
+				lastbuffer->makeSameLayout(lastbuffer->next());
+				lastbuffer->pasteParagraph(current_view->buffer()->params);
+			} else
+				lastbuffer->next()->stripLeadingSpaces(tc);
+		}
+		// restore the simple cut buffer
+		buf = simple_cut_clone;
 	}
-#else
-	while (tmpbuf->next()) {
-		tmpbuf = tmpbuf->next();
-		tmpbuf2->next(tmpbuf->Clone());
-		tmpbuf2->next()->previous(tmpbuf2);
-		tmpbuf2 = tmpbuf2->next();
-	}
-#endif
-	
-	// make sure there is no class difference
-	SwitchLayoutsBetweenClasses(textclass, tc, buf);
-	
-	// make the buf exactly the same layout than
-	// the cursor paragraph
-	buf->MakeSameLayout(*par);
-	
-	// find the end of the buffer
-	LyXParagraph * lastbuffer = buf;
-	while (lastbuffer->next())
-	    lastbuffer = lastbuffer->next();
-	
-	bool paste_the_end = false;
-	
-#ifndef NEW_INSETS
-	// open the paragraph for inserting the buf
-	// if necessary
-	if (((*par)->Last() > pos) || !(*par)->next()) {
-	    (*par)->BreakParagraphConservative(current_view->buffer()->params,
-					       pos);
-	    paste_the_end = true;
-	}
-	// set the end for redoing later
-	*endpar = (*par)->ParFromPos(pos)->next_->next();
-	
-	// paste it!
-	lastbuffer->ParFromPos(lastbuffer->Last())->next(
-	    (*par)->ParFromPos(pos)->next_);
-	(*par)->ParFromPos(pos)->next()->previous(
-	    lastbuffer->ParFromPos(lastbuffer->Last()));
-	
-	(*par)->ParFromPos(pos)->next(buf);
-	buf->previous((*par)->ParFromPos(pos));
-	
-	if ((*par)->ParFromPos(pos)->next() == lastbuffer)
-	    lastbuffer = *par;
-	
-	(*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params);
-	// store the new cursor position
-	*par = lastbuffer;
-	pos = lastbuffer->Last();
-	// maybe some pasting
-	if (lastbuffer->next() && paste_the_end) {
-	    if (lastbuffer->next()->HasSameLayout(lastbuffer)) {
-		lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
-	    } else if (!lastbuffer->next()->Last()) {
-		lastbuffer->next()->MakeSameLayout(lastbuffer);
-		lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
-	    } else if (!lastbuffer->Last()) {
-		lastbuffer->MakeSameLayout(lastbuffer->next_);
-		lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
-	    } else
-		lastbuffer->next()->StripLeadingSpaces(tc);
-	}
-	// restore the simple cut buffer
-	buf = simple_cut_clone;
-    }
-#else
-	// open the paragraph for inserting the buf
-	// if necessary
-	if (((*par)->size() > pos) || !(*par)->next()) {
-	    (*par)->BreakParagraphConservative(current_view->buffer()->params,
-					       pos);
-	    paste_the_end = true;
-	}
-	// set the end for redoing later
-	*endpar = (*par)->next()->next();
-	
-	// paste it!
-	lastbuffer->next((*par)->next());
-	(*par)->next()->previous(lastbuffer);
-	
-	(*par)->next(buf);
-	buf->previous(*par);
-	
-	if ((*par)->next() == lastbuffer)
-	    lastbuffer = *par;
-	
-	(*par)->PasteParagraph(current_view->buffer()->params);
-	// store the new cursor position
-	*par = lastbuffer;
-	pos = lastbuffer->size();
-	// maybe some pasting
-	if (lastbuffer->next() && paste_the_end) {
-	    if (lastbuffer->next()->HasSameLayout(lastbuffer)) {
-		lastbuffer->PasteParagraph(current_view->buffer()->params);
-	    } else if (!lastbuffer->next()->size()) {
-		lastbuffer->next()->MakeSameLayout(lastbuffer);
-		lastbuffer->PasteParagraph(current_view->buffer()->params);
-	    } else if (!lastbuffer->size()) {
-		lastbuffer->MakeSameLayout(lastbuffer->next());
-		lastbuffer->PasteParagraph(current_view->buffer()->params);
-	    } else
-		lastbuffer->next()->StripLeadingSpaces(tc);
-	}
-	// restore the simple cut buffer
-	buf = simple_cut_clone;
-    }
-#endif
 
-    return true;
+	return true;
 }
 
 
 int CutAndPaste::nrOfParagraphs()
 {
-	if (!buf) return 0;
+	if (!buf)
+		return 0;
 
 	int n = 1;
-	LyXParagraph * tmppar = buf;
-#ifndef NEW_INSETS
-	while(tmppar->next_) {
-		++n;
-		tmppar = tmppar->next_;
-	}
-#else
-	while(tmppar->next()) {
+	Paragraph * tmppar = buf;
+	while (tmppar->next()) {
 		++n;
 		tmppar = tmppar->next();
 	}
-#endif
 	return n;
 }
 
 
-int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
-					     LyXTextClassList::size_type c2,
-					     LyXParagraph * par)
+int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
+					     textclass_type c2,
+					     Paragraph * par,
+					     BufferParams const & /*bparams*/)
 {
-    int ret = 0;
-    if (!par || c1 == c2)
-	return ret;
-#ifndef NEW_INSETS
-    par = par->FirstPhysicalPar();
-#endif
-    while (par) {
-	string name = textclasslist.NameOfLayout(c1, par->layout);
-	int lay = 0;
-	pair<bool, LyXTextClass::LayoutList::size_type> pp =
-	    textclasslist.NumberOfLayout(c2, name);
-	if (pp.first) {
-	    lay = pp.second;
-	} else { // layout not found
-	    // use default layout "Standard" (0)
-	    lay = 0;
-	}
-	par->layout = lay;
-	
-	if (name != textclasslist.NameOfLayout(c2, par->layout)) {
-	    ++ret;
-	    string s = _("Layout had to be changed from\n")
-		    + name + _(" to ")
-		    + textclasslist.NameOfLayout(c2, par->layout)
-		    + _("\nbecause of class conversion from\n")
-		    + textclasslist.NameOfClass(c1) + _(" to ")
-		    + textclasslist.NameOfClass(c2);
-	    InsetError * new_inset = new InsetError(s);
-	    par->InsertInset(0, new_inset);
+	int ret = 0;
+	if (!par || c1 == c2)
+		return ret;
+
+	ParIterator end = ParIterator();
+	for (ParIterator it = ParIterator(par); it != end; ++it) {
+		par = *it;
+		string const name = par->layout();
+		LyXTextClass const & tclass = textclasslist[c2];
+
+		bool hasLayout = tclass.hasLayout(name);
+
+		string lay = tclass.defaultLayoutName();
+		if (hasLayout) {
+			lay = name;
+		} else {
+			// not found: use default layout
+			lay = tclass.defaultLayoutName();
+		}
+		par->layout(lay);
+
+		if (name != par->layout()) {
+			++ret;
+			string const s = _("Layout had to be changed from\n")
+				+ name + _(" to ")
+				+ par->layout()
+				+ _("\nbecause of class conversion from\n")
+				+ textclasslist[c1].name() + _(" to ")
+				+ textclasslist[c2].name();
+			InsetError * new_inset = new InsetError(s);
+			LyXText * txt = current_view->getLyXText();
+			LyXCursor cur = txt->cursor;
+			txt->setCursorIntern(current_view, par, 0);
+			txt->insertInset(current_view, new_inset);
+			txt->fullRebreak(current_view);
+			txt->setCursorIntern(current_view, cur.par(), cur.pos());
+		}
 	}
-#ifndef NEW_INSETS
-	par = par->next_;
-#else
-	par = par->next();
-#endif
-    }
-    return ret;
+	return ret;
 }
 
 
-bool CutAndPaste::checkPastePossible(LyXParagraph * par)
+bool CutAndPaste::checkPastePossible(Paragraph *)
 {
-    if (!buf) return false;
-
-#ifndef NEW_INSETS
-    // be carefull with footnotes in footnotes
-    if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
-	// check whether the cut_buffer includes a footnote
-	LyXParagraph * tmppar = buf;
-	while (tmppar && tmppar->footnoteflag == LyXParagraph::NO_FOOTNOTE)
-	    tmppar = tmppar->next_;
-      
-	if (tmppar) {
-	    WriteAlert(_("Impossible operation"),
-		       _("Can't paste float into float!"),
-		       _("Sorry."));
-	    return false;
-	}
-    }
-#endif
-    return true;
+	if (!buf) return false;
+
+	return true;
 }