X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=07839a748d016e4d6609a9354bd41e014aecd424;hb=9a31c1b90b0f08fbc3ac2a51f4aa179e879f8d4f;hp=e4c0c2614edcbf79b3d4076becae0f5d0f80b81b;hpb=b59b968c3eae5cc0d5ea40444f85cd693751c688;p=lyx.git

diff --git a/src/Text2.cpp b/src/Text2.cpp
index e4c0c2614e..07839a748d 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -186,6 +186,8 @@ void Text::setLayout(pit_type start, pit_type end,
 		if (lyxlayout.margintype == MARGIN_MANUAL)
 			par.setLabelWidthString(par.expandLabel(lyxlayout, bp));
 	}
+
+	deleteEmptyParagraphMechanism(start, end - 1, bp.track_changes);
 }
 
 
@@ -198,6 +200,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
 	pit_type end = cur.selEnd().pit() + 1;
 	cur.recordUndoSelection();
 	setLayout(start, end, layout);
+	cur.fixIfBroken();
 	cur.setCurrentFont();
 	cur.forceBufferUpdate();
 }
@@ -480,7 +483,7 @@ void Text::setLabelWidthStringToSequence(Cursor const & cur,
 }
 
 
-void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
+void Text::setParagraphs(Cursor & cur, docstring const & arg, bool merge)
 {
 	LBUFERR(cur.text());
 
@@ -818,6 +821,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 
 	Paragraph & oldpar = old.paragraph();
 	bool const trackChanges = cur.buffer()->params().track_changes;
+	bool result = false;
 
 	// We do nothing if cursor did not move
 	if (cur.top() == old.top())
@@ -831,15 +835,10 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 	if (oldpar.isFreeSpacing())
 		return false;
 
-	// Find a common inset and the corresponding depth.
-	size_t depth = 0;
-	for (; depth < cur.depth(); ++depth)
-		if (&old.inset() == &cur[depth].inset())
-			break;
-
 	// Whether a common inset is found and whether the cursor is still in
 	// the same paragraph (possibly nested).
-	bool const same_par = depth < cur.depth() && old.idx() == cur[depth].idx()
+	int const depth = cur.find(&old.inset());
+	bool const same_par = depth != -1 && old.idx() == cur[depth].idx()
 		&& old.pit() == cur[depth].pit();
 
 	/*
@@ -847,8 +846,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 	 * them, but only if the cursor has really moved.
 	 */
 
-	/* Ok I'll put some comments here about what is missing.
-	   There are still some small problems that can lead to
+	/* There are still some small problems that can lead to
 	   double spaces stored in the document file or space at
 	   the beginning of paragraphs(). This happens if you have
 	   the cursor between two spaces and then save. Or if you
@@ -856,14 +854,6 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 	   beginning and then save right after the paste. (Lgb)
 	*/
 
-	// If old.pos() == 0 and old.pos()(1) == LineSeparator
-	// delete the LineSeparator.
-	// MISSING
-
-	// If old.pos() == 1 and old.pos()(0) == LineSeparator
-	// delete the LineSeparator.
-	// MISSING
-
 	// find range of spaces around cursors
 	pos_type from = old.pos();
 	while (from > 0
@@ -899,7 +889,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 				cur[depth].pos() = min(from + 1, old.lastpos());
 			need_anchor_change = true;
 		}
-		return true;
+		result = true;
 	}
 
 	/*
@@ -908,52 +898,46 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 
 	// only do our other magic if we changed paragraph
 	if (same_par)
-		return false;
+		return result;
+
+	// only do our magic if the paragraph is empty
+	if (!oldpar.empty())
+		return result;
 
 	// don't delete anything if this is the ONLY paragraph!
 	if (old.lastpit() == 0)
-		return false;
+		return result;
 
 	// Do not delete empty paragraphs with keepempty set.
 	if (oldpar.allowEmpty())
-		return false;
-
-	if (oldpar.empty() || (oldpar.size() == 1 && oldpar.isLineSeparator(0))) {
-		// Delete old par.
-		old.recordUndo(max(old.pit() - 1, pit_type(0)),
-		               min(old.pit() + 1, old.lastpit()));
-		ParagraphList & plist = old.text()->paragraphs();
-		bool const soa = oldpar.params().startOfAppendix();
-		plist.erase(lyx::next(plist.begin(), old.pit()));
-		// do not lose start of appendix marker (bug 4212)
-		if (soa && old.pit() < pit_type(plist.size()))
-			plist[old.pit()].params().startOfAppendix(true);
-
-		// see #warning (FIXME?) above
-		if (cur.depth() >= old.depth()) {
-			CursorSlice & curslice = cur[old.depth() - 1];
-			if (&curslice.inset() == &old.inset()
-			    && curslice.pit() > old.pit()) {
-				--curslice.pit();
-				// since a paragraph has been deleted, all the
-				// insets after `old' have been copied and
-				// their address has changed. Therefore we
-				// need to `regenerate' cur. (JMarc)
-				cur.updateInsets(&(cur.bottom().inset()));
-				need_anchor_change = true;
-			}
+		return result;
+
+	// Delete old par.
+	old.recordUndo(max(old.pit() - 1, pit_type(0)),
+	               min(old.pit() + 1, old.lastpit()));
+	ParagraphList & plist = old.text()->paragraphs();
+	bool const soa = oldpar.params().startOfAppendix();
+	plist.erase(lyx::next(plist.begin(), old.pit()));
+	// do not lose start of appendix marker (bug 4212)
+	if (soa && old.pit() < pit_type(plist.size()))
+		plist[old.pit()].params().startOfAppendix(true);
+
+	// see #warning (FIXME?) above
+	if (cur.depth() >= old.depth()) {
+		CursorSlice & curslice = cur[old.depth() - 1];
+		if (&curslice.inset() == &old.inset()
+		    && curslice.pit() > old.pit()) {
+			--curslice.pit();
+			// since a paragraph has been deleted, all the
+			// insets after `old' have been copied and
+			// their address has changed. Therefore we
+			// need to `regenerate' cur. (JMarc)
+			cur.updateInsets(&(cur.bottom().inset()));
+			need_anchor_change = true;
 		}
-		return true;
 	}
 
-	if (oldpar.stripLeadingSpaces(trackChanges)) {
-		need_anchor_change = true;
-		// We return true here because the Paragraph contents changed and
-		// we need a redraw before further action is processed.
-		return true;
-	}
-
-	return false;
+	return true;
 }
 
 
@@ -1010,8 +994,6 @@ void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool tra
 			--last;
 			continue;
 		}
-
-		par.stripLeadingSpaces(trackChanges);
 	}
 }