X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=c7ccbac7fc2b9fea453c40c44f54d4ebb3a26e77;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=30263676010b51dfd1cdaa19465e4de3802f7ae7;hpb=fe8c3b4348b47099171957ea76daf9ccc019a5d1;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 3026367601..c7ccbac7fc 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -19,7 +19,6 @@
 
 #include "TextMetrics.h"
 
-#include "Bidi.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
@@ -27,35 +26,30 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "Encoding.h"
 #include "HSpace.h"
 #include "InsetList.h"
+#include "Language.h"
 #include "Layout.h"
-#include "Length.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "ParagraphParameters.h"
-#include "ParIterator.h"
-#include "rowpainter.h"
+#include "RowPainter.h"
 #include "Text.h"
 #include "TextClass.h"
 #include "VSpace.h"
-#include "WordLangTuple.h"
 
 #include "insets/InsetText.h"
 
-#include "mathed/MacroTable.h"
 #include "mathed/MathMacroTemplate.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include "support/debug.h"
-#include "support/docstring_list.h"
-#include "support/gettext.h"
 #include "support/lassert.h"
 
-#include <cstdlib>
+#include <stdlib.h>
+#include <cmath>
 
 using namespace std;
 
@@ -64,20 +58,10 @@ namespace lyx {
 
 using frontend::FontMetrics;
 
-static int numberOfSeparators(Paragraph const & par, Row const & row)
-{
-	pos_type const first = max(row.pos(), par.beginOfBody());
-	pos_type const last = row.endpos() - 1;
-	int n = 0;
-	for (pos_type p = first; p < last; ++p) {
-		if (par.isSeparator(p))
-			++n;
-	}
-	return n;
-}
+namespace {
 
 
-static int numberOfLabelHfills(Paragraph const & par, Row const & row)
+int numberOfLabelHfills(Paragraph const & par, Row const & row)
 {
 	pos_type last = row.endpos() - 1;
 	pos_type first = row.pos();
@@ -97,29 +81,25 @@ static int numberOfLabelHfills(Paragraph const & par, Row const & row)
 	return n;
 }
 
-
-static int numberOfHfills(Paragraph const & par, Row const & row)
+// FIXME: this needs to be rewritten, probably by merging it into some
+// code that, besides counting, sets the active status of the space
+// inset in the row element.
+int numberOfHfills(Row const & row, ParagraphMetrics const & pm,
+                   pos_type const body_pos)
 {
-	pos_type const last = row.endpos();
-	pos_type first = row.pos();
-
-	// hfill *DO* count at the beginning of paragraphs!
-	if (first) {
-		while (first < last && par.isHfill(first))
-			++first;
-	}
-
-	first = max(first, par.beginOfBody());
-
 	int n = 0;
-	for (pos_type p = first; p < last; ++p) {
-		if (par.isHfill(p))
+	Row::const_iterator cit = row.begin();
+	Row::const_iterator const end = row.end();
+	for ( ; cit != end ; ++cit)
+		if (cit->pos >= body_pos
+		    && cit->inset && pm.hfillExpansion(row, cit->pos))
 			++n;
-	}
 	return n;
 }
 
 
+}
+
 /////////////////////////////////////////////////////////////////////
 //
 // TextMetrics
@@ -221,13 +201,13 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 
 int TextMetrics::rightMargin(ParagraphMetrics const & pm) const
 {
-	return main_text_? pm.rightMargin(*bv_) : 0;
+	return text_->isMainText() ? pm.rightMargin(*bv_) : 0;
 }
 
 
 int TextMetrics::rightMargin(pit_type const pit) const
 {
-	return main_text_? par_metrics_[pit].rightMargin(*bv_) : 0;
+	return text_->isMainText() ? par_metrics_[pit].rightMargin(*bv_) : 0;
 }
 
 
@@ -293,7 +273,7 @@ Font TextMetrics::displayFont(pit_type pit, pos_type pos) const
 
 bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const
 {
-	if (!lyxrc.rtl_support || !sl.text())
+	if (!sl.text())
 		return false;
 
 	int correction = 0;
@@ -307,7 +287,7 @@ bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const
 bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 {
 	// no RTL boundary at paragraph start
-	if (!lyxrc.rtl_support || pos == 0)
+	if (pos == 0)
 		return false;
 
 	Font const & left_font = displayFont(pit, pos - 1);
@@ -322,9 +302,8 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
 		Font const & font) const
 {
-	if (!lyxrc.rtl_support
-	    // no RTL boundary at paragraph start
-	    || pos == 0
+	if (// no RTL boundary at paragraph start
+	    pos == 0
 	    // if the metrics have not been calculated, then we are not
 	    // on screen and can safely ignore issues about boundaries.
 	    || !contains(pit))
@@ -349,6 +328,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
 	// FED                          FED|                     FED     )
 	if (startpos == pos && endpos == pos && endpos != par.size()
 		&& (par.isNewline(pos - 1)
+			|| par.isEnvSeparator(pos - 1)
 			|| par.isLineSeparator(pos - 1)
 			|| par.isSeparator(pos - 1)))
 		return false;
@@ -374,7 +354,6 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	pm.reset(par);
 
 	Buffer & buffer = bv_->buffer();
-	main_text_ = (text_ == &buffer.text());
 	bool changed = false;
 
 	// Check whether there are InsetBibItems that need fixing
@@ -388,7 +367,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		Cursor & cur = const_cast<Cursor &>(bv_->cursor());
 		// In some cases, we do not know how to record undo
 		if (&cur.inset() == &text_->inset())
-			cur.recordUndo(ATOMIC_UNDO, pit, pit);
+			cur.recordUndo(pit, pit);
 
 		int const moveCursor = par.fixBiblio(buffer);
 
@@ -424,6 +403,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 
 	// redo insets
 	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) {
@@ -449,9 +429,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		MacroContext mc(&buffer, parPos);
 		MetricsInfo mi(bv_, font.fontInfo(), w, mc);
 		ii->inset->metrics(mi, dim);
-		Dimension const old_dim = pm.insetDimension(ii->inset);
-		if (old_dim != dim) {
-			pm.setInsetDimension(ii->inset, dim);
+		if (!insetCache.has(ii->inset) || insetCache.dim(ii->inset) != dim) {
+			insetCache.add(ii->inset, dim);
 			changed = true;
 		}
 	}
@@ -459,55 +438,71 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	par.setBeginOfBody();
 	pos_type first = 0;
 	size_t row_index = 0;
+	bool need_new_row = false;
 	// maximum pixel width of a row
-	int width = max_width_ - right_margin; // - leftMargin(max_width_, pit, row);
 	do {
-		Dimension dim;
-		pos_type end = rowBreakPoint(width, pit, first);
-		if (row_index || end < par.size())
-			// If there is more than one row, expand the text to
-			// the full allowable width. This setting here is needed
-			// for the computeRowMetrics() below.
-			dim_.wid = max_width_;
-
-		dim = rowHeight(pit, first, end);
-		dim.wid = rowWidth(right_margin, pit, first, end);
 		if (row_index == pm.rows().size())
 			pm.rows().push_back(Row());
 		Row & row = pm.rows()[row_index];
-		row.setChanged(false);
+		row.pit(pit);
 		row.pos(first);
-		row.endpos(end);
-		row.setDimension(dim);
-		int const max_row_width = max(dim_.wid, dim.wid);
-		computeRowMetrics(pit, row, max_row_width);
-		first = end;
+		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)) {
+			/* 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).
+			 */
+			if (dim_.wid < max_width_)
+				dim_.wid = max_width_;
+		}
+		int const max_row_width = max(dim_.wid, row.width());
+		computeRowMetrics(row, max_row_width);
+		first = row.endpos();
 		++row_index;
 
-		pm.dim().wid = max(pm.dim().wid, dim.wid);
-		pm.dim().des += dim.height();
-	} while (first < par.size());
+		pm.dim().wid = max(pm.dim().wid, row.width());
+		pm.dim().des += row.height();
+	} while (first < par.size() || need_new_row);
 
 	if (row_index < pm.rows().size())
 		pm.rows().resize(row_index);
 
-	// Make sure that if a par ends in newline, there is one more row
-	// under it
-	if (first > 0 && par.isNewline(first - 1)) {
-		Dimension dim = rowHeight(pit, first, first);
-		dim.wid = rowWidth(right_margin, pit, first, first);
-		if (row_index == pm.rows().size())
-			pm.rows().push_back(Row());
-		Row & row = pm.rows()[row_index];
-		row.setChanged(false);
-		row.pos(first);
-		row.endpos(first);
-		row.setDimension(dim);
-		int const max_row_width = max(dim_.wid, dim.wid);
-		computeRowMetrics(pit, row, max_row_width);
-		pm.dim().des += dim.height();
+	// FIXME: It might be better to move this in another method
+	// specially tailored for the main text.
+	// Top and bottom margin of the document (only at top-level)
+	if (text_->isMainText()) {
+		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.dim().des += 20;
+		}
+		ParagraphList const & pars = text_->paragraphs();
+		if (pit + 1 == pit_type(pars.size())) {
+			pm.rows().back().dimension().des += 20;
+			pm.dim().des += 20;
+		}
 	}
 
+	// The space above and below the paragraph.
+	int const top = parTopSpacing(pit);
+	pm.rows().front().dimension().asc += top;
+	int const bottom = parBottomSpacing(pit);
+	pm.rows().back().dimension().des += bottom;
+	pm.dim().des += top + bottom;
+
 	pm.dim().asc += pm.rows()[0].ascent();
 	pm.dim().des -= pm.rows()[0].ascent();
 
@@ -517,35 +512,90 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 }
 
 
-void TextMetrics::computeRowMetrics(pit_type const pit,
-		Row & row, int width) const
+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();
+
+	// handle alignment inside tabular cells
+	Inset const & owner = text_->inset();
+	bool forced_block = false;
+	switch (owner.contentAlignment()) {
+	case LYX_ALIGN_BLOCK:
+		// In general block align is the default state, but here it is
+		// an explicit choice. Therefore it should not be overridden
+		// later.
+		forced_block = true;
+		// fall through
+	case LYX_ALIGN_CENTER:
+	case LYX_ALIGN_LEFT:
+	case LYX_ALIGN_RIGHT:
+		if (align == LYX_ALIGN_NONE || align == LYX_ALIGN_BLOCK)
+			align = owner.contentAlignment();
+		break;
+	default:
+		// unchanged (use align)
+		break;
+	}
+
+	// Display-style insets should always be on a centered row
+	if (Inset const * inset = par.getInset(row.pos())) {
+		switch (inset->display()) {
+		case Inset::AlignLeft:
+			align = LYX_ALIGN_BLOCK;
+			break;
+		case Inset::AlignCenter:
+			align = LYX_ALIGN_CENTER;
+			break;
+		case Inset::Inline:
+			// unchanged (use align)
+			break;
+		case Inset::AlignRight:
+			align = LYX_ALIGN_RIGHT;
+			break;
+		}
+	}
+
+	if (align == LYX_ALIGN_BLOCK) {
+		// If this row has been broken abruptly by a display inset, or
+		// it is the end of the paragraph, or the user requested we
+		// 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)
+		    || !bv_->buffer().params().justification)
+			align = text_->isRTL(par) ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT;
+	}
+
+	return align;
+}
+
+
+void TextMetrics::computeRowMetrics(Row & row, int width) const
 {
 	row.label_hfill = 0;
 	row.separator = 0;
 
-	Paragraph const & par = text_->getPar(pit);
+	Paragraph const & par = text_->getPar(row.pit());
 
-	double w = width - row.width();
+	int const w = width - row.right_margin - row.width();
 	// FIXME: put back this assertion when the crash on new doc is solved.
 	//LASSERT(w >= 0, /**/);
 
-	//lyxerr << "\ndim_.wid " << dim_.wid << endl;
-	//lyxerr << "row.width() " << row.width() << endl;
-	//lyxerr << "w " << w << endl;
-
-	bool const is_rtl = text_->isRTL(par);
-	if (is_rtl)
-		row.x = rightMargin(pit);
-	else
-		row.x = leftMargin(max_width_, pit, row.pos());
-
 	// is there a manual margin with a manual label
 	Layout const & layout = par.layout();
 
+	int nlh = 0;
 	if (layout.margintype == MARGIN_MANUAL
 	    && layout.labeltype == LABEL_MANUAL) {
 		/// We might have real hfills in the label part
-		int nlh = numberOfLabelHfills(par, row);
+		nlh = numberOfLabelHfills(par, row);
 
 		// A manual label par (e.g. List) has an auto-hfill
 		// between the label text and the body of the
@@ -556,156 +606,101 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			++nlh;
 
 		if (nlh && !par.getLabelWidthString().empty())
-			row.label_hfill = labelFill(pit, row) / double(nlh);
+			row.label_hfill = labelFill(row) / double(nlh);
 	}
 
-	double hfill = 0;
 	// are there any hfills in the row?
-	if (int const nh = numberOfHfills(par, row)) {
-		if (w > 0)
-			hfill = w / double(nh);
-	// we don't have to look at the alignment if it is ALIGN_LEFT and
-	// if the row is already larger then the permitted width as then
-	// we force the LEFT_ALIGN'edness!
-	} else if (int(row.width()) < max_width_) {
-		// is it block, flushleft or flushright?
-		// set x how you need it
-		int align;
-		if (par.params().align() == LYX_ALIGN_LAYOUT)
-			align = layout.align;
-		else
-			align = par.params().align();
-
-		// handle alignment inside tabular cells
-		Inset const & owner = text_->inset();
-		switch (owner.contentAlignment()) {
-			case LYX_ALIGN_CENTER:
-			case LYX_ALIGN_LEFT:
-			case LYX_ALIGN_RIGHT:
-				if (align == LYX_ALIGN_NONE
-				    || align == LYX_ALIGN_BLOCK)
-					align = owner.contentAlignment();
-				break;
-			default:
-				// unchanged (use align)
-				break;
-		}
-
-		// Display-style insets should always be on a centered row
-		if (Inset const * inset = par.getInset(row.pos())) {
-			switch (inset->display()) {
-				case Inset::AlignLeft:
-					align = LYX_ALIGN_BLOCK;
-					break;
-				case Inset::AlignCenter:
-					align = LYX_ALIGN_CENTER;
-					break;
-				case Inset::Inline:
-					// unchanged (use align)
-					break;
-				case Inset::AlignRight:
-					align = LYX_ALIGN_RIGHT;
-					break;
-			}
-		}
-
-		// Has the user requested we not justify stuff?
-		if (!bv_->buffer().params().justification
-		    && align == LYX_ALIGN_BLOCK)
-			align = LYX_ALIGN_LEFT;
+	ParagraphMetrics & pm = par_metrics_[row.pit()];
+	int nh = numberOfHfills(row, pm, par.beginOfBody());
+	int hfill = 0;
+	int hfill_rem = 0;
+
+	// We don't have to look at the alignment if the row is already
+	// larger then the permitted width as then we force the
+	// LEFT_ALIGN'edness!
+	if (int(row.width()) >= max_width_)
+		return;
 
-		switch (align) {
+	if (nh == 0) {
+		// Common case : there is no hfill, and the alignment will be
+		// meaningful
+		switch (getAlign(par, row)) {
 		case LYX_ALIGN_BLOCK: {
-			int const ns = numberOfSeparators(par, row);
-			bool disp_inset = false;
-			if (row.endpos() < par.size()) {
-				Inset const * in = par.getInset(row.endpos());
-				if (in)
-					disp_inset = in->display();
-			}
-			// If we have separators, this is not the last row of a
-			// par, does not end in newline, and is not row above a
-			// display inset... then stretch it
-			if (ns
-			    && row.endpos() < par.size()
-			    && !par.isNewline(row.endpos() - 1)
-			    && !disp_inset
-				) {
-				row.separator = w / ns;
-				//lyxerr << "row.separator " << row.separator << endl;
-				//lyxerr << "ns " << ns << endl;
-			} else if (is_rtl) {
-				row.x += w;
+			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)) {
+				row.left_margin += w;
+				row.dimension().wid += w;
 			}
 			break;
 		}
 		case LYX_ALIGN_RIGHT:
-			row.x += w;
+			row.left_margin += w;
+			row.dimension().wid += w;
 			break;
 		case LYX_ALIGN_CENTER:
-			row.x += w / 2;
+			row.dimension().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:
+		case LYX_ALIGN_DECIMAL:
 			break;
 		}
+		return;
 	}
 
-	if (is_rtl) {
-		pos_type body_pos = par.beginOfBody();
-		pos_type end = row.endpos();
-
-		if (body_pos > 0
-		    && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
-		{
-			row.x += theFontMetrics(text_->labelFont(par)).
-				width(layout.labelsep);
-			if (body_pos <= end)
-				row.x += row.label_hfill;
-		}
-	}
-
+	hfill = w / nh;
+	hfill_rem = w % nh;
+	row.dimension().wid += w;
+	// Set size of hfill insets
 	pos_type const endpos = row.endpos();
 	pos_type body_pos = par.beginOfBody();
 	if (body_pos > 0
-		&& (body_pos > endpos || !par.isLineSeparator(body_pos - 1)))
+	    && (body_pos > endpos || !par.isLineSeparator(body_pos - 1)))
 		body_pos = 0;
 
-	ParagraphMetrics & pm = par_metrics_[pit];
-	InsetList::const_iterator ii = par.insetList().begin();
-	InsetList::const_iterator iend = par.insetList().end();
-	for ( ; ii != iend; ++ii) {
-		if (ii->pos >= endpos || ii->pos < row.pos()
-			|| (ii->inset->lyxCode() != SPACE_CODE ||
-			    !ii->inset->isStretchableSpace()))
-			continue;
-		Dimension dim = row.dimension();
-		if (pm.hfillExpansion(row, ii->pos))
-			dim.wid = int(ii->pos >= body_pos ?
-				max(hfill, 5.0) : row.label_hfill);
-		else
-			dim.wid = 5;
-		// Cache the inset dimension.
-		bv_->coordCache().insets().add(ii->inset, dim);
-		pm.setInsetDimension(ii->inset, dim);
+	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;
+				--nh;
+				if (nh == 0)
+					cit->dim.wid += hfill_rem;
+			} else
+				cit->dim.wid += int(row.label_hfill);
+			// Cache the inset dimension.
+			insetCache.add(cit->inset, cit->dim);
+		}
 	}
 }
 
 
-int TextMetrics::labelFill(pit_type const pit, Row const & row) const
+int TextMetrics::labelFill(Row const & row) const
 {
-	Paragraph const & par = text_->getPar(pit);
-
-	pos_type last = par.beginOfBody();
-	LBUFERR(last > 0);
-
-	// -1 because a label ends with a space that is in the label
-	--last;
-
-	// a separator at this end does not count
-	if (par.isLineSeparator(last))
-		--last;
+	Paragraph const & par = text_->getPar(row.pit());
+	LBUFERR(par.beginOfBody() > 0 || par.isEnvSeparator(0));
 
 	int w = 0;
-	for (pos_type i = row.pos(); i <= last; ++i)
-		w += singleWidth(pit, i);
+	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;
+	}
 
 	docstring const & label = par.params().labelWidthString();
 	if (label.empty())
@@ -719,7 +714,7 @@ int TextMetrics::labelFill(pit_type const pit, Row const & row) const
 
 
 #if 0
-// Not used, see TextMetrics::rowBreakPoint.
+// Not used, see TextMetrics::breakRow
 // this needs special handling - only newlines count as a break point
 static pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 {
@@ -801,16 +796,34 @@ private:
 
 } // anon namespace
 
-pos_type TextMetrics::rowBreakPoint(int const width, pit_type const pit,
-		pos_type const pos) const
+/** 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::shortenIfNeeded.
+ */
+bool TextMetrics::breakRow(Row & row, int const right_margin) const
 {
-	Paragraph const & par = text_->getPar(pit);
+	Paragraph const & par = text_->getPar(row.pit());
 	pos_type const end = par.size();
-	if (pos == end || width < 0)
-		return end;
+	pos_type const pos = row.pos();
+	pos_type const body_pos = par.beginOfBody();
+	bool const is_rtl = text_->isRTL(par);
+	bool need_new_row = false;
 
-	ParagraphMetrics const & pm = par_metrics_[pit];
-	ParagraphList const & pars = text_->paragraphs();
+	row.clear();
+	row.left_margin = leftMargin(max_width_, 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;
+	// 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
@@ -820,514 +833,324 @@ pos_type TextMetrics::rowBreakPoint(int const width, pit_type const pit,
 		return addressBreakPoint(pos, par);
 #endif
 
-
 	// check for possible inline completion
-	DocIterator const & inlineCompletionPos = bv_->inlineCompletionPos();
-	pos_type inlineCompletionLPos = -1;
-	if (inlineCompletionPos.inTexted()
-	    && inlineCompletionPos.text() == text_
-	    && inlineCompletionPos.pit() == pit) {
-		// draw logically behind the previous character
-		inlineCompletionLPos = inlineCompletionPos.pos() - 1;
-	}
-
-	int const left = leftMargin(max_width_, pit, pos);
-	pos_type const body_pos = par.beginOfBody();
-	int x = left;
-	pos_type point = end;
-
-	FontIterator fi = FontIterator(*this, par, pit, pos);
-	// Accumulator for character strings
-	docstring chunkstr;
-	Font chunkfont = *fi;
+	DocIterator const & ic_it = bv_->inlineCompletionPos();
+	pos_type ic_pos = -1;
+	if (ic_it.inTexted() && ic_it.text() == text_ && ic_it.pit() == row.pit())
+		ic_pos = ic_it.pos();
 
 	// Now we iterate through until we reach the right margin
-	// or the end of the par, then choose the possible break
-	// nearest that.
-
+	// or the end of the par, then build a representation of the row.
 	pos_type i = pos;
-	for ( ; i < end; ++i, ++fi) {
-		// Add the chunk width when it is finished
-		if (par.isInset(i) || *fi != chunkfont
-		    || (body_pos && i == body_pos)) {
-			x += theFontMetrics(chunkfont).width(chunkstr);
-			chunkstr.clear();
-			chunkfont = *fi;
-		}
-
+	FontIterator fi = FontIterator(*this, par, row.pit(), pos);
+	do {
+		// this can happen for an empty row after a newline
+		if (i >= end)
+			break;
 		char_type c = par.getChar(i);
-		Language const * language = fi->language();
 		// The most special cases are handled first.
 		if (par.isInset(i)) {
-			x += pm.insetDimension(par.getInset(i)).wid;
+			Inset const * ins = par.getInset(i);
+			Dimension dim = bv_->coordCache().insets().dim(ins);
+			row.add(i, ins, dim, *fi, par.lookupChange(i));
+		} else if (c == ' ' && i + 1 == body_pos) {
+			// There is a space at i, but it should not be
+			// added as a separator, because it is just
+			// before body_pos. Instead, insert some spacing to
+			// align text
+			FontMetrics const & fm = theFontMetrics(text_->labelFont(par));
+			// this is needed to make sure that the row width is correct
+			row.finalizeLast();
+			int const add = max(fm.width(par.layout().labelsep),
+			                    labelEnd(row.pit()) - row.width());
+			row.addSpace(i, add, *fi, par.lookupChange(i));
 		} else if (c == '\t')
-			chunkstr += "    ";
-		else if (language->rightToLeft()) {
-			if (language->lang() == "arabic_arabtex" ||
-			    language->lang() == "arabic_arabi" ||
-			    language->lang() == "farsi") {
-				if (!Encodings::isArabicComposeChar(c))
-					chunkstr += par.transformChar(c, i);
-			} else if (language->lang() == "hebrew" &&
-				   !Encodings::isHebrewComposeChar(c)) {
-				chunkstr+= c;
+			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
-			chunkstr += c;
-
-		if (lyxrc.paragraph_markers
-		    && i == end - 1 && size_type(pit + 1) < pars.size())
-			// enlarge the last character to hold the end-of-par marker
-			chunkstr += char_type(0x00B6);
+			row.add(i, c, *fi, par.lookupChange(i));
+		}
 
 		// add inline completion width
-		if (inlineCompletionLPos == i)
-			chunkstr += bv_->inlineCompletion();
-
-		// add the auto-hfill from label end to the body
-		if (body_pos && i == body_pos) {
-			FontMetrics const & fm = theFontMetrics(
-				text_->labelFont(par));
-			int add = fm.width(par.layout().labelsep);
-			//if (par.isLineSeparator(i - 1))
-			//	add -= singleWidth(pit, i - 1);
-
-			add = max(add, labelEnd(pit) - x);
-			x += add;
+		// draw logically behind the previous character
+		if (ic_pos == i + 1 && !bv_->inlineCompletion().empty()) {
+			docstring const comp = bv_->inlineCompletion();
+			size_t const uniqueTo =bv_->inlineCompletionUniqueChars();
+			Font f = *fi;
+
+			if (uniqueTo > 0) {
+				f.fontInfo().setColor(Color_inlinecompletion);
+				row.addVirtual(i + 1, comp.substr(0, uniqueTo), f, Change());
+			}
+			f.fontInfo().setColor(Color_nonunique_inlinecompletion);
+			row.addVirtual(i + 1, comp.substr(uniqueTo), f, Change());
 		}
 
-		if (par.isNewline(i)) {
-			point = i + 1;
-			break;
-		}
+		// Handle some situations that abruptly terminate the row
+		// - A newline inset
+		// - Before a display inset
+		// - After a display inset
 		Inset const * inset = 0;
-		// Break before...
-		if (i + 1 < end) {
-			if ((inset = par.getInset(i + 1)) && inset->display()) {
-				point = i + 1;
-				break;
-			}
-			// ...and after.
-			if ((inset = par.getInset(i)) && inset->display()) {
-				point = i + 1;
-				break;
-			}
+		if (par.isNewline(i) || par.isEnvSeparator(i)
+		    || (i + 1 < end && (inset = par.getInset(i + 1))
+			&& inset->display())
+		    || (!row.empty() && row.back().inset
+			&& row.back().inset->display())) {
+			row.right_boundary(true);
+			need_new_row = par.isNewline(i);
+			++i;
+			break;
 		}
 
-		if (par.isLineSeparator(i)) {
-			x += theFontMetrics(chunkfont).width(chunkstr);
-			chunkstr.clear();
-			chunkfont = *fi;
-			if (x >= width) {
-				// exit on last registered breakpoint:
-				break;
-			}
-			// register breakpoint:
-			point = i + 1;
-		}
-	}
+		++i;
+		++fi;
+	} while (i < end && row.width() <= width);
+	row.finalizeLast();
+	row.endpos(i);
 
-	if (i == end) {
-		x += theFontMetrics(chunkfont).width(chunkstr);
-		// maybe found one, but the par is short enough.
-		if (x < width)
-			point = end;
+	// End of paragraph marker
+	ParagraphList const & pars = text_->paragraphs();
+	if (lyxrc.paragraph_markers && !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
+		// in the paragraph.
+		Font f(text_->layoutFont(row.pit()));
+		f.fontInfo().setColor(Color_paragraphmarker);
+		BufferParams const & bparams
+			= text_->inset().buffer().params();
+		f.setLanguage(par.getParLanguage(bparams));
+		row.addVirtual(end, docstring(1, char_type(0x00B6)), f, Change());
 	}
 
-	// manual labels cannot be broken in LaTeX. But we
-	// want to make our on-screen rendering of footnotes
-	// etc. still break
-	if (body_pos && point < body_pos)
-		point = body_pos;
+	// 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());
 
-	return point;
-}
+	// make sure that the RTL elements are in reverse ordering
+	row.reverseRTL(is_rtl);
+	//LYXERR0("breakrow: row is " << row);
 
+	return need_new_row;
+}
 
-int TextMetrics::rowWidth(int right_margin, pit_type const pit,
-		pos_type const first, pos_type const end) const
+int TextMetrics::parTopSpacing(pit_type const pit) const
 {
-	// get the pure distance
-	ParagraphMetrics const & pm = par_metrics_[pit];
 	Paragraph const & par = text_->getPar(pit);
-	int w = leftMargin(max_width_, pit, first);
-	int label_end = labelEnd(pit);
-
-	// check for possible inline completion
-	DocIterator const & inlineCompletionPos = bv_->inlineCompletionPos();
-	pos_type inlineCompletionLPos = -1;
-	if (inlineCompletionPos.inTexted()
-	    && inlineCompletionPos.text() == text_
-	    && inlineCompletionPos.pit() == pit) {
-		// draw logically behind the previous character
-		inlineCompletionLPos = inlineCompletionPos.pos() - 1;
-	}
+	Layout const & layout = par.layout();
 
-	pos_type const body_pos = par.beginOfBody();
-	pos_type i = first;
-
-	if (i < end) {
-		FontIterator fi = FontIterator(*this, par, pit, i);
-		for ( ; i < end; ++i, ++fi) {
-			if (body_pos > 0 && i == body_pos) {
-				FontMetrics const & fm = theFontMetrics(
-					text_->labelFont(par));
-				w += fm.width(par.layout().labelsep);
-				if (par.isLineSeparator(i - 1))
-					w -= singleWidth(pit, i - 1);
-				w = max(w, label_end);
-			}
+	int asc = 0;
+	ParagraphList const & pars = text_->paragraphs();
+	double const dh = defaultRowHeight();
 
-			// a line separator at the end of a line (but not at the end of a
-			// paragraph) will not be drawn and should therefore not count for
-			// the row width.
-			if (!par.isLineSeparator(i) || i != end - 1 || end == par.size())
-				w += pm.singleWidth(i, *fi);
-
-			// add inline completion width
-			if (inlineCompletionLPos == i) {
-				docstring const & completion = bv_->inlineCompletion();
-				if (completion.length() > 0)
-					w += theFontMetrics(*fi).width(completion);
-			}
-		}
+	BufferParams const & bparams = bv_->buffer().params();
+	Inset const & inset = text_->inset();
+	// some parskips VERY EASY IMPLEMENTATION
+	if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
+		&& !inset.getLayout().parbreakIsNewline()
+		&& !par.layout().parbreak_is_newline
+		&& pit > 0
+		&& ((layout.isParagraph() && par.getDepth() == 0)
+		    || (pars[pit - 1].layout().isParagraph()
+		        && pars[pit - 1].getDepth() == 0))) {
+		asc += bparams.getDefSkip().inPixels(*bv_);
 	}
 
-	// count the paragraph end marker.
-	if (end == par.size() && lyxrc.paragraph_markers) {
-		ParagraphList const & pars_ = text_->paragraphs();
-		if (size_type(pit + 1) < pars_.size()) {
-			// enlarge the last character to hold the
-			// end-of-par marker
-			docstring const s(1, char_type(0x00B6));
-			Font f;
-			w += theFontMetrics(f).width(s);
-		}
+	if (par.params().startOfAppendix())
+		asc += int(3 * dh);
+
+	// special code for the top label
+	if (layout.labelIsAbove()
+	    && (!layout.isParagraphGroup() || text_->isFirstInSequence(pit))
+	    && !par.labelString().empty()) {
+		FontInfo labelfont = text_->labelFont(par);
+		FontMetrics const & lfm = theFontMetrics(labelfont);
+		asc += int(lfm.maxHeight() * layout.spacing.getValue()
+		                           * text_->spacing(par)
+		           + (layout.topsep + layout.labelbottomsep) * dh);
 	}
 
-	if (body_pos > 0 && body_pos >= end) {
-		FontMetrics const & fm = theFontMetrics(
-			text_->labelFont(par));
-		w += fm.width(par.layout().labelsep);
-		if (end > 0 && par.isLineSeparator(end - 1))
-			w -= singleWidth(pit, end - 1);
-		w = max(w, label_end);
+	// Add the layout spaces, for example before and after
+	// a section, or between the items of a itemize or enumerate
+	// environment.
+
+	pit_type prev = text_->depthHook(pit, par.getDepth());
+	Paragraph const & prevpar = pars[prev];
+	double layoutasc = 0;
+	if (prev != pit
+	    && prevpar.layout() == layout
+	    && prevpar.getDepth() == par.getDepth()
+	    && prevpar.getLabelWidthString() == par.getLabelWidthString()) {
+		layoutasc = layout.itemsep * dh;
+	} else if (pit != 0 && layout.topsep > 0)
+		layoutasc = layout.topsep * dh;
+
+	asc += int(layoutasc * 2 / (2 + pars[pit].getDepth()));
+
+	prev = text_->outerHook(pit);
+	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)
+			asc += int(layout.parsep * dh);
 	}
 
-	return w + right_margin;
+	return asc;
 }
 
 
-Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
-		pos_type const end, bool topBottomSpace) const
+int TextMetrics::parBottomSpacing(pit_type const pit) const
 {
-	Paragraph const & par = text_->getPar(pit);
-	// get the maximum ascent and the maximum descent
-	double layoutasc = 0;
 	double layoutdesc = 0;
+	ParagraphList const & pars = text_->paragraphs();
 	double const dh = defaultRowHeight();
 
-	// ok, let us initialize the maxasc and maxdesc value.
-	// Only the fontsize count. The other properties
-	// are taken from the layoutfont. Nicer on the screen :)
-	Layout const & layout = par.layout();
-
-	// as max get the first character of this row then it can
-	// increase but not decrease the height. Just some point to
-	// start with so we don't have to do the assignment below too
-	// often.
-	Buffer const & buffer = bv_->buffer();
-	Font font = displayFont(pit, first);
-	FontSize const tmpsize = font.fontInfo().size();
-	font.fontInfo() = text_->layoutFont(pit);
-	FontSize const size = font.fontInfo().size();
-	font.fontInfo().setSize(tmpsize);
-
-	FontInfo labelfont = text_->labelFont(par);
-
-	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
-	FontMetrics const & fontmetrics = theFontMetrics(font);
-
-	// these are minimum values
-	double const spacing_val = layout.spacing.getValue()
-		* text_->spacing(par);
-	//lyxerr << "spacing_val = " << spacing_val << endl;
-	int maxasc  = int(fontmetrics.maxAscent()  * spacing_val);
-	int maxdesc = int(fontmetrics.maxDescent() * spacing_val);
-
-	// insets may be taller
-	ParagraphMetrics const & pm = par_metrics_[pit];
-	InsetList::const_iterator ii = par.insetList().begin();
-	InsetList::const_iterator iend = par.insetList().end();
-	for ( ; ii != iend; ++ii) {
-		if (ii->pos >= first && ii->pos < end) {
-			Dimension const & dim = pm.insetDimension(ii->inset);
-			maxasc  = max(maxasc,  dim.ascent());
-			maxdesc = max(maxdesc, dim.descent());
+	// add the layout spaces, for example before and after
+	// a section, or between the items of a itemize or enumerate
+	// environment
+	pit_type nextpit = pit + 1;
+	if (nextpit != pit_type(pars.size())) {
+		pit_type cpit = pit;
+
+		if (pars[cpit].getDepth() > pars[nextpit].getDepth()) {
+			double usual = pars[cpit].layout().bottomsep * dh;
+			double unusual = 0;
+			cpit = text_->depthHook(cpit, pars[nextpit].getDepth());
+			if (pars[cpit].layout() != pars[nextpit].layout()
+				|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
+				unusual = pars[cpit].layout().bottomsep * dh;
+			layoutdesc = max(unusual, usual);
+		} else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) {
+			if (pars[cpit].layout() != pars[nextpit].layout()
+				|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
+				layoutdesc = int(pars[cpit].layout().bottomsep * dh);
 		}
 	}
 
-	// Check if any custom fonts are larger (Asger)
-	// This is not completely correct, but we can live with the small,
-	// cosmetic error for now.
-	int labeladdon = 0;
-
-	FontSize maxsize =
-		par.highestFontInRange(first, end, size);
-	if (maxsize > font.fontInfo().size()) {
-		// use standard paragraph font with the maximal size
-		FontInfo maxfont = font.fontInfo();
-		maxfont.setSize(maxsize);
-		FontMetrics const & maxfontmetrics = theFontMetrics(maxfont);
-		maxasc  = max(maxasc,  maxfontmetrics.maxAscent());
-		maxdesc = max(maxdesc, maxfontmetrics.maxDescent());
-	}
-
-	// This is nicer with box insets:
-	++maxasc;
-	++maxdesc;
-
-	ParagraphList const & pars = text_->paragraphs();
-	Inset const & inset = text_->inset();
-
-	// is it a top line?
-	if (first == 0 && topBottomSpace) {
-		BufferParams const & bufparams = buffer.params();
-		// some parskips VERY EASY IMPLEMENTATION
-		if (bufparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
-		    && !inset.getLayout().parbreakIsNewline()
-		    && !par.layout().parbreak_is_newline
-		    && pit > 0
-		    && ((layout.isParagraph() && par.getDepth() == 0)
-			|| (pars[pit - 1].layout().isParagraph()
-			    && pars[pit - 1].getDepth() == 0))) {
-			maxasc += bufparams.getDefSkip().inPixels(*bv_);
-		}
-
-		if (par.params().startOfAppendix())
-			maxasc += int(3 * dh);
-
-		// special code for the top label
-		if (layout.labelIsAbove()
-		    && (!layout.isParagraphGroup() || text_->isFirstInSequence(pit))
-		    && !par.labelString().empty())
-		{
-			labeladdon = int(
-				  labelfont_metrics.maxHeight()
-					* layout.spacing.getValue()
-					* text_->spacing(par)
-				+ (layout.topsep + layout.labelbottomsep) * dh);
-		}
-
-		// Add the layout spaces, for example before and after
-		// a section, or between the items of a itemize or enumerate
-		// environment.
-
-		pit_type prev = text_->depthHook(pit, par.getDepth());
-		Paragraph const & prevpar = pars[prev];
-		if (prev != pit
-		    && prevpar.layout() == layout
-		    && prevpar.getDepth() == par.getDepth()
-		    && prevpar.getLabelWidthString()
-					== par.getLabelWidthString()) {
-			layoutasc = layout.itemsep * dh;
-		} else if (pit != 0 || first != 0) {
-			if (layout.topsep > 0)
-				layoutasc = layout.topsep * dh;
-		}
+	return int(layoutdesc * 2 / (2 + pars[pit].getDepth()));
+}
 
-		prev = text_->outerHook(pit);
-		if (prev != pit_type(pars.size())) {
-			maxasc += int(pars[prev].layout().parsep * dh);
-		} else if (pit != 0) {
-			Paragraph const & prevpar = pars[pit - 1];
-			if (prevpar.getDepth() != 0 ||
-					prevpar.layout() == layout) {
-				maxasc += int(layout.parsep * dh);
-			}
-		}
-	}
 
-	// is it a bottom line?
-	if (end >= par.size() && topBottomSpace) {
-		// add the layout spaces, for example before and after
-		// a section, or between the items of a itemize or enumerate
-		// environment
-		pit_type nextpit = pit + 1;
-		if (nextpit != pit_type(pars.size())) {
-			pit_type cpit = pit;
-
-			if (pars[cpit].getDepth() > pars[nextpit].getDepth()) {
-				double usual = pars[cpit].layout().bottomsep * dh;
-				double unusual = 0;
-				cpit = text_->depthHook(cpit, pars[nextpit].getDepth());
-				if (pars[cpit].layout() != pars[nextpit].layout()
-					|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
-				{
-					unusual = pars[cpit].layout().bottomsep * dh;
-				}
-				layoutdesc = max(unusual, usual);
-			} else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) {
-				if (pars[cpit].layout() != pars[nextpit].layout()
-					|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
-					layoutdesc = int(pars[cpit].layout().bottomsep * dh);
-			}
+void TextMetrics::setRowHeight(Row & row) const
+{
+	Paragraph const & par = text_->getPar(row.pit());
+	Layout const & layout = par.layout();
+	double const spacing_val = layout.spacing.getValue() * text_->spacing(par);
+
+	// Initial value for ascent (useful if row is empty).
+	Font const font = displayFont(row.pit(), row.pos());
+	FontMetrics const & fm = theFontMetrics(font);
+	int maxasc = int(fm.maxAscent() * spacing_val);
+	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());
+		} else {
+			FontMetrics const & fm = theFontMetrics(cit->font);
+			maxasc = max(maxasc, int(fm.maxAscent() * spacing_val));
+			maxdes = max(maxdes, int(fm.maxDescent() * spacing_val));
 		}
 	}
 
-	// incalculate the layout spaces
-	maxasc  += int(layoutasc  * 2 / (2 + pars[pit].getDepth()));
-	maxdesc += int(layoutdesc * 2 / (2 + pars[pit].getDepth()));
-
-	// FIXME: the correct way is to do the following is to move the
-	// following code in another method specially tailored for the
-	// main Text. The following test is thus bogus.
-	// Top and bottom margin of the document (only at top-level)
-	if (main_text_ && topBottomSpace) {
-		if (pit == 0 && first == 0)
-			maxasc += 20;
-		if (pit + 1 == pit_type(pars.size()) &&
-		    end == par.size() &&
-				!(end > 0 && par.isNewline(end - 1)))
-			maxdesc += 20;
-	}
+	// This is nicer with box insets
+	++maxasc;
+	++maxdes;
 
-	return Dimension(0, maxasc + labeladdon, maxdesc);
+	row.dimension().asc = maxasc;
+	row.dimension().des = maxdes;
 }
 
 
 // x is an absolute screen coord
 // returns the column near the specified x-coordinate of the row
 // x is set to the real beginning of this column
-pos_type TextMetrics::getColumnNearX(pit_type const pit,
-		Row const & row, int & x, bool & boundary) const
+pos_type TextMetrics::getPosNearX(Row const & row, int & x,
+				  bool & boundary) const
 {
-	Buffer const & buffer = bv_->buffer();
-
+	//LYXERR0("getPosNearX(" << x << ") row=" << row);
 	/// For the main Text, it is possible that this pit is not
 	/// yet in the CoordCache when moving cursor up.
 	/// x Paragraph coordinate is always 0 for main text anyway.
 	int const xo = origin_.x_;
 	x -= xo;
-	Paragraph const & par = text_->getPar(pit);
-	Bidi bidi;
-	bidi.computeTables(par, buffer, row);
-
-	pos_type vc = row.pos();
-	pos_type end = row.endpos();
-	pos_type c = 0;
-	Layout const & layout = par.layout();
-
-	bool left_side = false;
-
-	pos_type body_pos = par.beginOfBody();
-
-	double tmpx = row.x;
-	double last_tmpx = tmpx;
 
-	if (body_pos > 0 &&
-	    (body_pos > end || !par.isLineSeparator(body_pos - 1)))
-		body_pos = 0;
-
-	// check for empty row
-	if (vc == end) {
-		x = int(tmpx) + xo;
-		return 0;
-	}
-
-	// This (rtl_support test) is not needed, but gives
-	// some speedup if rtl_support == false
-	bool const lastrow = lyxrc.rtl_support && row.endpos() == par.size();
-
-	// If lastrow is false, we don't need to compute
-	// the value of rtl.
-	bool const rtl_on_lastrow = lastrow ? text_->isRTL(par) : false;
-
-	while (vc < end && tmpx <= x) {
-		c = bidi.vis2log(vc);
-		last_tmpx = tmpx;
-		if (body_pos > 0 && c == body_pos - 1) {
-			FontMetrics const & fm = theFontMetrics(
-				text_->labelFont(par));
-			tmpx += row.label_hfill + fm.width(layout.labelsep);
-			if (par.isLineSeparator(body_pos - 1))
-				tmpx -= singleWidth(pit, body_pos - 1);
-		}
-
-		tmpx += singleWidth(pit, c);
-		if (par.isSeparator(c) && c >= body_pos)
-				tmpx += row.separator;
-		++vc;
-	}
-
-	if ((tmpx + last_tmpx) / 2 > x) {
-		tmpx = last_tmpx;
-		left_side = true;
-	}
-
-	// This shouldn't happen. But we can reset and try to continue.
-	LASSERT(vc <= end, vc = end);
+	// Adapt to cursor row scroll offset if applicable.
+	int const offset = bv_->horizScrollOffset(text_, row.pit(), row.pos());
+	x += offset;
 
+	pos_type pos = row.pos();
 	boundary = false;
-
-	if (lastrow &&
-	    ((rtl_on_lastrow  &&  left_side && vc == row.pos() && x < tmpx - 5) ||
-	     (!rtl_on_lastrow && !left_side && vc == end  && x > tmpx + 5))) {
-		if (!par.isNewline(end - 1))
-			c = end;
-	} else if (vc == row.pos()) {
-		c = bidi.vis2log(vc);
-		if (bidi.level(c) % 2 == 1)
-			++c;
+	if (row.empty())
+		x = row.left_margin;
+	else if (x <= row.left_margin) {
+		pos = row.front().left_pos();
+		x = row.left_margin;
+	} else if (x >= row.width()) {
+		pos = row.back().right_pos();
+		x = row.width();
 	} else {
-		c = bidi.vis2log(vc - 1);
-		bool const rtl = (bidi.level(c) % 2 == 1);
-		if (left_side == rtl) {
-			++c;
-			boundary = isRTLBoundary(pit, c);
+		double w = row.left_margin;
+		Row::const_iterator cit = row.begin();
+		Row::const_iterator cend = row.end();
+		for ( ; cit != cend; ++cit) {
+			if (w <= x &&  w + cit->full_width() > x) {
+				int x_offset = int(x - w);
+				pos = cit->x2pos(x_offset);
+				x = int(x_offset + w);
+				break;
+			}
+			w += cit->full_width();
+		}
+		if (cit == row.end()) {
+			pos = row.back().right_pos();
+			x = row.width();
 		}
+		/** This tests for the case where the cursor is placed
+		 * just before a font direction change. See comment on
+		 * the boundary_ member in DocIterator.h to understand
+		 * how boundary helps here.
+		 */
+		else if (pos == cit->endpos
+			 && cit + 1 != row.end()
+			 && cit->isRTL() != (cit + 1)->isRTL())
+			boundary = true;
 	}
 
-// I believe this code is not needed anymore (Jug 20050717)
-#if 0
-	// The following code is necessary because the cursor position past
-	// the last char in a row is logically equivalent to that before
-	// the first char in the next row. That's why insets causing row
-	// divisions -- Newline and display-style insets -- must be treated
-	// specially, so cursor up/down doesn't get stuck in an air gap -- MV
-	// Newline inset, air gap below:
-	if (row.pos() < end && c >= end && par.isNewline(end - 1)) {
-		if (bidi.level(end -1) % 2 == 0)
-			tmpx -= singleWidth(pit, end - 1);
+	/** This tests for the case where the cursor is set at the end
+	 * of a row which has been broken due something else than a
+	 * separator (a display inset or a forced breaking of the
+	 * row). We know that there is a separator when the end of the
+	 * row is larger than the end of its last element.
+	 */
+	if (!row.empty() && pos == row.back().endpos
+	    && row.back().endpos == row.endpos()) {
+		Inset const * inset = row.back().inset;
+		if (inset && (inset->lyxCode() == NEWLINE_CODE
+		              || inset->lyxCode() == SEPARATOR_CODE))
+			pos = row.back().pos;
 		else
-			tmpx += singleWidth(pit, end - 1);
-		c = end - 1;
+			boundary = row.right_boundary();
 	}
 
-	// Air gap above display inset:
-	if (row.pos() < end && c >= end && end < par.size()
-	    && par.isInset(end) && par.getInset(end)->display()) {
-		c = end - 1;
-	}
-	// Air gap below display inset:
-	if (row.pos() < end && c >= end && par.isInset(end - 1)
-	    && par.getInset(end - 1)->display()) {
-		c = end - 1;
-	}
-#endif
-
-	x = int(tmpx) + xo;
-	pos_type const col = c - row.pos();
-
-	if (!c || end == par.size())
-		return col;
+	x += xo - offset;
+	//LYXERR0("getPosNearX ==> pos=" << pos << ", boundary=" << boundary);
 
-	if (c==end && !par.isLineSeparator(c-1) && !par.isNewline(c-1)) {
-		boundary = true;
-		return col;
-	}
-
-	return min(col, end - 1 - row.pos());
+	return pos;
 }
 
 
@@ -1342,7 +1165,7 @@ pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const
 	LBUFERR(row < int(pm.rows().size()));
 	bool bound = false;
 	Row const & r = pm.rows()[row];
-	return r.pos() + getColumnNearX(pit, r, x, bound);
+	return getPosNearX(r, x, bound);
 }
 
 
@@ -1502,10 +1325,9 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 
 	if (!it) {
 		// No inset, set position in the text
-		bool bound = false; // is modified by getColumnNearX
-		int xx = x; // is modified by getColumnNearX
-		cur.pos() = row.pos()
-			+ getColumnNearX(pit, row, xx, bound);
+		bool bound = false; // is modified by getPosNearX
+		int xx = x; // is modified by getPosNearX
+		cur.pos() = getPosNearX(row, xx, bound);
 		cur.boundary(bound);
 		cur.setCurrentFont();
 		cur.setTargetX(xx);
@@ -1521,11 +1343,28 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 	cur.setTargetX(x);
 
 	// Try to descend recursively inside the inset.
-	inset = inset->editXY(cur, x, yy);
+	Inset * edited = inset->editXY(cur, x, yy);
+	if (edited == inset && cur.pos() == it->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();
+		}
+	}
 
 	if (cur.top().text() == text_)
 		cur.setCurrentFont();
-	return inset;
+	return edited;
 }
 
 
@@ -1556,7 +1395,7 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 
 	bool bound = false;
 	int xx = x;
-	pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
+	pos_type const pos = getPosNearX(row, xx, bound);
 
 	LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos);
 
@@ -1570,7 +1409,7 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
 {
 	Paragraph const & par = text_->paragraphs()[pit];
-	ParagraphMetrics const & pm = par_metrics_[pit];
+	CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
 
 	LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << "  pit: " << pit);
 
@@ -1581,21 +1420,19 @@ InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
 
 		LYXERR(Debug::DEBUG, "examining inset " << inset);
 
-		if (!bv_->coordCache().getInsets().has(inset)) {
+		if (!insetCache.has(inset)) {
 			LYXERR(Debug::DEBUG, "inset has no cached position");
 			return 0;
 		}
 
-		Dimension const & dim = pm.insetDimension(inset);
-		Point p = bv_->coordCache().getInsets().xy(inset);
+		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);
 
-		if (x >= p.x_
-			&& x <= p.x_ + dim.wid
-			&& y >= p.y_ - dim.asc
-			&& y <= p.y_ + dim.des) {
+		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));
 		}
@@ -1620,153 +1457,71 @@ Inset * TextMetrics::checkInsetHit(int x, int y)
 }
 
 
-int TextMetrics::cursorX(CursorSlice const & sl,
-		bool boundary) const
+Row::const_iterator const
+TextMetrics::findRowElement(Row const & row, pos_type const pos,
+                            bool const boundary, double & x) const
 {
-	LASSERT(sl.text() == text_, return 0);
-	pit_type const pit = sl.pit();
-	Paragraph const & par = text_->paragraphs()[pit];
-	ParagraphMetrics const & pm = par_metrics_[pit];
-	if (pm.rows().empty())
-		return 0;
-
-	pos_type ppos = sl.pos();
-	// Correct position in front of big insets
-	bool const boundary_correction = ppos != 0 && boundary;
-	if (boundary_correction)
-		--ppos;
-
-	Row const & row = pm.getRow(sl.pos(), boundary);
-
-	pos_type cursor_vpos = 0;
-
-	Buffer const & buffer = bv_->buffer();
-	double x = row.x;
-	Bidi bidi;
-	bidi.computeTables(par, buffer, row);
-
-	pos_type const row_pos  = row.pos();
-	pos_type const end      = row.endpos();
-	// Spaces at logical line breaks in bidi text must be skipped during
-	// cursor positioning. However, they may appear visually in the middle
-	// of a row; they must be skipped, wherever they are...
-	// * logically "abc_[HEBREW_\nHEBREW]"
-	// * visually "abc_[_WERBEH\nWERBEH]"
-	pos_type skipped_sep_vpos = -1;
-
-	if (end <= row_pos)
-		cursor_vpos = row_pos;
-	else if (ppos >= end)
-		cursor_vpos = text_->isRTL(par) ? row_pos : end;
-	else if (ppos > row_pos && ppos >= end)
-		//FIXME: this code is never reached!
-		//       (see http://www.lyx.org/trac/changeset/8251)
-		// Place cursor after char at (logical) position pos - 1
-		cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
-			? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
-	else
-		// Place cursor before char at (logical) position ppos
-		cursor_vpos = (bidi.level(ppos) % 2 == 0)
-			? bidi.log2vis(ppos) : bidi.log2vis(ppos) + 1;
-
-	pos_type body_pos = par.beginOfBody();
-	if (body_pos > 0 &&
-	    (body_pos > end || !par.isLineSeparator(body_pos - 1)))
-		body_pos = 0;
-
-	// check for possible inline completion in this row
-	DocIterator const & inlineCompletionPos = bv_->inlineCompletionPos();
-	pos_type inlineCompletionVPos = -1;
-	if (inlineCompletionPos.inTexted()
-	    && inlineCompletionPos.text() == text_
-	    && inlineCompletionPos.pit() == pit
-	    && inlineCompletionPos.pos() - 1 >= row_pos
-	    && inlineCompletionPos.pos() - 1 < end) {
-		// draw logically behind the previous character
-		inlineCompletionVPos = bidi.log2vis(inlineCompletionPos.pos() - 1);
-	}
-
-	// Use font span to speed things up, see below
-	FontSpan font_span;
-	Font font;
-
-	// If the last logical character is a separator, skip it, unless
-	// it's in the last row of a paragraph; see skipped_sep_vpos declaration
-	if (end > 0 && end < par.size() && par.isSeparator(end - 1))
-		skipped_sep_vpos = bidi.log2vis(end - 1);
-
-	if (lyxrc.paragraph_markers && text_->isRTL(par)) {
-		ParagraphList const & pars_ = text_->paragraphs();
-		if (size_type(pit + 1) < pars_.size()) {
-			FontInfo f;
-			docstring const s = docstring(1, char_type(0x00B6));
-			x += theFontMetrics(f).width(s);
+	/**
+	 * 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();
 	}
 
-	// Inline completion RTL special case row_pos == cursor_pos:
-	// "__|b" => cursor_pos is right of __
-	if (row_pos == inlineCompletionVPos && row_pos == cursor_vpos) {
-		font = displayFont(pit, row_pos + 1);
-		docstring const & completion = bv_->inlineCompletion();
-		if (font.isRightToLeft() && completion.length() > 0)
-			x += theFontMetrics(font.fontInfo()).width(completion);
-	}
-
-	for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
-		// Skip the separator which is at the logical end of the row
-		if (vpos == skipped_sep_vpos)
-			continue;
-		pos_type pos = bidi.vis2log(vpos);
-		if (body_pos > 0 && pos == body_pos - 1) {
-			FontMetrics const & labelfm = theFontMetrics(
-				text_->labelFont(par));
-			x += row.label_hfill + labelfm.width(par.layout().labelsep);
-			if (par.isLineSeparator(body_pos - 1))
-				x -= singleWidth(pit, body_pos - 1);
-		}
-
-		// Use font span to speed things up, see above
-		if (pos < font_span.first || pos > font_span.last) {
-			font_span = par.fontSpan(pos);
-			font = displayFont(pit, pos);
-		}
+	if (cit == row.end())
+		--cit;
 
-		x += pm.singleWidth(pos, font);
-
-		// Inline completion RTL case:
-		// "a__|b", __ of b => non-boundary a-pos is right of __
-		if (vpos + 1 == inlineCompletionVPos
-		    && (vpos + 1 < cursor_vpos || !boundary_correction)) {
-			font = displayFont(pit, vpos + 1);
-			docstring const & completion = bv_->inlineCompletion();
-			if (font.isRightToLeft() && completion.length() > 0)
-				x += theFontMetrics(font.fontInfo()).width(completion);
-		}
+	return cit;
+}
 
-		//  Inline completion LTR case:
-		// "b|__a", __ of b => non-boundary a-pos is in front of __
-		if (vpos == inlineCompletionVPos
-		    && (vpos + 1 < cursor_vpos || boundary_correction)) {
-			font = displayFont(pit, vpos);
-			docstring const & completion = bv_->inlineCompletion();
-			if (!font.isRightToLeft() && completion.length() > 0)
-				x += theFontMetrics(font.fontInfo()).width(completion);
-		}
 
-		if (par.isSeparator(pos) && pos >= body_pos)
-			x += row.separator;
-	}
+int TextMetrics::cursorX(CursorSlice const & sl,
+		bool boundary) const
+{
+	LASSERT(sl.text() == text_, return 0);
 
-	// see correction above
-	if (boundary_correction) {
-		if (isRTL(sl, boundary))
-			x -= singleWidth(pit, ppos);
-		else
-			x += singleWidth(pit, ppos);
-	}
+	ParagraphMetrics const & pm = par_metrics_[sl.pit()];
+	if (pm.rows().empty())
+		return 0;
+	Row const & row = pm.getRow(sl.pos(), boundary);
+	pos_type const pos = sl.pos();
 
+	double x = 0;
+	findRowElement(row, pos, boundary, x);
 	return int(x);
+
 }
 
 
@@ -1818,11 +1573,13 @@ bool TextMetrics::cursorEnd(Cursor & cur)
 	bool boundary = false;
 	if (end != cur.lastpos()) {
 		if (!cur.paragraph().isLineSeparator(end-1)
-		    && !cur.paragraph().isNewline(end-1))
+		    && !cur.paragraph().isNewline(end-1)
+		    && !cur.paragraph().isEnvSeparator(end-1))
 			boundary = true;
 		else
 			--end;
-	}
+	} else if (cur.paragraph().isEnvSeparator(end-1))
+		--end;
 	return text_->setCursor(cur, cur.pit(), end, true, boundary);
 }
 
@@ -1835,7 +1592,7 @@ void TextMetrics::deleteLineForward(Cursor & cur)
 		text_->cursorForward(cur);
 	} else {
 		cur.resetAnchor();
-		cur.setSelection(true); // to avoid deletion
+		cur.selection(true); // to avoid deletion
 		cursorEnd(cur);
 		cur.setSelection();
 		// What is this test for ??? (JMarc)
@@ -1848,17 +1605,17 @@ void TextMetrics::deleteLineForward(Cursor & cur)
 }
 
 
-bool TextMetrics::isLastRow(pit_type pit, Row const & row) const
+bool TextMetrics::isLastRow(Row const & row) const
 {
 	ParagraphList const & pars = text_->paragraphs();
-	return row.endpos() >= pars[pit].size()
-		&& pit + 1 == pit_type(pars.size());
+	return row.endpos() >= pars[row.pit()].size()
+		&& row.pit() + 1 == pit_type(pars.size());
 }
 
 
-bool TextMetrics::isFirstRow(pit_type pit, Row const & row) const
+bool TextMetrics::isFirstRow(Row const & row) const
 {
-	return row.pos() == 0 && pit == 0;
+	return row.pos() == 0 && row.pit() == 0;
 }
 
 
@@ -1882,6 +1639,7 @@ int TextMetrics::leftMargin(int max_width,
 	//lyxerr << "TextMetrics::leftMargin: pit: " << pit << " pos: " << pos << endl;
 	DocumentClass const & tclass = buffer.params().documentClass();
 	Layout const & layout = par.layout();
+	FontMetrics const & bfm = theFontMetrics(buffer.params().getFont());
 
 	docstring parindent = layout.parindent;
 
@@ -1890,21 +1648,25 @@ int TextMetrics::leftMargin(int max_width,
 	if (text_->isMainText())
 		l_margin += bv_->leftMargin();
 
-	l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-		tclass.leftmargin());
+	l_margin += bfm.signedWidth(tclass.leftmargin());
 
-	if (par.getDepth() != 0) {
+	int depth = par.getDepth();
+	if (depth != 0) {
 		// find the next level paragraph
 		pit_type newpar = text_->outerHook(pit);
 		if (newpar != pit_type(pars.size())) {
 			if (pars[newpar].layout().isEnvironment()) {
-				l_margin = leftMargin(max_width, newpar);
+				int nestmargin = depth * nestMargin();
+				if (text_->isMainText())
+					nestmargin += changebarMargin();
+				l_margin = max(leftMargin(max_width, newpar), nestmargin);
 				// Remove the parindent that has been added
 				// if the paragraph was empty.
-				if (pars[newpar].empty()) {
+				if (pars[newpar].empty() &&
+				    buffer.params().paragraph_separation ==
+				    BufferParams::ParagraphIndentSeparation) {
 					docstring pi = pars[newpar].layout().parindent;
-					l_margin -= theFontMetrics(
-						buffer.params().getFont()).signedWidth(pi);
+					l_margin -= bfm.signedWidth(pi);
 				}
 			}
 			if (tclass.isDefaultLayout(par.layout())
@@ -1919,45 +1681,50 @@ int TextMetrics::leftMargin(int max_width,
 
 	// This happens after sections or environments in standard classes.
 	// We have to check the previous layout at same depth.
-	if (tclass.isDefaultLayout(par.layout()) && pit > 0
-	    && pars[pit - 1].getDepth() >= par.getDepth()) {
+	if (buffer.params().paragraph_separation ==
+			BufferParams::ParagraphSkipSeparation)
+		parindent.erase();
+	else if (pit > 0 && pars[pit - 1].getDepth() >= par.getDepth()) {
 		pit_type prev = text_->depthHook(pit, par.getDepth());
-		if (pars[prev < pit ? prev : pit - 1].layout().nextnoindent)
+		if (par.layout() == pars[prev].layout()) {
+			if (prev != pit - 1
+			    && pars[pit - 1].layout().nextnoindent)
+				parindent.erase();
+		} else if (pars[prev].layout().nextnoindent)
 			parindent.erase();
 	}
 
 	FontInfo const labelfont = text_->labelFont(par);
-	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
+	FontMetrics const & lfm = theFontMetrics(labelfont);
 
 	switch (layout.margintype) {
 	case MARGIN_DYNAMIC:
 		if (!layout.leftmargin.empty()) {
-			l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-				layout.leftmargin);
+			l_margin += bfm.signedWidth(layout.leftmargin);
 		}
 		if (!par.labelString().empty()) {
-			l_margin += labelfont_metrics.signedWidth(layout.labelindent);
-			l_margin += labelfont_metrics.width(par.labelString());
-			l_margin += labelfont_metrics.width(layout.labelsep);
+			l_margin += lfm.signedWidth(layout.labelindent);
+			l_margin += lfm.width(par.labelString());
+			l_margin += lfm.width(layout.labelsep);
 		}
 		break;
 
 	case MARGIN_MANUAL: {
-		l_margin += labelfont_metrics.signedWidth(layout.labelindent);
+		l_margin += lfm.signedWidth(layout.labelindent);
 		// The width of an empty par, even with manual label, should be 0
 		if (!par.empty() && pos >= par.beginOfBody()) {
 			if (!par.getLabelWidthString().empty()) {
 				docstring labstr = par.getLabelWidthString();
-				l_margin += labelfont_metrics.width(labstr);
-				l_margin += labelfont_metrics.width(layout.labelsep);
+				l_margin += lfm.width(labstr);
+				l_margin += lfm.width(layout.labelsep);
 			}
 		}
 		break;
 	}
 
 	case MARGIN_STATIC: {
-		l_margin += theFontMetrics(buffer.params().getFont()).
-			signedWidth(layout.leftmargin) * 4	/ (par.getDepth() + 4);
+		l_margin += bfm.signedWidth(layout.leftmargin) * 4
+		             / (par.getDepth() + 4);
 		break;
 	}
 
@@ -1965,20 +1732,20 @@ int TextMetrics::leftMargin(int max_width,
 		if (layout.labeltype == LABEL_MANUAL) {
 			// if we are at position 0, we are never in the body
 			if (pos > 0 && pos >= par.beginOfBody())
-				l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
+				l_margin += lfm.signedWidth(layout.leftmargin);
 			else
-				l_margin += labelfont_metrics.signedWidth(layout.labelindent);
+				l_margin += lfm.signedWidth(layout.labelindent);
 		} else if (pos != 0
 			   // Special case to fix problems with
 			   // theorems (JMarc)
 			   || (layout.labeltype == LABEL_STATIC
 			       && layout.latextype == LATEX_ENVIRONMENT
 			       && !text_->isFirstInSequence(pit))) {
-			l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
+			l_margin += lfm.signedWidth(layout.leftmargin);
 		} else if (!layout.labelIsAbove()) {
-			l_margin += labelfont_metrics.signedWidth(layout.labelindent);
-			l_margin += labelfont_metrics.width(layout.labelsep);
-			l_margin += labelfont_metrics.width(par.labelString());
+			l_margin += lfm.signedWidth(layout.labelindent);
+			l_margin += lfm.width(layout.labelsep);
+			l_margin += lfm.width(par.labelString());
 		}
 		break;
 
@@ -1995,7 +1762,7 @@ int TextMetrics::leftMargin(int max_width,
 		for ( ; rit != end; ++rit)
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
-		l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(layout.leftmargin);
+		l_margin += bfm.signedWidth(layout.leftmargin);
 		l_margin += minfill;
 #endif
 		// also wrong, but much shorter.
@@ -2005,7 +1772,7 @@ int TextMetrics::leftMargin(int max_width,
 	}
 
 	if (!par.params().leftIndent().zero())
-		l_margin += par.params().leftIndent().inPixels(max_width);
+		l_margin += par.params().leftIndent().inPixels(max_width, lfm.em());
 
 	LyXAlignment align;
 
@@ -2017,30 +1784,29 @@ int TextMetrics::leftMargin(int max_width,
 	// 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())
-			&& (!(tclass.isDefaultLayout(par.layout())
-	         || tclass.isPlainLayout(par.layout()))
+		 && par.isInset(pos)
+		 && par.getInset(pos)->display())
+	    && (!(tclass.isDefaultLayout(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
+				== 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 += theFontMetrics(
-					buffer.params().getFont()).signedWidth(parindent);
+				l_margin += bfm.signedWidth(parindent);
 			else
 				l_margin += buffer.params().getIndentation().inPixels(*bv_);
 		}
@@ -2049,14 +1815,6 @@ int TextMetrics::leftMargin(int max_width,
 }
 
 
-int TextMetrics::singleWidth(pit_type pit, pos_type pos) const
-{
-	ParagraphMetrics const & pm = par_metrics_[pit];
-
-	return pm.singleWidth(pos, displayFont(pit, pos));
-}
-
-
 void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 {
 	if (par_metrics_.empty())
@@ -2080,18 +1838,32 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const
+void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const x, int y) const
 {
-	BufferParams const & bparams = bv_->buffer().params();
 	ParagraphMetrics const & pm = par_metrics_[pit];
 	if (pm.rows().empty())
 		return;
-
-	Bidi bidi;
-	bool const original_drawing_state = pi.pain.isDrawingEnabled();
-	int const ww = bv_->workHeight();
 	size_t const nrows = pm.rows().size();
 
+	// Use fast lane when drawing is disabled.
+	if (!pi.pain.isDrawingEnabled()) {
+		for (size_t i = 0; i != nrows; ++i) {
+
+			Row const & row = pm.rows()[i];
+			// Adapt to cursor row scroll offset if applicable.
+			int row_x = x - bv_->horizScrollOffset(text_, pit, row.pos());
+			if (i)
+				y += row.ascent();
+
+			RowPainter rp(pi, *text_, row, row_x, y);
+
+			rp.paintOnlyInsets();
+			y += row.descent();
+		}
+		return;
+	}
+
+	int const ww = bv_->workHeight();
 	Cursor const & cur = bv_->cursor();
 	DocIterator sel_beg = cur.selectionBegin();
 	DocIterator sel_end = cur.selectionEnd();
@@ -2121,14 +1893,25 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 	for (size_t i = 0; i != nrows; ++i) {
 
 		Row const & row = pm.rows()[i];
+		// Adapt to cursor row scroll offset if applicable.
+		int row_x = x - bv_->horizScrollOffset(text_, pit, row.pos());
 		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);
-		// It is not needed to draw on screen if we are not inside.
-		pi.pain.setDrawingEnabled(inside && original_drawing_state);
-		RowPainter rp(pi, *text_, pit, row, bidi, x, y);
+		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();
+			y += row.descent();
+			continue;
+		}
 
 		if (selection)
 			row.setSelectionAndMargins(sel_beg_par, sel_end_par);
@@ -2145,11 +1928,12 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 		}
 
 		// Row signature; has row changed since last paint?
-		row.setCrc(pm.computeRowSignature(row, bparams));
-		bool row_has_changed = row.changed();
+		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 && lyxrc.spellcheck_continuously) {
+		if (row_has_changed && pi.do_spellcheck && lyxrc.spellcheck_continuously) {
 			text_->getPar(pit).spellCheck();
 		}
 
@@ -2166,20 +1950,24 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 		// Clear background of this row if paragraph background was not
 		// already cleared because of a full repaint.
 		if (!pi.full_repaint && row_has_changed) {
-			pi.pain.fillRectangle(x, y - row.ascent(),
+			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);
 		}
 
 		// Instrumentation for testing row cache (see also
 		// 12 lines lower):
-		if (lyxerr.debugging(Debug::PAINTING) && inside
+		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);
+				<< " row_has_changed="	<< row_has_changed
+				<< " drawingEnabled=" << pi.pain.isDrawingEnabled());
 		}
 
 		// Backup full_repaint status and force full repaint
@@ -2201,13 +1989,15 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 			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();
 
 		// Restore full_repaint status.
 		pi.full_repaint = tmp;
 	}
 	// Re-enable screen drawing for future use of the painter.
-	pi.pain.setDrawingEnabled(original_drawing_state);
+	pi.pain.setDrawingEnabled(true);
 
 	//LYXERR(Debug::PAINTING, ".");
 }
@@ -2223,14 +2013,19 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y,
 	DocIterator wordStart = bvcur;
 	wordStart.pos() -= word.length();
 
+	// calculate dimensions of the word
+	Row row;
+	row.pit(bvcur.pit());
+	row.pos(wordStart.pos());
+	row.endpos(bvcur.pos());
+	setRowHeight(row);
+	dim = row.dimension();
+
 	// get position on screen of the word start and end
 	//FIXME: Is it necessary to explicitly set this to false?
 	wordStart.boundary(false);
 	Point lxy = cur.bv().getPos(wordStart);
 	Point rxy = cur.bv().getPos(bvcur);
-
-	// calculate dimensions of the word
-	dim = rowHeight(bvcur.pit(), wordStart.pos(), bvcur.pos(), false);
 	dim.wid = abs(rxy.x_ - lxy.x_);
 
 	// calculate position of word
@@ -2241,15 +2036,6 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y,
 	//lyxerr << " wordstart=" << wordStart << " bvcur=" << bvcur << " cur=" << cur << std::endl;
 }
 
-//int TextMetrics::pos2x(pit_type pit, pos_type pos) const
-//{
-//	ParagraphMetrics const & pm = par_metrics_[pit];
-//	Row const & r = pm.rows()[row];
-//	int x = 0;
-//	pos -= r.pos();
-//}
-
-
 int defaultRowHeight()
 {
 	return int(theFontMetrics(sane_font).maxHeight() *  1.2);