From 19c90f3a894565367976fd1ce551e7388fcd84c3 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Sat, 27 Jan 2018 12:29:27 +0100
Subject: [PATCH] Make sure to add at least one element in row if possible

breakRow should only produce an empty row when there is nothing left
in the paragraph.

Fixes bug #10996.

(cherry picked from commit 253b935f65759ba15b6af02117f8316e2aaf676e)
---
 src/TextMetrics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 620514421b..4768157bda 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -852,7 +852,7 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
 	// or the end of the par, then build a representation of the row.
 	pos_type i = pos;
 	FontIterator fi = FontIterator(*this, par, row.pit(), pos);
-	while (i < end && row.width() <= width) {
+	while (i < end && (i == pos || row.width() <= width)) {
 		char_type c = par.getChar(i);
 		// The most special cases are handled first.
 		if (par.isInset(i)) {