NEW_INSETS clean up

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1924 a592a061-630c-0410-9148-cb99ea01b6c8

src/ChangeLog

@@ -1,5 +1,10 @@
 2001-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+	* CutAndPaste.C (cutSelection): split into two versons (NEW_INSETS
+	and not)
+	(copySelection): ditto
+	(pasteSelection): ditto
+
 	* BufferView.C: whitespace change
 	* BufferView.h: inherit privately from noncopyable
 

src/CutAndPaste.C

@@ -75,50 +75,33 @@ void DeleteBuffer()
 
 } // namespace anon
 
+
+#ifndef NEW_INSETS
 bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
 			       int start, int & end, char tc, bool doclear)
 {
-#ifndef NEW_INSETS
 	if (!startpar || (start > startpar->Last()))
 		return false;
-#else
-    if (!startpar || (start > startpar->size()))
-		return false;
-#endif
 	
 	DeleteBuffer();
 	
 	textclass = tc;
 	
 	if (!(*endpar) ||
-#ifndef NEW_INSETS
 	    (startpar->ParFromPos(start) ==
-		 (*endpar)->ParFromPos(end))
+	     (*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;
+		end = start - 1;
 	} else {
 		// more than one paragraph
 		(*endpar)->BreakParagraphConservative(current_view->buffer()->params,
@@ -130,26 +113,15 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
 						     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
-
-#ifndef NEW_INSETS
 		// care about footnotes
 		if (buf->footnoteflag) {
 			LyXParagraph * tmppar = buf;
@@ -158,7 +130,6 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
 				tmppar = tmppar->next_;
 			}
 		}
-#endif
 		
 		// the cut selection should begin with standard layout
 		buf->Clear(); 
@@ -166,79 +137,109 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
 		// paste the paragraphs again, if possible
 		if (doclear)
 			startpar->next()->StripLeadingSpaces(textclass);
-#ifndef NEW_INSETS
 		if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->next()) ||
-			!startpar->next()->Last())
+		    !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!
 		}
 	}
 	return true;
 }
+#else
+bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
+			       int start, int & end, char tc, bool doclear)
+{
+	if (!startpar || (start > startpar->size()))
+		return false;
+	
+	DeleteBuffer();
+	
+	textclass = tc;
+	
+	if (!(*endpar) ||
+	    startpar == (*endpar)) {
+		// only within one paragraph
+		buf = new LyXParagraph;
+		LyXParagraph::size_type i = start;
+		if (end > startpar->size())
+			end = startpar->size();
+		for (; i < end; ++i) {
+			startpar->CopyIntoMinibuffer(*current_view->buffer(),
+						     start);
+			startpar->Erase(start);
+			
+			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
+		buf = startpar->next();
+		
+		buf->previous(0);
+		(*endpar)->previous()->next(0);
+		
+		// cut the selection
+		startpar->next(*endpar);
+		
+		(*endpar)->previous(startpar);
+		
+		// the cut selection should begin with standard layout
+		buf->Clear(); 
+		
+		// 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!
+		}
+	}
+	return true;
+}
+#endif
 
 
+#ifndef NEW_INSETS
 bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * 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 (!(endpar) ||
-#ifndef NEW_INSETS
 	    (startpar->ParFromPos(start) ==
-		 (endpar)->ParFromPos(end))
+	     (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);
+			startpar->CopyIntoMinibuffer(*current_view->buffer(),
-#ifndef NEW_INSETS
+						     i);
 			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_;
@@ -247,18 +248,7 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
 			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
 		
-#ifndef NEW_INSETS
 		// care about footnotes
 		if (buf->footnoteflag) {
 			tmppar = buf;
@@ -267,55 +257,90 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
 				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);
 		}
 	}
 	return true;
 }
+#else
+bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
+				int start, int end, char tc)
+{
+	if (!startpar || (start > startpar->size()))
+		return false;
+	
+	DeleteBuffer();
+	
+	textclass = tc;
+	
+	if (!endpar ||
+	    startpar == endpar) {
+		// only within one paragraph
+		buf = new LyXParagraph;
+		LyXParagraph::size_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
+		LyXParagraph * tmppar = startpar;
+		buf = tmppar->Clone();
+		LyXParagraph * tmppar2 = buf;
+		
+		while (tmppar != endpar
+		       && tmppar->next()) {
+			tmppar = tmppar->next();
+			tmppar2->next(tmppar->Clone());
+			tmppar2->next()->previous(tmppar2);
+			tmppar2 = tmppar2->next();
+		}
+		tmppar2->next(0);
+		
+		// the buf paragraph is too big
+		LyXParagraph::size_type tmpi2 = start;
+		for (; tmpi2; --tmpi2)
+			buf->Erase(0);
+		
+		// now tmppar 2 is too big, delete all after end
+		tmpi2 = end;
+		while (tmppar2->size() > tmpi2) {
+			tmppar2->Erase(tmppar2->size() - 1);
+		}
+	}
+	return true;
+}
+#endif
 
 
+#ifndef NEW_INSETS
 bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** 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()) {
-#endif
 		// only within a paragraph
 		tmpbuf = buf->Clone();
 		// Some provisions should be done here for checking
@@ -348,7 +373,6 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
 		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;
@@ -363,14 +387,6 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
 				tmpbuf->footnotekind = (*par)->footnotekind;
 			}
 		}
-#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);
@@ -386,7 +402,6 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
 		
 		bool paste_the_end = false;
 		
-#ifndef NEW_INSETS
 		// open the paragraph for inserting the buf
 		// if necessary
 		if (((*par)->Last() > pos) || !(*par)->next()) {
@@ -429,7 +444,77 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
 		// restore the simple cut buffer
 		buf = simple_cut_clone;
 	}
+	return true;
+}
 #else
+bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
+				 int & pos, char tc)
+{
+	if (!checkPastePossible(*par))
+		return false;
+	
+	if (pos > (*par)->size())
+		pos = (*par)->size();
+	
+	LyXParagraph * tmpbuf;
+	LyXParagraph * tmppar = *par;
+	int tmppos = pos;
+	
+	// There are two cases: cutbuffer only one paragraph or many
+	if (!buf->next()) {
+		// 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;
+			}
+		}
+		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;
+		while (tmpbuf->next()) {
+			tmpbuf = tmpbuf->next();
+			tmpbuf2->next(tmpbuf->Clone());
+			tmpbuf2->next()->previous(tmpbuf2);
+			tmpbuf2 = tmpbuf2->next();
+		}
+		
+		// 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;
+		
 		// open the paragraph for inserting the buf
 		// if necessary
 		if (((*par)->size() > pos) || !(*par)->next()) {
@@ -470,10 +555,10 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
 		// restore the simple cut buffer
 		buf = simple_cut_clone;
 	}
-#endif
 	
 	return true;
 }
+#endif
 
 
 int CutAndPaste::nrOfParagraphs()