X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext2.C;h=d27f5e1dbdb4fcdfe5b8580174c4e20014816fdd;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=6b13d5b5d82956fad0523b068baee809f4e4e6ea;hpb=67be2e9b29382f21fbc041930db377f8a818fd15;p=lyx.git

diff --git a/src/text2.C b/src/text2.C
index 6b13d5b5d8..d27f5e1dbd 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -335,9 +335,11 @@ void LyXText::setLayout(Buffer const & buffer, pit_type start, pit_type end,
 	LyXLayout_ptr const & lyxlayout = bufparams.getLyXTextClass()[layout];
 
 	for (pit_type pit = start; pit != end; ++pit) {
-		pars_[pit].applyLayout(lyxlayout);
+		Paragraph & par = pars_[pit];
+		par.applyLayout(lyxlayout);
 		if (lyxlayout->margintype == MARGIN_MANUAL)
-			pars_[pit].setLabelWidthString(buffer.translateLabel(lyxlayout->labelstring()));
+			par.setLabelWidthString(par.translateIfPossible(
+				lyxlayout->labelstring(), buffer.params()));
 	}
 }
 
@@ -985,13 +987,16 @@ bool LyXText::cursorUp(LCursor & cur)
 	ParagraphMetrics const & pm = tm.parMetrics(cur.pit());
 
 	int row;
-	int const x = cur.targetX();
-
 	if (cur.pos() && cur.boundary())
 		row = pm.pos2row(cur.pos()-1);
 	else
 		row = pm.pos2row(cur.pos());
 
+	// remember current position only if we are not at the end of a row.
+	if (cur.pos() != pm.rows()[row].endpos())
+		cur.setTargetX();
+	int const x = cur.targetX();
+
 	if (!cur.selection()) {
 		int const y = bv_funcs::getPos(cur.bv(), cur, cur.boundary()).y_;
 		LCursor old = cur;
@@ -1041,13 +1046,16 @@ bool LyXText::cursorDown(LCursor & cur)
 	ParagraphMetrics const & pm = tm.parMetrics(cur.pit());
 
 	int row;
-	int const x = cur.targetX();
-
 	if (cur.pos() && cur.boundary())
 		row = pm.pos2row(cur.pos()-1);
 	else
 		row = pm.pos2row(cur.pos());
 
+	// remember current position only if we are not at the end of a row.
+	if (cur.pos() != pm.rows()[row].endpos())
+		cur.setTargetX();
+	int const x = cur.targetX();
+
 	if (!cur.selection()) {
 		int const y = bv_funcs::getPos(cur.bv(), cur, cur.boundary()).y_;
 		LCursor old = cur;
@@ -1172,7 +1180,7 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur,
 		    && oldpar.isLineSeparator(old.pos())
 		    && oldpar.isLineSeparator(old.pos() - 1)
 		    && !oldpar.isDeleted(old.pos() - 1)) {
-			oldpar.eraseChar(old.pos() - 1, false); // do not track changes in DEPM
+			oldpar.eraseChar(old.pos() - 1, cur.buffer().params().trackChanges);
 #ifdef WITH_WARNINGS
 #warning This will not work anymore when we have multiple views of the same buffer
 // In this case, we will have to correct also the cursors held by
@@ -1225,13 +1233,58 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur,
 		return true;
 	}
 
-	if (oldpar.stripLeadingSpaces())
+	if (oldpar.stripLeadingSpaces(cur.buffer().params().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;
 }
 
 
+void LyXText::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges)
+{
+	BOOST_ASSERT(first >= 0 && first <= last && last < (int) pars_.size());
+
+	for (pit_type pit = first; pit <= last; ++pit) {
+		Paragraph & par = pars_[pit];
+
+		// We allow all kinds of "mumbo-jumbo" when freespacing.
+		if (par.isFreeSpacing())
+			continue;
+
+		for (pos_type pos = 1; pos < par.size(); ++pos) {
+			if (par.isLineSeparator(pos) && par.isLineSeparator(pos - 1)
+			    && !par.isDeleted(pos - 1)) {
+				if (par.eraseChar(pos - 1, trackChanges)) {
+					--pos;
+				}
+			}
+		}
+
+		// don't delete anything if this is the only remaining paragraph within the given range
+		// note: LyXText::acceptOrRejectChanges() sets the cursor to 'first' after calling DEPM 
+		if (first == last)
+			continue;
+
+		// don't delete empty paragraphs with keepempty set
+		if (par.allowEmpty())
+			continue;
+
+		if (par.empty() || (par.size() == 1 && par.isLineSeparator(0))) {
+			pars_.erase(boost::next(pars_.begin(), pit));
+			--pit;
+			--last;
+			continue;
+		}
+
+		par.stripLeadingSpaces(trackChanges);
+	}
+}
+
+
 void LyXText::recUndo(LCursor & cur, pit_type first, pit_type last) const
 {
 	recordUndo(cur, Undo::ATOMIC, first, last);