From: Jean-Marc <lasgouttes@lyx.org>
Date: Thu, 16 Apr 2015 09:39:33 +0000 (+0200)
Subject: Do not remove separators at end of rows.
X-Git-Tag: 2.2.0alpha1~1010
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bdaa6fbb2679e23c6cdf38c3b530e0671621df75;p=features.git

Do not remove separators at end of rows.

I am not sure why I addd this code at the time. I do not think there was a good reason.

Fixes bug #9447.
---

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 479e730914..59eb2abd71 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -777,7 +777,7 @@ private:
 
 /** This is the function where the hard work is done. The code here is
  * very sensitive to small changes :) Note that part of the
- * intelligence is also in Row::shorten_if_needed
+ * intelligence is also in Row::shortenIfNeeded.
  */
 void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit) const
 {
@@ -900,12 +900,6 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
 	// if the row is too large, try to cut at last separator.
 	row.shortenIfNeeded(body_pos, width);
 
-	// if the row ends with a separator that is not at end of
-	// paragraph, remove it
-	if (!row.empty() && row.back().type == Row::SEPARATOR
-	    && row.endpos() < par.size())
-		row.pop_back();
-
 	// make sure that the RTL elements are in reverse ordering
 	row.reverseRTL(text_->isRTL(par));
 }