X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=65a1aa7945eaebac5eebc0ffb0615a3dcc64f3fd;hb=b5722962fb0393299e02df0b146522770e98aef6;hp=b40cb5553010a2d298a2842b5d5ae7d1236a2dad;hpb=731dbddd1120ede02e14ec90d3d93207f76f9aec;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index b40cb55530..65a1aa7945 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -26,7 +26,6 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "HSpace.h"
 #include "InsetList.h"
 #include "Language.h"
 #include "Layout.h"
@@ -40,14 +39,19 @@
 
 #include "insets/InsetText.h"
 
-#include "mathed/MathMacroTemplate.h"
+#include "mathed/InsetMathMacroTemplate.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
+#include "frontends/NullPainter.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/lassert.h"
+#include "support/lyxlib.h"
+#include "support/RefChanger.h"
 
+#include <stdlib.h>
 #include <cmath>
 
 using namespace std;
@@ -97,7 +101,7 @@ int numberOfHfills(Row const & row, ParagraphMetrics const & pm,
 }
 
 
-}
+} // namespace
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -123,13 +127,6 @@ bool TextMetrics::contains(pit_type pit) const
 }
 
 
-ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const
-{
-	return const_cast<TextMetrics *>(this)->parMetrics(pit, true);
-}
-
-
-
 pair<pit_type, ParagraphMetrics const *> TextMetrics::first() const
 {
 	ParMetricsCache::const_iterator it = par_metrics_.begin();
@@ -145,6 +142,30 @@ pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
 }
 
 
+bool TextMetrics::isLastRow(Row const & row) const
+{
+	ParagraphList const & pars = text_->paragraphs();
+	return row.endpos() >= pars[row.pit()].size()
+		&& row.pit() + 1 == pit_type(pars.size());
+}
+
+
+bool TextMetrics::isFirstRow(Row const & row) const
+{
+	return row.pos() == 0 && row.pit() == 0;
+}
+
+
+void TextMetrics::setRowChanged(pit_type pit, pos_type pos)
+{
+	for (auto & pm_pair : par_metrics_)
+		if (pm_pair.first == pit)
+			for (Row & row : pm_pair.second.rows())
+				if (row.pos() == pos)
+					row.changed(true);
+}
+
+
 ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo)
 {
 	ParMetricsCache::iterator pmc_it = par_metrics_.find(pit);
@@ -158,7 +179,44 @@ ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo)
 }
 
 
-bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
+ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const
+{
+	return const_cast<TextMetrics *>(this)->parMetrics(pit, true);
+}
+
+
+void TextMetrics::newParMetricsDown()
+{
+	pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
+	pit_type const pit = last.first + 1;
+	if (pit == int(text_->paragraphs().size()))
+		return;
+
+	// do it and update its position.
+	redoParagraph(pit);
+	par_metrics_[pit].setPosition(last.second.position()
+		+ last.second.descent() + par_metrics_[pit].ascent());
+	updatePosCache(pit);
+}
+
+
+void TextMetrics::newParMetricsUp()
+{
+	pair<pit_type, ParagraphMetrics> const & first = *par_metrics_.begin();
+	if (first.first == 0)
+		return;
+
+	pit_type const pit = first.first - 1;
+	// do it and update its position.
+	redoParagraph(pit);
+	par_metrics_[pit].setPosition(first.second.position()
+		- first.second.ascent() - par_metrics_[pit].descent());
+	updatePosCache(pit);
+}
+
+
+bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width,
+			  bool const expand_on_multipars)
 {
 	LBUFERR(mi.base.textwidth > 0);
 	max_width_ = mi.base.textwidth;
@@ -168,7 +226,7 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 	dim_ = Dimension();
 	dim_.wid = min_width;
 	pit_type const npar = text_->paragraphs().size();
-	if (npar > 1)
+	if (npar > 1 && expand_on_multipars)
 		// If there is more than one row, expand the text to
 		// the full allowable width.
 		dim_.wid = max_width_;
@@ -179,13 +237,21 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 	bool changed = false;
 	unsigned int h = 0;
 	for (pit_type pit = 0; pit != npar; ++pit) {
-		changed |= redoParagraph(pit);
+		// create rows, but do not set alignment yet
+		changed |= redoParagraph(pit, false);
 		ParagraphMetrics const & pm = par_metrics_[pit];
 		h += pm.height();
 		if (dim_.wid < pm.width())
 			dim_.wid = pm.width();
 	}
 
+	// Now set alignment for all rows (the width might not have been known before).
+	for (pit_type pit = 0; pit != npar; ++pit) {
+		ParagraphMetrics & pm = par_metrics_[pit];
+		for (Row & row : pm.rows())
+			setRowAlignment(row, dim_.wid);
+	}
+
 	dim_.asc = par_metrics_[0].ascent();
 	dim_.des = h - dim_.asc;
 	//lyxerr << "dim_.wid " << dim_.wid << endl;
@@ -198,6 +264,14 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 }
 
 
+void TextMetrics::updatePosCache(pit_type pit) const
+{
+	frontend::NullPainter np;
+	PainterInfo pi(bv_, np);
+	drawParagraph(pi, pit, origin_.x_, par_metrics_[pit].position());
+}
+
+
 int TextMetrics::rightMargin(ParagraphMetrics const & pm) const
 {
 	return text_->isMainText() ? pm.rightMargin(*bv_) : 0;
@@ -343,7 +417,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
 }
 
 
-bool TextMetrics::redoParagraph(pit_type const pit)
+bool TextMetrics::redoParagraph(pit_type const pit, bool const align_rows)
 {
 	Paragraph & par = text_->getPar(pit);
 	// IMPORTANT NOTE: We pass 'false' explicitly in order to not call
@@ -359,8 +433,9 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	// FIXME: This check ought to be done somewhere else. It is the reason
 	// why text_ is not const. But then, where else to do it?
 	// Well, how can you end up with either (a) a biblio environment that
-	// has no InsetBibitem or (b) a biblio environment with more than one
-	// InsetBibitem? I think the answer is: when paragraphs are merged;
+	// has no InsetBibitem, (b) a biblio environment with more than one
+	// InsetBibitem or (c) a paragraph that has a bib item but is no biblio
+	// environment? I think the answer is: when paragraphs are merged;
 	// when layout is set; when material is pasted.
 	if (par.brokenBiblio()) {
 		Cursor & cur = const_cast<Cursor &>(bv_->cursor());
@@ -401,40 +476,49 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	}
 
 	// redo insets
+	par.setBeginOfBody();
 	Font const bufferfont = buffer.params().getFont();
 	CoordCache::Insets & insetCache = bv_->coordCache().insets();
-	InsetList::const_iterator ii = par.insetList().begin();
-	InsetList::const_iterator iend = par.insetList().end();
-	for (; ii != iend; ++ii) {
+	for (auto const & e : par.insetList()) {
 		// FIXME Doesn't this HAVE to be non-empty?
 		// position already initialized?
 		if (!parPos.empty()) {
-			parPos.pos() = ii->pos;
+			parPos.pos() = e.pos;
 
 			// A macro template would normally not be visible
 			// by itself. But the tex macro semantics allow
 			// recursion, so we artifically take the context
 			// after the macro template to simulate this.
-			if (ii->inset->lyxCode() == MATHMACRO_CODE)
+			if (e.inset->lyxCode() == MATHMACRO_CODE)
 				parPos.pos()++;
 		}
 
+		// If there is an end of paragraph marker, its size should be
+		// substracted to the available width. The logic here is
+		// almost the same as in breakRow, remember keep them in sync.
+		int eop = 0;
+		if (lyxrc.paragraph_markers && e.pos + 1 == par.size()
+		    && size_type(pit + 1) < text_->paragraphs().size()) {
+			Font f(text_->layoutFont(pit));
+			// ¶ U+00B6 PILCROW SIGN
+			eop = theFontMetrics(f).width(char_type(0x00B6));
+		}
+
 		// do the metric calculation
 		Dimension dim;
-		int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
-			- right_margin;
-		Font const & font = ii->inset->inheritFont() ?
-			displayFont(pit, ii->pos) : bufferfont;
+		int const w = max_width_ - leftMargin(pit, e.pos)
+			- right_margin - eop;
+		Font const & font = e.inset->inheritFont() ?
+			displayFont(pit, e.pos) : bufferfont;
 		MacroContext mc(&buffer, parPos);
 		MetricsInfo mi(bv_, font.fontInfo(), w, mc);
-		ii->inset->metrics(mi, dim);
-		if (!insetCache.has(ii->inset) || insetCache.dim(ii->inset) != dim) {
-			insetCache.add(ii->inset, dim);
+		e.inset->metrics(mi, dim);
+		if (!insetCache.has(e.inset) || insetCache.dim(e.inset) != dim) {
+			insetCache.add(e.inset, dim);
 			changed = true;
 		}
 	}
 
-	par.setBeginOfBody();
 	pos_type first = 0;
 	size_t row_index = 0;
 	bool need_new_row = false;
@@ -442,29 +526,27 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	do {
 		if (row_index == pm.rows().size())
 			pm.rows().push_back(Row());
+		else
+			pm.rows()[row_index] = Row();
 		Row & row = pm.rows()[row_index];
 		row.pit(pit);
 		row.pos(first);
-		row.pit(pit);
 		need_new_row = breakRow(row, right_margin);
 		setRowHeight(row);
-		row.setChanged(false);
-		if (row_index || row.endpos() < par.size()
-		    || (row.right_boundary() && par.inInset().lyxCode() != CELL_CODE)) {
+		row.changed(true);
+		if ((row_index || row.endpos() < par.size() || row.right_boundary())
+		    && par.inInset().lyxCode() != CELL_CODE) {
 			/* If there is more than one row or the row has been
 			 * broken by a display inset or a newline, expand the text
 			 * to the full allowable width. This setting here is
-			 * needed for the computeRowMetrics() below. In the case
-			 * of a display inset, we do nothing when inside a table
-			 * cell, because the tabular code is not prepared for
-			 * that, and it triggers when using a caption in a
-			 * longtable (see bugs #9945 and #9757).
+			 * needed for the setRowAlignment() below.
+			 * We do nothing when inside a table cell.
 			 */
 			if (dim_.wid < max_width_)
 				dim_.wid = max_width_;
 		}
-		int const max_row_width = max(dim_.wid, row.width());
-		computeRowMetrics(row, max_row_width);
+		if (align_rows)
+			setRowAlignment(row, max(dim_.wid, row.width()));
 		first = row.endpos();
 		++row_index;
 
@@ -479,27 +561,29 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	// specially tailored for the main text.
 	// Top and bottom margin of the document (only at top-level)
 	if (text_->isMainText()) {
+		// original value was 20px, which is 0.2in at 100dpi
+		int const margin = bv_->zoomedPixels(20);
 		if (pit == 0) {
-			pm.rows().front().dimension().asc += 20;
-			/* coverity[copy_paste_error]: coverity thinks that we
-			 * should update pm.dim().asc below, but all the rows
-			 * heights are actually counted as part of the paragraph metric
-			 * descent see loop above).
+			pm.rows().front().dim().asc += margin;
+			/* coverity thinks that we should update pm.dim().asc
+			 * below, but all the rows heights are actually counted as
+			 * part of the paragraph metric descent see loop above).
 			 */
-			pm.dim().des += 20;
+			// coverity[copy_paste_error]
+			pm.dim().des += margin;
 		}
 		ParagraphList const & pars = text_->paragraphs();
 		if (pit + 1 == pit_type(pars.size())) {
-			pm.rows().back().dimension().des += 20;
-			pm.dim().des += 20;
+			pm.rows().back().dim().des += margin;
+			pm.dim().des += margin;
 		}
 	}
 
 	// The space above and below the paragraph.
 	int const top = parTopSpacing(pit);
-	pm.rows().front().dimension().asc += top;
+	pm.rows().front().dim().asc += top;
 	int const bottom = parBottomSpacing(pit);
-	pm.rows().back().dimension().des += bottom;
+	pm.rows().back().dim().des += bottom;
 	pm.dim().des += top + bottom;
 
 	pm.dim().asc += pm.rows()[0].ascent();
@@ -513,13 +597,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 
 LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const
 {
-	Layout const & layout = par.layout();
-
-	LyXAlignment align;
-	if (par.params().align() == LYX_ALIGN_LAYOUT)
-		align = layout.align;
-	else
-		align = par.params().align();
+	LyXAlignment align = par.getAlign(bv_->buffer().params());
 
 	// handle alignment inside tabular cells
 	Inset const & owner = text_->inset();
@@ -566,17 +644,16 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const
 		// not justify stuff, then don't stretch.
 		// A forced block alignment can only be overridden the 'no
 		// justification on screen' setting.
-		if (((row.right_boundary() || row.endpos() == par.size())
-		     && !forced_block)
+		if ((row.flushed() && !forced_block)
 		    || !bv_->buffer().params().justification)
-			align = text_->isRTL(par) ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT;
+			align = row.isRTL() ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT;
 	}
 
 	return align;
 }
 
 
-void TextMetrics::computeRowMetrics(Row & row, int width) const
+void TextMetrics::setRowAlignment(Row & row, int width) const
 {
 	row.label_hfill = 0;
 	row.separator = 0;
@@ -624,27 +701,35 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const
 		// Common case : there is no hfill, and the alignment will be
 		// meaningful
 		switch (getAlign(par, row)) {
-		case LYX_ALIGN_BLOCK: {
-			int const ns = row.countSeparators();
-			// If we have separators, then stretch the row
-			if (ns) {
-				row.setSeparatorExtraWidth(double(w) / ns);
-				row.dimension().wid += w;
-			} else if (text_->isRTL(par)) {
+		case LYX_ALIGN_BLOCK:
+			// Expand expanding characters by a total of w
+			if (!row.setExtraWidth(w) && row.isRTL()) {
+				// Justification failed and the text is RTL: align to the right
 				row.left_margin += w;
-				row.dimension().wid += w;
+				row.dim().wid += w;
+			}
+			break;
+		case LYX_ALIGN_LEFT:
+			// a displayed inset that is flushed
+			if (Inset const * inset = par.getInset(row.pos())) {
+				row.left_margin += inset->indent(*bv_);
+				row.dim().wid += inset->indent(*bv_);
 			}
 			break;
-		}
 		case LYX_ALIGN_RIGHT:
-			row.left_margin += w;
-			row.dimension().wid += w;
+			if (Inset const * inset = par.getInset(row.pos())) {
+				int const new_w = max(w - inset->indent(*bv_), 0);
+				row.left_margin += new_w;
+				row.dim().wid += new_w;
+			} else {
+				row.left_margin += w;
+				row.dim().wid += w;
+			}
 			break;
 		case LYX_ALIGN_CENTER:
-			row.dimension().wid += w / 2;
+			row.dim().wid += w / 2;
 			row.left_margin += w / 2;
 			break;
-		case LYX_ALIGN_LEFT:
 		case LYX_ALIGN_NONE:
 		case LYX_ALIGN_LAYOUT:
 		case LYX_ALIGN_SPECIAL:
@@ -654,9 +739,10 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const
 		return;
 	}
 
+	// Case nh > 0. There are hfill separators.
 	hfill = w / nh;
 	hfill_rem = w % nh;
-	row.dimension().wid += w;
+	row.dim().wid += w;
 	// Set size of hfill insets
 	pos_type const endpos = row.endpos();
 	pos_type body_pos = par.beginOfBody();
@@ -665,22 +751,20 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const
 		body_pos = 0;
 
 	CoordCache::Insets & insetCache = bv_->coordCache().insets();
-	Row::iterator cit = row.begin();
-	Row::iterator const cend = row.end();
-	for ( ; cit != cend; ++cit) {
-		if (row.label_hfill && cit->endpos == body_pos
-		    && cit->type == Row::SPACE)
-			cit->dim.wid -= int(row.label_hfill * (nlh - 1));
-		if (cit->inset && pm.hfillExpansion(row, cit->pos)) {
-			if (cit->pos >= body_pos) {
-				cit->dim.wid += hfill;
+	for (Row::Element & e : row) {
+		if (row.label_hfill && e.endpos == body_pos
+		    && e.type == Row::SPACE)
+			e.dim.wid -= int(row.label_hfill * (nlh - 1));
+		if (e.inset && pm.hfillExpansion(row, e.pos)) {
+			if (e.pos >= body_pos) {
+				e.dim.wid += hfill;
 				--nh;
 				if (nh == 0)
-					cit->dim.wid += hfill_rem;
+					e.dim.wid += hfill_rem;
 			} else
-				cit->dim.wid += int(row.label_hfill);
+				e.dim.wid += int(row.label_hfill);
 			// Cache the inset dimension.
-			insetCache.add(cit->inset, cit->dim);
+			insetCache.add(e.inset, e.dim);
 		}
 	}
 }
@@ -692,13 +776,12 @@ int TextMetrics::labelFill(Row const & row) const
 	LBUFERR(par.beginOfBody() > 0 || par.isEnvSeparator(0));
 
 	int w = 0;
-	Row::const_iterator cit = row.begin();
-	Row::const_iterator const end = row.end();
 	// iterate over elements before main body (except the last one,
 	// which is extra space).
-	while (cit!= end && cit->endpos < par.beginOfBody()) {
-		w += cit->dim.wid;
-		++cit;
+	for (Row::Element const & e : row) {
+		if (e.endpos >= par.beginOfBody())
+			break;
+		w += e.dim.wid;
 	}
 
 	docstring const & label = par.params().labelWidthString();
@@ -734,7 +817,7 @@ int TextMetrics::labelEnd(pit_type const pit) const
 	if (text_->getPar(pit).layout().margintype != MARGIN_MANUAL)
 		return 0;
 	// return the beginning of the body
-	return leftMargin(max_width_, pit);
+	return leftMargin(pit);
 }
 
 namespace {
@@ -793,7 +876,7 @@ private:
 	pos_type bodypos_;
 };
 
-} // anon namespace
+} // namespace
 
 /** This is the function where the hard work is done. The code here is
  * very sensitive to small changes :) Note that part of the
@@ -801,29 +884,24 @@ private:
  */
 bool TextMetrics::breakRow(Row & row, int const right_margin) const
 {
+	LATTEST(row.empty());
 	Paragraph const & par = text_->getPar(row.pit());
 	pos_type const end = par.size();
 	pos_type const pos = row.pos();
 	pos_type const body_pos = par.beginOfBody();
-	bool const is_rtl = text_->isRTL(par);
+	bool const is_rtl = text_->isRTL(row.pit());
 	bool need_new_row = false;
 
-	row.clear();
-	row.left_margin = leftMargin(max_width_, row.pit(), pos);
+	row.left_margin = leftMargin(row.pit(), pos);
 	row.right_margin = right_margin;
 	if (is_rtl)
 		swap(row.left_margin, row.right_margin);
 	// Remember that the row width takes into account the left_margin
 	// but not the right_margin.
-	row.dimension().wid = row.left_margin;
+	row.dim().wid = row.left_margin;
 	// the width available for the row.
 	int const width = max_width_ - row.right_margin;
 
-	if (pos >= end || row.width() > width) {
-		row.endpos(end);
-		return need_new_row;
-	}
-
 #if 0
 	//FIXME: As long as leftMargin() is not correctly implemented for
 	// MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here.
@@ -842,10 +920,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);
-	do {
-		// this can happen for an empty row after a newline
-		if (i >= end)
-			break;
+	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)) {
@@ -866,17 +941,24 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
 		} else if (c == '\t')
 			row.addSpace(i, theFontMetrics(*fi).width(from_ascii("    ")),
 				     *fi, par.lookupChange(i));
-		else {
-			// FIXME: please someone fix the Hebrew/Arabic parenthesis mess!
-			// see also Paragraph::getUChar.
-			if (fi->language()->lang() == "hebrew") {
-				if (c == '(')
-					c = ')';
-				else if (c == ')')
-					c = '(';
-			}
+		else if (c == 0x2028 || c == 0x2029) {
+			/**
+			 * U+2028 LINE SEPARATOR
+			 * U+2029 PARAGRAPH SEPARATOR
+
+			 * These are special unicode characters that break
+			 * lines/pragraphs. Not handling them lead to trouble wrt
+			 * Qt QTextLayout formatting. We add a visible character
+			 * on screen so that the user can see that something is
+			 * happening.
+			*/
+			row.finalizeLast();
+			// ⤶ U+2936 ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS
+			// ¶ U+00B6 PILCROW SIGN
+			char_type const screen_char = (c == 0x2028) ? 0x2936 : 0x00B6;
+			row.add(i, screen_char, *fi, par.lookupChange(i));
+		} else
 			row.add(i, c, *fi, par.lookupChange(i));
-		}
 
 		// add inline completion width
 		// draw logically behind the previous character
@@ -900,24 +982,33 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
 		Inset const * inset = 0;
 		if (par.isNewline(i) || par.isEnvSeparator(i)
 		    || (i + 1 < end && (inset = par.getInset(i + 1))
-			&& inset->display())
+		        && inset->display())
 		    || (!row.empty() && row.back().inset
-			&& row.back().inset->display())) {
-			row.right_boundary(true);
-			need_new_row = par.isNewline(i);
+		        && row.back().inset->display())) {
+			row.flushed(true);
+			// We will force a row creation after either
+			// - a newline;
+			// - a display inset followed by a end label.
+			need_new_row =
+				par.isNewline(i)
+				|| (inset && inset->display() && i + 1 == end
+				    && text_->getEndLabel(row.pit()) != END_LABEL_NO_LABEL);
 			++i;
 			break;
 		}
 
 		++i;
 		++fi;
-	} while (i < end && row.width() <= width);
+	}
 	row.finalizeLast();
 	row.endpos(i);
 
-	// End of paragraph marker
+	// End of paragraph marker. The logic here is almost the
+	// same as in redoParagraph, remember keep them in sync.
 	ParagraphList const & pars = text_->paragraphs();
-	if (lyxrc.paragraph_markers && !need_new_row
+	Change const & change = par.lookupChange(i);
+	if ((lyxrc.paragraph_markers || change.changed())
+	    && !need_new_row
 	    && i == end && size_type(row.pit() + 1) < pars.size()) {
 		// add a virtual element for the end-of-paragraph
 		// marker; it is shown on screen, but does not exist
@@ -927,13 +1018,26 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
 		BufferParams const & bparams
 			= text_->inset().buffer().params();
 		f.setLanguage(par.getParLanguage(bparams));
-		row.addVirtual(end, docstring(1, char_type(0x00B6)), f, Change());
+		// ¶ U+00B6 PILCROW SIGN
+		row.addVirtual(end, docstring(1, char_type(0x00B6)), f, change);
 	}
 
+	// Is there a end-of-paragaph change?
+	if (i == end && par.lookupChange(end).changed() && !need_new_row)
+		row.needsChangeBar(true);
+
 	// if the row is too large, try to cut at last separator. In case
 	// of success, reset indication that the row was broken abruptly.
-	if (row.shortenIfNeeded(body_pos, width))
-		row.right_boundary(!row.empty() && row.back().endpos == row.endpos());
+	int const next_width = max_width_ - leftMargin(row.pit(), row.endpos())
+		- rightMargin(row.pit());
+
+	if (row.shortenIfNeeded(body_pos, width, next_width))
+		row.flushed(false);
+	row.right_boundary(!row.empty() && row.endpos() < end
+	                   && row.back().endpos == row.endpos());
+	// Last row in paragraph is flushed
+	if (row.endpos() == end)
+		row.flushed(true);
 
 	// make sure that the RTL elements are in reverse ordering
 	row.reverseRTL(is_rtl);
@@ -999,8 +1103,8 @@ int TextMetrics::parTopSpacing(pit_type const pit) const
 	if (prev != pit_type(pars.size())) {
 		asc += int(pars[prev].layout().parsep * dh);
 	} else if (pit != 0) {
-		Paragraph const & prevpar = pars[pit - 1];
-		if (prevpar.getDepth() != 0 || prevpar.layout() == layout)
+		Paragraph const & prevpar2 = pars[pit - 1];
+		if (prevpar2.getDepth() != 0 || prevpar2.layout() == layout)
 			asc += int(layout.parsep * dh);
 	}
 
@@ -1053,16 +1157,14 @@ void TextMetrics::setRowHeight(Row & row) const
 	int maxdes = int(fm.maxDescent() * spacing_val);
 
 	// Find the ascent/descent of the row contents
-	Row::const_iterator cit = row.begin();
-	Row::const_iterator cend = row.end();
-	for ( ; cit != cend; ++cit) {
-		if (cit->inset) {
-			maxasc = max(maxasc, cit->dim.ascent());
-			maxdes = max(maxdes, cit->dim.descent());
+	for (Row::Element const & e : row) {
+		if (e.inset) {
+			maxasc = max(maxasc, e.dim.ascent());
+			maxdes = max(maxdes, e.dim.descent());
 		} else {
-			FontMetrics const & fm = theFontMetrics(cit->font);
-			maxasc = max(maxasc, int(fm.maxAscent() * spacing_val));
-			maxdes = max(maxdes, int(fm.maxDescent() * spacing_val));
+			FontMetrics const & fm2 = theFontMetrics(e.font);
+			maxasc = max(maxasc, int(fm2.maxAscent() * spacing_val));
+			maxdes = max(maxdes, int(fm2.maxDescent() * spacing_val));
 		}
 	}
 
@@ -1070,8 +1172,8 @@ void TextMetrics::setRowHeight(Row & row) const
 	++maxasc;
 	++maxdes;
 
-	row.dimension().asc = maxasc;
-	row.dimension().des = maxdes;
+	row.dim().asc = maxasc;
+	row.dim().des = maxdes;
 }
 
 
@@ -1125,8 +1227,10 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x,
 		 * how boundary helps here.
 		 */
 		else if (pos == cit->endpos
-			 && cit + 1 != row.end()
-			 && cit->isRTL() != (cit + 1)->isRTL())
+		         && ((!cit->isRTL() && cit + 1 != row.end()
+		              && (cit + 1)->isRTL())
+		             || (cit->isRTL() && cit != row.begin()
+		                 && !(cit - 1)->isRTL())))
 			boundary = true;
 	}
 
@@ -1168,33 +1272,6 @@ pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const
 }
 
 
-void TextMetrics::newParMetricsDown()
-{
-	pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
-	pit_type const pit = last.first + 1;
-	if (pit == int(text_->paragraphs().size()))
-		return;
-
-	// do it and update its position.
-	redoParagraph(pit);
-	par_metrics_[pit].setPosition(last.second.position()
-		+ last.second.descent() + par_metrics_[pit].ascent());
-}
-
-
-void TextMetrics::newParMetricsUp()
-{
-	pair<pit_type, ParagraphMetrics> const & first = *par_metrics_.begin();
-	if (first.first == 0)
-		return;
-
-	pit_type const pit = first.first - 1;
-	// do it and update its position.
-	redoParagraph(pit);
-	par_metrics_[pit].setPosition(first.second.position()
-		- first.second.ascent() - par_metrics_[pit].descent());
-}
-
 // y is screen coordinate
 pit_type TextMetrics::getPitNearY(int y)
 {
@@ -1244,9 +1321,9 @@ pit_type TextMetrics::getPitNearY(int y)
 		LYXERR(Debug::DEBUG, "examining: pit: " << it->first
 			<< " y: " << it->second.position());
 
-		ParagraphMetrics const & pm = par_metrics_[it->first];
+		ParagraphMetrics const & pm2 = par_metrics_[it->first];
 
-		if (it->first >= pit && int(it->second.position()) - int(pm.ascent()) <= y) {
+		if (it->first >= pit && int(it->second.position()) - int(pm2.ascent()) <= y) {
 			pit = it->first;
 			yy = it->second.position();
 		}
@@ -1313,52 +1390,42 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 	}
 	pit_type pit = getPitNearY(y);
 	LASSERT(pit != -1, return 0);
-
-	int yy = y; // is modified by getPitAndRowNearY
-	Row const & row = getPitAndRowNearY(yy, pit, assert_in_view, up);
-
+	Row const & row = getPitAndRowNearY(y, pit, assert_in_view, up);
 	cur.pit() = pit;
 
 	// Do we cover an inset?
-	InsetList::InsetTable * it = checkInsetHit(pit, x, yy);
+	InsetList::Element * e = checkInsetHit(pit, x, y);
 
-	if (!it) {
+	if (!e) {
 		// No inset, set position in the text
 		bool bound = false; // is modified by getPosNearX
-		int xx = x; // is modified by getPosNearX
-		cur.pos() = getPosNearX(row, xx, bound);
+		cur.pos() = getPosNearX(row, x, bound);
 		cur.boundary(bound);
 		cur.setCurrentFont();
-		cur.setTargetX(xx);
+		cur.setTargetX(x);
 		return 0;
 	}
 
-	Inset * inset = it->inset;
+	Inset * inset = e->inset;
 	//lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl;
 
 	// Set position in front of inset
-	cur.pos() = it->pos;
+	cur.pos() = e->pos;
 	cur.boundary(false);
 	cur.setTargetX(x);
 
 	// Try to descend recursively inside the inset.
-	Inset * edited = inset->editXY(cur, x, yy);
-	if (edited == inset && cur.pos() == it->pos) {
+	Inset * edited = inset->editXY(cur, x, y);
+	// FIXME: it is not clear that the test on position is needed
+	// Remove it if/when semantics of editXY is clarified
+	if (cur.text() == text_ && cur.pos() == e->pos) {
 		// non-editable inset, set cursor after the inset if x is
 		// nearer to that position (bug 9628)
-		CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
-		Dimension const & dim = insetCache.dim(inset);
-		Point p = insetCache.xy(inset);
-		bool const is_rtl = text_->isRTL(text_->getPar(pit));
-		if (is_rtl) {
-			// "in front of" == "right of"
-			if (abs(p.x_ - x) < abs(p.x_ + dim.wid - x))
-				cur.posForward();
-		} else {
-			// "in front of" == "left of"
-			if (abs(p.x_ + dim.wid - x) < abs(p.x_ - x))
-				cur.posForward();
-		}
+		bool bound = false; // is modified by getPosNearX
+		cur.pos() = getPosNearX(row, x, bound);
+		cur.boundary(bound);
+		cur.setCurrentFont();
+		cur.setTargetX(x);
 	}
 
 	if (cur.top().text() == text_)
@@ -1405,35 +1472,19 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 
 
 //takes screen x,y coordinates
-InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
+InsetList::Element * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
 {
 	Paragraph const & par = text_->paragraphs()[pit];
 	CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
 
 	LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << "  pit: " << pit);
 
-	InsetList::const_iterator iit = par.insetList().begin();
-	InsetList::const_iterator iend = par.insetList().end();
-	for (; iit != iend; ++iit) {
-		Inset * inset = iit->inset;
-
-		LYXERR(Debug::DEBUG, "examining inset " << inset);
-
-		if (!insetCache.has(inset)) {
-			LYXERR(Debug::DEBUG, "inset has no cached position");
-			return 0;
-		}
-
-		Dimension const & dim = insetCache.dim(inset);
-		Point p = insetCache.xy(inset);
-
-		LYXERR(Debug::DEBUG, "xo: " << p.x_ << "..." << p.x_ + dim.wid
-			<< " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des);
+	for (InsetList::Element const & e : par.insetList()) {
+		LYXERR(Debug::DEBUG, "examining inset " << e.inset);
 
-		if (x >= p.x_ && x <= p.x_ + dim.wid
-		    && y >= p.y_ - dim.asc && y <= p.y_ + dim.des) {
-			LYXERR(Debug::DEBUG, "Hit inset: " << inset);
-			return const_cast<InsetList::InsetTable *>(&(*iit));
+		if (insetCache.covers(e.inset, x, y)) {
+			LYXERR(Debug::DEBUG, "Hit inset: " << e.inset);
+			return const_cast<InsetList::Element *>(&e);
 		}
 	}
 
@@ -1447,62 +1498,12 @@ Inset * TextMetrics::checkInsetHit(int x, int y)
 {
 	pit_type const pit = getPitNearY(y);
 	LASSERT(pit != -1, return 0);
-	InsetList::InsetTable * it = checkInsetHit(pit, x, y);
+	InsetList::Element * e = checkInsetHit(pit, x, y);
 
-	if (!it)
+	if (!e)
 		return 0;
 
-	return it->inset;
-}
-
-
-Row::const_iterator const
-TextMetrics::findRowElement(Row const & row, pos_type const pos,
-                            bool const boundary, double & x) const
-{
-	/**
-	 * When boundary is true, position i is in the row element (pos, endpos)
-	 * if
-	 *    pos < i <= endpos
-	 * whereas, when boundary is false, the test is
-	 *    pos <= i < endpos
-	 * The correction below allows to handle both cases.
-	*/
-	int const boundary_corr = (boundary && pos) ? -1 : 0;
-
-	x = row.left_margin;
-
-	/** Early return in trivial cases
-	 * 1) the row is empty
-	 * 2) the position is the left-most position of the row; there
-	 * is a quirk here however: if the first element is virtual
-	 * (end-of-par marker for example), then we have to look
-	 * closer
-	 */
-	if (row.empty()
-	    || (pos == row.begin()->left_pos() && !boundary
-			&& !row.begin()->isVirtual()))
-		return row.begin();
-
-	Row::const_iterator cit = row.begin();
-	for ( ; cit != row.end() ; ++cit) {
-		/** Look whether the cursor is inside the element's
-		 * span. Note that it is necessary to take the
-		 * boundary into account, and to accept virtual
-		 * elements, which have pos == endpos.
-		 */
-		if (pos + boundary_corr >= cit->pos
-		    && (pos + boundary_corr < cit->endpos || cit->isVirtual())) {
-				x += cit->pos2x(pos);
-				break;
-		}
-		x += cit->full_width();
-	}
-
-	if (cit == row.end())
-		--cit;
-
-	return cit;
+	return e->inset;
 }
 
 
@@ -1518,7 +1519,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 	pos_type const pos = sl.pos();
 
 	double x = 0;
-	findRowElement(row, pos, boundary, x);
+	row.findElement(pos, boundary, x);
 	return int(x);
 
 }
@@ -1527,14 +1528,14 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
 {
 	//lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl;
-	ParagraphMetrics const & pm = par_metrics_[sl.pit()];
+	ParagraphMetrics const & pm = parMetrics(sl.pit());
 	if (pm.rows().empty())
 		return 0;
 
 	int h = 0;
-	h -= par_metrics_[0].rows()[0].ascent();
+	h -= parMetrics(0).rows()[0].ascent();
 	for (pit_type pit = 0; pit < sl.pit(); ++pit) {
-		h += par_metrics_[pit].height();
+		h += parMetrics(pit).height();
 	}
 	int pos = sl.pos();
 	if (pos && boundary)
@@ -1598,34 +1599,19 @@ void TextMetrics::deleteLineForward(Cursor & cur)
 		if (!cur.selection())
 			text_->deleteWordForward(cur);
 		else
-			cap::cutSelection(cur, true, false);
+			cap::cutSelection(cur, false);
 		cur.checkBufferStructure();
 	}
 }
 
 
-bool TextMetrics::isLastRow(Row const & row) const
-{
-	ParagraphList const & pars = text_->paragraphs();
-	return row.endpos() >= pars[row.pit()].size()
-		&& row.pit() + 1 == pit_type(pars.size());
-}
-
-
-bool TextMetrics::isFirstRow(Row const & row) const
-{
-	return row.pos() == 0 && row.pit() == 0;
-}
-
-
-int TextMetrics::leftMargin(int max_width, pit_type pit) const
+int TextMetrics::leftMargin(pit_type pit) const
 {
-	return leftMargin(max_width, pit, text_->paragraphs()[pit].size());
+	return leftMargin(pit, text_->paragraphs()[pit].size());
 }
 
 
-int TextMetrics::leftMargin(int max_width,
-		pit_type const pit, pos_type const pos) const
+int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const
 {
 	ParagraphList const & pars = text_->paragraphs();
 
@@ -1644,10 +1630,10 @@ int TextMetrics::leftMargin(int max_width,
 
 	int l_margin = 0;
 
-	if (text_->isMainText())
+	if (text_->isMainText()) {
 		l_margin += bv_->leftMargin();
-
-	l_margin += bfm.signedWidth(tclass.leftmargin());
+		l_margin += bfm.signedWidth(tclass.leftmargin());
+	}
 
 	int depth = par.getDepth();
 	if (depth != 0) {
@@ -1658,7 +1644,7 @@ int TextMetrics::leftMargin(int max_width,
 				int nestmargin = depth * nestMargin();
 				if (text_->isMainText())
 					nestmargin += changebarMargin();
-				l_margin = max(leftMargin(max_width, newpar), nestmargin);
+				l_margin = max(leftMargin(newpar), nestmargin);
 				// Remove the parindent that has been added
 				// if the paragraph was empty.
 				if (pars[newpar].empty() &&
@@ -1755,60 +1741,53 @@ int TextMetrics::leftMargin(int max_width,
 		// same time this function is used in redoParagraph to construct
 		// the rows.
 		ParagraphMetrics const & pm = par_metrics_[pit];
-		RowList::const_iterator rit = pm.rows().begin();
-		RowList::const_iterator end = pm.rows().end();
-		int minfill = max_width;
-		for ( ; rit != end; ++rit)
-			if (rit->fill() < minfill)
-				minfill = rit->fill();
+		int minfill = max_width_;
+		for (row : pm.rows())
+			if (row.fill() < minfill)
+				minfill = row.fill();
 		l_margin += bfm.signedWidth(layout.leftmargin);
 		l_margin += minfill;
 #endif
 		// also wrong, but much shorter.
-		l_margin += max_width / 2;
+		l_margin += max_width_ / 2;
 		break;
 	}
 	}
 
 	if (!par.params().leftIndent().zero())
-		l_margin += par.params().leftIndent().inPixels(max_width, lfm.em());
+		l_margin += par.params().leftIndent().inPixels(max_width_, lfm.em());
 
-	LyXAlignment align;
-
-	if (par.params().align() == LYX_ALIGN_LAYOUT)
-		align = layout.align;
-	else
-		align = par.params().align();
+	LyXAlignment align = par.getAlign(bv_->buffer().params());
 
 	// set the correct parindent
 	if (pos == 0
 	    && (layout.labeltype == LABEL_NO_LABEL
-		|| layout.labeltype == LABEL_ABOVE
-		|| layout.labeltype == LABEL_CENTERED
-		|| (layout.labeltype == LABEL_STATIC
-		    && layout.latextype == LATEX_ENVIRONMENT
-		    && !text_->isFirstInSequence(pit)))
+	        || layout.labeltype == LABEL_ABOVE
+	        || layout.labeltype == LABEL_CENTERED
+	        || (layout.labeltype == LABEL_STATIC
+	            && layout.latextype == LATEX_ENVIRONMENT
+	            && !text_->isFirstInSequence(pit)))
 	    && (align == LYX_ALIGN_BLOCK || align == LYX_ALIGN_LEFT)
 	    && !par.params().noindent()
 	    // in some insets, paragraphs are never indented
 	    && !text_->inset().neverIndent()
 	    // display style insets are always centered, omit indentation
 	    && !(!par.empty()
-		 && par.isInset(pos)
-		 && par.getInset(pos)->display())
+	         && par.isInset(pos)
+	         && par.getInset(pos)->display())
 	    && (!(tclass.isDefaultLayout(par.layout())
-		  || tclass.isPlainLayout(par.layout()))
+	        || tclass.isPlainLayout(par.layout()))
 	        || buffer.params().paragraph_separation
 				== BufferParams::ParagraphIndentSeparation)) {
-			// use the parindent of the layout when the
-			// default indentation is used otherwise use
-			// the indentation set in the document
-			// settings
-			if (buffer.params().getIndentation().asLyXCommand() == "default")
-				l_margin += bfm.signedWidth(parindent);
-			else
-				l_margin += buffer.params().getIndentation().inPixels(*bv_);
-		}
+		/* use the parindent of the layout when the default
+		 * indentation is used otherwise use the indentation set in
+		 * the document settings
+		 */
+		if (buffer.params().getParIndent().empty())
+			l_margin += bfm.signedWidth(parindent);
+		else
+			l_margin += buffer.params().getParIndent().inPixels(max_width_, bfm.em());
+	}
 
 	return l_margin;
 }
@@ -1822,17 +1801,15 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 	origin_.x_ = x;
 	origin_.y_ = y;
 
-	ParMetricsCache::iterator it = par_metrics_.begin();
-	ParMetricsCache::iterator const pm_end = par_metrics_.end();
-	y -= it->second.ascent();
-	for (; it != pm_end; ++it) {
-		ParagraphMetrics const & pmi = it->second;
-		y += pmi.ascent();
-		pit_type const pit = it->first;
+	y -= par_metrics_.begin()->second.ascent();
+	for (auto & pm_pair : par_metrics_) {
+		pit_type const pit = pm_pair.first;
+		ParagraphMetrics & pm = pm_pair.second;
+		y += pm.ascent();
 		// Save the paragraph position in the cache.
-		it->second.setPosition(y);
+		pm.setPosition(y);
 		drawParagraph(pi, pit, x, y);
-		y += pmi.descent();
+		y += pm.descent();
 	}
 }
 
@@ -1843,9 +1820,12 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 	if (pm.rows().empty())
 		return;
 	size_t const nrows = pm.rows().size();
+	// Remember left and right margin for drawing math numbers
+	Changer changeleft = make_change(pi.leftx, x + leftMargin(pit));
+	Changer changeright = make_change(pi.rightx, x + width() - rightMargin(pit));
 
-	// Use fast lane when drawing is disabled.
-	if (!pi.pain.isDrawingEnabled()) {
+	// Use fast lane in nodraw stage.
+	if (pi.pain.isNull()) {
 		for (size_t i = 0; i != nrows; ++i) {
 
 			Row const & row = pm.rows()[i];
@@ -1889,6 +1869,9 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 		}
 	}
 
+	if (text_->isRTL(pit))
+		swap(pi.leftx, pi.rightx);
+
 	for (size_t i = 0; i != nrows; ++i) {
 
 		Row const & row = pm.rows()[i];
@@ -1897,17 +1880,11 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 		if (i)
 			y += row.ascent();
 
-		RowPainter rp(pi, *text_, row, row_x, y);
-
 		// It is not needed to draw on screen if we are not inside.
 		bool const inside = (y + row.descent() >= 0
 			&& y - row.ascent() < ww);
-		pi.pain.setDrawingEnabled(inside);
 		if (!inside) {
-			// Paint only the insets to set inset cache correctly
-			// FIXME: remove paintOnlyInsets when we know that positions
-			// have already been set.
-			rp.paintOnlyInsets();
+			// Inset positions have already been set in nodraw stage.
 			y += row.descent();
 			continue;
 		}
@@ -1915,58 +1892,63 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 		if (selection)
 			row.setSelectionAndMargins(sel_beg_par, sel_end_par);
 		else
-			row.setSelection(-1, -1);
+			row.clearSelectionAndMargins();
 
 		// The row knows nothing about the paragraph, so we have to check
 		// whether this row is the first or last and update the margins.
 		if (row.selection()) {
 			if (row.sel_beg == 0)
-				row.begin_margin_sel = sel_beg.pit() < pit;
+				row.change(row.begin_margin_sel, sel_beg.pit() < pit);
 			if (row.sel_end == sel_end_par.lastpos())
-				row.end_margin_sel = sel_end.pit() > pit;
+				row.change(row.end_margin_sel, sel_end.pit() > pit);
 		}
 
-		// Row signature; has row changed since last paint?
-		row.setCrc(pm.computeRowSignature(row, *bv_));
-		bool row_has_changed = row.changed()
-			|| bv_->hadHorizScrollOffset(text_, pit, row.pos());
-
 		// Take this opportunity to spellcheck the row contents.
-		if (row_has_changed && pi.do_spellcheck && lyxrc.spellcheck_continuously) {
+		if (row.changed() && pi.do_spellcheck && lyxrc.spellcheck_continuously) {
 			text_->getPar(pit).spellCheck();
 		}
 
+		RowPainter rp(pi, *text_, row, row_x, y);
+
 		// Don't paint the row if a full repaint has not been requested
 		// and if it has not changed.
-		if (!pi.full_repaint && !row_has_changed) {
+		if (!pi.full_repaint && !row.changed()) {
 			// Paint only the insets if the text itself is
 			// unchanged.
 			rp.paintOnlyInsets();
+			row.changed(false);
 			y += row.descent();
 			continue;
 		}
 
 		// Clear background of this row if paragraph background was not
 		// already cleared because of a full repaint.
-		if (!pi.full_repaint && row_has_changed) {
+		if (!pi.full_repaint && row.changed()) {
 			LYXERR(Debug::PAINTING, "Clear rect@("
 			       << max(row_x, 0) << ", " << y - row.ascent() << ")="
 			       << width() << " x " << row.height());
-			pi.pain.fillRectangle(max(row_x, 0), y - row.ascent(),
-				width(), row.height(), pi.background_color);
+			// FIXME: this is a hack. We know that at least this
+			// amount of pixels can be cleared on right and left.
+			// Doing so gets rid of caret ghosts when the cursor is at
+			// the begining/end of row. However, it will not work if
+			// the caret has a ridiculous width like 6. (see ticket
+			// #10797)
+			pi.pain.fillRectangle(max(row_x, 0) - Inset::TEXT_TO_INSET_OFFSET,
+			                      y - row.ascent(),
+			                      width() + 2 * Inset::TEXT_TO_INSET_OFFSET,
+			                      row.height(), pi.background_color);
 		}
 
 		// Instrumentation for testing row cache (see also
 		// 12 lines lower):
 		if (lyxerr.debugging(Debug::PAINTING)
-			&& (row.selection() || pi.full_repaint || row_has_changed)) {
-				string const foreword = text_->isMainText() ?
-					"main text redraw " : "inset text redraw: ";
-			LYXERR(Debug::PAINTING, foreword << "pit=" << pit << " row=" << i
-				<< " row_selection="	<< row.selection()
-				<< " full_repaint="	<< pi.full_repaint
-				<< " row_has_changed="	<< row_has_changed
-				<< " drawingEnabled=" << pi.pain.isDrawingEnabled());
+		    && (row.selection() || pi.full_repaint || row.changed())) {
+			string const foreword = text_->isMainText() ? "main text redraw "
+				: "inset text redraw: ";
+			LYXERR0(foreword << "pit=" << pit << " row=" << i
+			        << (row.selection() ? " row_selection": "")
+			        << (pi.full_repaint ? " full_repaint" : "")
+			        << (row.changed() ? " row.changed" : ""));
 		}
 
 		// Backup full_repaint status and force full repaint
@@ -1977,26 +1959,36 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 		rp.paintSelection();
 		rp.paintAppendix();
 		rp.paintDepthBar();
-		rp.paintChangeBar();
-		bool const is_rtl = text_->isRTL(text_->getPar(pit));
-		if (i == 0 && !is_rtl)
+		if (row.needsChangeBar())
+			rp.paintChangeBar();
+		if (i == 0)
 			rp.paintFirst();
-		if (i == nrows - 1 && is_rtl)
+		if (i == nrows - 1)
 			rp.paintLast();
 		rp.paintText();
-		if (i == nrows - 1 && !is_rtl)
-			rp.paintLast();
-		if (i == 0 && is_rtl)
-			rp.paintFirst();
 		rp.paintTooLargeMarks(row_x + row.left_x() < 0,
 				      row_x + row.right_x() > bv_->workWidth());
 		y += row.descent();
 
+#if 0
+		// This debug code shows on screen which rows are repainted.
+		// FIXME: since the updates related to caret blinking restrict
+		// the painter to a small rectangle, the numbers are not
+		// updated when this happens. Change the code in
+		// GuiWorkArea::Private::show/hideCaret if this is important.
+		static int count = 0;
+		++count;
+		FontInfo fi(sane_font);
+		fi.setSize(TINY_SIZE);
+		fi.setColor(Color_red);
+		pi.pain.text(row_x, y, convert<docstring>(count), fi);
+#endif
+
 		// Restore full_repaint status.
 		pi.full_repaint = tmp;
+
+		row.changed(false);
 	}
-	// Re-enable screen drawing for future use of the painter.
-	pi.pain.setDrawingEnabled(true);
 
 	//LYXERR(Debug::PAINTING, ".");
 }
@@ -2018,7 +2010,7 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y,
 	row.pos(wordStart.pos());
 	row.endpos(bvcur.pos());
 	setRowHeight(row);
-	dim = row.dimension();
+	dim = row.dim();
 
 	// get position on screen of the word start and end
 	//FIXME: Is it necessary to explicitly set this to false?