X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=385c023a86dba0d7c9fc23e7899051b6d20612c8;hb=a01cb111a07717a337c18860216359cdbe22af3c;hp=0ccfa67026707d92bbfdcba47fcd13cb6ef7c336;hpb=8d52aa563813f53eeca109c76252d3a258214017;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 0ccfa67026..385c023a86 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -19,16 +19,18 @@
 
 #include "TextMetrics.h"
 
+#include "Bidi.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "bufferview_funcs.h"
-#include "Color.h"
+#include "CoordCache.h"
+#include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
+#include "InsetList.h"
+#include "Layout.h"
 #include "Length.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -37,19 +39,18 @@
 #include "ParIterator.h"
 #include "rowpainter.h"
 #include "Text.h"
-#include "Undo.h"
+#include "TextClass.h"
 #include "VSpace.h"
 
+#include "mathed/MacroTable.h"
+#include "mathed/MathMacroTemplate.h"
+
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include <boost/current_function.hpp>
+#include "support/debug.h"
 
-using std::make_pair;
-using std::max;
-using std::min;
-using std::endl;
-using std::pair;
+using namespace std;
 
 namespace lyx {
 
@@ -127,7 +128,7 @@ TextMetrics::TextMetrics(BufferView * bv, Text * text)
 }
 
 
-bool TextMetrics::has(pit_type pit) const
+bool TextMetrics::contains(pit_type pit) const
 {
 	return par_metrics_.find(pit) != par_metrics_.end();
 }
@@ -140,49 +141,45 @@ ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const
 
 
 
-pair<pit_type, ParagraphMetrics> const & TextMetrics::first() const
+pair<pit_type, ParagraphMetrics const *> TextMetrics::first() const
 {
-	pair<pit_type, ParagraphMetrics> const & pm = *par_metrics_.begin();
-	return pm;
+	ParMetricsCache::const_iterator it = par_metrics_.begin();
+	return make_pair(it->first, &it->second);
 }
 
 
-pair<pit_type, ParagraphMetrics> const & TextMetrics::last() const
+pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
 {
-	pair<pit_type, ParagraphMetrics> const & pm = *par_metrics_.rbegin();
-	return pm;
+	ParMetricsCache::const_reverse_iterator it = par_metrics_.rbegin();
+	return make_pair(it->first, &it->second);
 }
 
 
-ParagraphMetrics & TextMetrics::parMetrics(pit_type pit,
-		bool redo)
+ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo)
 {
 	ParMetricsCache::iterator pmc_it = par_metrics_.find(pit);
 	if (pmc_it == par_metrics_.end()) {
 		pmc_it = par_metrics_.insert(
 			make_pair(pit, ParagraphMetrics(text_->getPar(pit)))).first;
 	}
-	if (pmc_it->second.rows().empty() && redo) {
+	if (pmc_it->second.rows().empty() && redo)
 		redoParagraph(pit);
-	}
 	return pmc_it->second;
 }
 
 
 int TextMetrics::parPosition(pit_type pit) const
 {
-	pair<pit_type, ParagraphMetrics> first = *par_metrics_.begin();
-	pair<pit_type, ParagraphMetrics> last = *par_metrics_.rbegin();
-	if (pit < first.first)
-			return -1000000;
-	else if (pit > last.first)
+	if (pit < par_metrics_.begin()->first)
+		return -1000000;
+	if (pit > par_metrics_.rbegin()->first)
 		return +1000000;
 
 	return par_metrics_[pit].position();
 }
 
 
-bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim)
+bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 {
 	BOOST_ASSERT(mi.base.textwidth);
 	max_width_ = mi.base.textwidth;
@@ -190,6 +187,7 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim)
 	Dimension const old_dim = dim_;
 	// reset dimension.
 	dim_ = Dimension();
+	dim_.wid = min_width;
 	pit_type const npar = text_->paragraphs().size();
 	if (npar > 1)
 		// If there is more than one row, expand the text to 
@@ -223,33 +221,33 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim)
 
 int TextMetrics::rightMargin(ParagraphMetrics const & pm) const
 {
-	return main_text_? pm.rightMargin(bv_->buffer()) : 0;
+	return main_text_? pm.rightMargin(*bv_) : 0;
 }
 
 
 int TextMetrics::rightMargin(pit_type const pit) const
 {
-	return main_text_? par_metrics_[pit].rightMargin(bv_->buffer()) : 0;
+	return main_text_? par_metrics_[pit].rightMargin(*bv_) : 0;
 }
 
 
 void TextMetrics::applyOuterFont(Font & font) const
 {
 	Font lf(font_);
-	lf.reduce(bv_->buffer().params().getFont());
-	lf.realize(font);
+	lf.fontInfo().reduce(bv_->buffer().params().getFont().fontInfo());
+	lf.fontInfo().realize(font.fontInfo());
 	lf.setLanguage(font.language());
 	font = lf;
 }
 
 
-Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
+Font TextMetrics::displayFont(pit_type pit, pos_type pos) const
 {
 	BOOST_ASSERT(pos >= 0);
 
 	ParagraphList const & pars = text_->paragraphs();
 	Paragraph const & par = pars[pit];
-	LayoutPtr const & layout = par.layout();
+	Layout const & layout = par.layout();
 	Buffer const & buffer = bv_->buffer();
 	// FIXME: broken?
 	BufferParams const & params = buffer.params();
@@ -260,23 +258,24 @@ Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
 		Font f = par.getFontSettings(params, pos);
 		if (!text_->isMainText(buffer))
 			applyOuterFont(f);
-		bool lab = layout->labeltype == LABEL_MANUAL && pos < body_pos;
+		bool lab = layout.labeltype == LABEL_MANUAL && pos < body_pos;
 
-		Font const & lf = lab ? layout->labelfont : layout->font;
-		Font rlf = lab ? layout->reslabelfont : layout->resfont;
+		FontInfo const & lf = lab ? layout.labelfont : layout.font;
+		FontInfo rlf = lab ? layout.reslabelfont : layout.resfont;
 		
 		// In case the default family has been customized
-		if (lf.family() == Font::INHERIT_FAMILY)
-			rlf.setFamily(params.getFont().family());
-		return f.realize(rlf);
+		if (lf.family() == INHERIT_FAMILY)
+			rlf.setFamily(params.getFont().fontInfo().family());
+		f.fontInfo().realize(rlf);
+		return f;
 	}
 
 	// The uncommon case need not be optimized as much
-	Font const & layoutfont = pos < body_pos ? 
-		layout->labelfont : layout->font;
+	FontInfo const & layoutfont = pos < body_pos ? 
+		layout.labelfont : layout.font;
 
 	Font font = par.getFontSettings(params, pos);
-	font.realize(layoutfont);
+	font.fontInfo().realize(layoutfont);
 
 	if (!text_->isMainText(buffer))
 		applyOuterFont(font);
@@ -285,10 +284,10 @@ Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
 	// NOTE: the cast to pit_type should be removed when pit_type
 	// changes to a unsigned integer.
 	if (pit < pit_type(pars.size()))
-		font.realize(outerFont(pit, pars));
+		font.fontInfo().realize(outerFont(pit, pars).fontInfo());
 
 	// Realize with the fonts of lesser depth.
-	font.realize(params.getFont());
+	font.fontInfo().realize(params.getFont().fontInfo());
 
 	return font;
 }
@@ -303,7 +302,7 @@ bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const
 	if (boundary && sl.pos() > 0)
 		correction = -1;
 		
-	return getDisplayFont(sl.pit(), sl.pos() + correction).isVisibleRightToLeft();
+	return displayFont(sl.pit(), sl.pos() + correction).isVisibleRightToLeft();
 }
 
 
@@ -318,12 +317,12 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 
 	Paragraph const & par = text_->getPar(pit);
 
-	bool left = getDisplayFont(pit, pos - 1).isVisibleRightToLeft();
+	bool left = displayFont(pit, pos - 1).isVisibleRightToLeft();
 	bool right;
 	if (pos == par.size())
 		right = par.isRTL(bv_->buffer().params());
 	else
-		right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+		right = displayFont(pit, pos).isVisibleRightToLeft();
 	return left != right;
 }
 
@@ -340,7 +339,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
 	if (pos == par.size())
 		right = par.isRTL(bv_->buffer().params());
 	else
-		right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+		right = displayFont(pit, pos).isVisibleRightToLeft();
 	return left != right;
 }
 
@@ -355,69 +354,75 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	pm.reset(par);
 
 	Buffer & buffer = bv_->buffer();
-	BufferParams const & bparams = buffer.params();
 	main_text_ = (text_ == &buffer.text());
 	bool changed = false;
 
-	// FIXME This check ought to be done somewhere else. It is the reason
+	// 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;
 	// when layout is set; when material is pasted.
-	int const moveCursor = par.checkBiblio(buffer.params().trackChanges);
+	int const moveCursor = par.checkBiblio(buffer);
 	if (moveCursor > 0)
-		const_cast<Cursor &>(bv_->cursor()).posRight();
+		const_cast<Cursor &>(bv_->cursor()).posForward();
 	else if (moveCursor < 0) {
 		Cursor & cursor = const_cast<Cursor &>(bv_->cursor());
 		if (cursor.pos() >= -moveCursor)
-			cursor.posLeft();
+			cursor.posBackward();
 	}
 
 	// Optimisation: this is used in the next two loops
 	// so better to calculate that once here.
 	int const right_margin = rightMargin(pm);
 
+	// iterator pointing to paragraph to resolve macros
+	DocIterator parPos = text_->macrocontextPosition();
+	if (!parPos.empty())
+		parPos.pit() = pit;
+	else {
+		LYXERR(Debug::INFO, "MacroContext not initialised!"
+			<< " Going through the buffer again and hope"
+			<< " the context is better then.");
+		updateLabels(bv_->buffer());
+		parPos = text_->macrocontextPosition();
+		BOOST_ASSERT(!parPos.empty());
+		parPos.pit() = pit;
+	}
+	
 	// redo insets
 	// FIXME: We should always use getFont(), see documentation of
 	// noFontChange() in Inset.h.
 	Font const bufferfont = buffer.params().getFont();
-	InsetList::const_iterator ii = par.insetlist.begin();
-	InsetList::const_iterator iend = par.insetlist.end();
+	InsetList::const_iterator ii = par.insetList().begin();
+	InsetList::const_iterator iend = par.insetList().end();
 	for (; ii != iend; ++ii) {
-		Dimension old_dim = ii->inset->dimension();
+		// position already initialized?
+		if (!parPos.empty()) {
+			parPos.pos() = ii->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)
+				parPos.pos()++;
+		}
+
+		// do the metric calculation
 		Dimension dim;
 		int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
 			- right_margin;
 		Font const & font = ii->inset->noFontChange() ?
-			bufferfont : getDisplayFont(pit, ii->pos);
-		MetricsInfo mi(bv_, font, w);
-		changed |= ii->inset->metrics(mi, dim);
+			bufferfont : displayFont(pit, ii->pos);
+		MacroContext mc(buffer, parPos);
+		MetricsInfo mi(bv_, font.fontInfo(), w, mc);
+		ii->inset->metrics(mi, dim);
+		Dimension const old_dim = pm.insetDimension(ii->inset);
+		pm.setInsetDimension(ii->inset, dim);
 		changed |= (old_dim != dim);
 	}
 
-	Cursor const & cur = bv_->cursor();
-	DocIterator sel_beg = cur.selectionBegin();
-	DocIterator sel_end = cur.selectionEnd();
-	bool selection = cur.selection()
-		// This is out text.
-		&& cur.text() == text_
-		// if the anchor is outside, this is not our selection 
-		&& cur.anchor().text() == text_
-		&& pit >= sel_beg.pit() && pit <= sel_end.pit();
-
-	// We care only about visible selection.
-	if (selection) {
-		if (pit != sel_beg.pit()) {
-			sel_beg.pit() = pit;
-			sel_beg.pos() = 0;
-		}
-		if (pit != sel_end.pit()) {
-			sel_end.pit() = pit;
-			sel_end.pos() = sel_end.lastpos();
-		}
-	}
-
 	par.setBeginOfBody();
 	pos_type first = 0;
 	size_t row_index = 0;
@@ -429,28 +434,24 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		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().
+			// for the computeRowMetrics() below.
 			dim_.wid = max_width_;
 
+		dim = rowHeight(pit, first, end);
 		dim.wid = rowWidth(right_margin, pit, first, end);
-		boost::tie(dim.asc, dim.des) = rowHeight(pit, first, end);
 		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(end);
-		if (selection)
-			row.setSelection(sel_beg.pos(), sel_end.pos());
-		else
-			row.setSelection(-1, -1);
 		row.setDimension(dim);
-		computeRowMetrics(pit, row);
-		pm.computeRowSignature(row, bparams);
+		int const max_row_width = max(dim_.wid, dim.wid);
+		computeRowMetrics(pit, row, max_row_width);
 		first = end;
 		++row_index;
 
-		pm.dim().wid = std::max(pm.dim().wid, dim.wid);
+		pm.dim().wid = max(pm.dim().wid, dim.wid);
 		pm.dim().des += dim.height();
 	} while (first < par.size());
 
@@ -460,9 +461,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	// 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;
+		Dimension dim = rowHeight(pit, first, first);
 		dim.wid = rowWidth(right_margin, pit, first, first);
-		boost::tie(dim.asc, dim.des) = rowHeight(pit, first, first);
 		if (row_index == pm.rows().size())
 			pm.rows().push_back(Row());
 		Row & row = pm.rows()[row_index];
@@ -470,8 +470,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		row.pos(first);
 		row.endpos(first);
 		row.setDimension(dim);
-		computeRowMetrics(pit, row);
-		pm.computeRowSignature(row, bparams);
+		int const max_row_width = max(dim_.wid, dim.wid);
+		computeRowMetrics(pit, row, max_row_width);
 		pm.dim().des += dim.height();
 	}
 
@@ -485,17 +485,15 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 
 
 void TextMetrics::computeRowMetrics(pit_type const pit,
-		Row & row) const
+		Row & row, int width) const
 {
-
 	row.label_hfill = 0;
-	row.hfill = 0;
 	row.separator = 0;
 
 	Buffer & buffer = bv_->buffer();
 	Paragraph const & par = text_->getPar(pit);
 
-	double w = dim_.wid - row.width();
+	double w = width - row.width();
 	// FIXME: put back this assertion when the crash on new doc is solved.
 	//BOOST_ASSERT(w >= 0);
 
@@ -510,10 +508,10 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 		row.x = leftMargin(max_width_, pit, row.pos());
 
 	// is there a manual margin with a manual label
-	LayoutPtr const & layout = par.layout();
+	Layout const & layout = par.layout();
 
-	if (layout->margintype == MARGIN_MANUAL
-	    && layout->labeltype == LABEL_MANUAL) {
+	if (layout.margintype == MARGIN_MANUAL
+	    && layout.labeltype == LABEL_MANUAL) {
 		/// We might have real hfills in the label part
 		int nlh = numberOfLabelHfills(par, row);
 
@@ -529,12 +527,11 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			row.label_hfill = labelFill(pit, row) / double(nlh);
 	}
 
+	double hfill = 0;
 	// are there any hfills in the row?
-	int const nh = numberOfHfills(par, row);
-
-	if (nh) {
+	if (int const nh = numberOfHfills(par, row)) {
 		if (w > 0)
-			row.hfill = w / nh;
+			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!
@@ -543,29 +540,24 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 		// set x how you need it
 		int align;
 		if (par.params().align() == LYX_ALIGN_LAYOUT)
-			align = layout->align;
+			align = layout.align;
 		else
 			align = par.params().align();
 
 		// Display-style insets should always be on a centred row
-		// The test on par.size() is to catch zero-size pars, which
-		// would trigger the assert in Paragraph::getInset().
-		//inset = par.size() ? par.getInset(row.pos()) : 0;
-		if (row.pos() < par.size()
-		    && par.isInset(row.pos()))
-		{
-		    switch(par.getInset(row.pos())->display()) {
-			case Inset::AlignLeft:
-				align = LYX_ALIGN_BLOCK;
-				break;
-			case Inset::AlignCenter:
-				align = LYX_ALIGN_CENTER;
-				break;
-                        case Inset::Inline:
-                        case Inset::AlignRight:
-                                // unchanged (use align)
-                                break;
-                    }
+		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:
+				case Inset::AlignRight:
+					// unchanged (use align)
+					break;
+			}
 		}
 
 		switch (align) {
@@ -609,12 +601,36 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 		if (body_pos > 0
 		    && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
 		{
-			row.x += theFontMetrics(text_->getLabelFont(buffer, par)).
-				width(layout->labelsep);
+			row.x += theFontMetrics(text_->labelFont(buffer, par)).
+				width(layout.labelsep);
 			if (body_pos <= end)
 				row.x += row.label_hfill;
 		}
 	}
+
+	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 = 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() != HFILL_CODE)
+			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);
+	}
 }
 
 
@@ -642,16 +658,14 @@ int TextMetrics::labelFill(pit_type const pit, Row const & row) const
 		return 0;
 
 	FontMetrics const & fm
-		= theFontMetrics(text_->getLabelFont(buffer, par));
+		= theFontMetrics(text_->labelFont(buffer, par));
 
 	return max(0, fm.width(label) - w);
 }
 
 
-namespace {
-
 // this needs special handling - only newlines count as a break point
-pos_type addressBreakPoint(pos_type i, Paragraph const & par)
+static pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 {
 	pos_type const end = par.size();
 
@@ -662,13 +676,11 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 	return end;
 }
 
-};
-
 
 int TextMetrics::labelEnd(pit_type const pit) const
 {
 	// labelEnd is only needed if the layout fills a flushleft label.
-	if (text_->getPar(pit).layout()->margintype != MARGIN_MANUAL)
+	if (text_->getPar(pit).layout().margintype != MARGIN_MANUAL)
 		return 0;
 	// return the beginning of the body
 	return leftMargin(max_width_, pit);
@@ -685,13 +697,22 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 	if (pos == end || width < 0)
 		return end;
 
-	LayoutPtr const & layout = par.layout();
+	Layout const & layout = par.layout();
 
-	if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX)
+	if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX)
 		return addressBreakPoint(pos, par);
 
 	pos_type const body_pos = par.beginOfBody();
 
+	// 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;
+	}
 
 	// Now we iterate through until we reach the right margin
 	// or the end of the par, then choose the possible break
@@ -710,15 +731,22 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 	for ( ; i < end; ++i, ++fi) {
 		int thiswidth = pm.singleWidth(i, *fi);
 
+		// add inline completion width
+		if (inlineCompletionLPos == i) {
+			docstring const & completion = bv_->inlineCompletion();
+			if (completion.length() > 0)
+				thiswidth += theFontMetrics(*fi).width(completion);
+		}
+
 		// add the auto-hfill from label end to the body
 		if (body_pos && i == body_pos) {
 			FontMetrics const & fm = theFontMetrics(
-				text_->getLabelFont(buffer, par));
-			int add = fm.width(layout->labelsep);
+				text_->labelFont(buffer, par));
+			int add = fm.width(layout.labelsep);
 			if (par.isLineSeparator(i - 1))
 				add -= singleWidth(pit, i - 1);
 
-			add = std::max(add, label_end - x);
+			add = max(add, label_end - x);
 			thiswidth += add;
 		}
 
@@ -734,7 +762,6 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 					point = i;
 				else
 					point = i + 1;
-
 			}
 			// exit on last registered breakpoint:
 			break;
@@ -744,20 +771,22 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 			point = i + 1;
 			break;
 		}
+		Inset const * inset = 0;
 		// Break before...
 		if (i + 1 < end) {
-			if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
+			if ((inset = par.getInset(i + 1)) && inset->display()) {
 				point = i + 1;
 				break;
 			}
 			// ...and after.
-			if (par.isInset(i) && par.getInset(i)->display()) {
+			if ((inset = par.getInset(i)) && inset->display()) {
 				point = i + 1;
 				break;
 			}
 		}
 
-		if (!par.isInset(i) || par.getInset(i)->isChar()) {
+		inset = par.getInset(i);
+		if (!inset || inset->isChar()) {
 			// some insets are line separators too
 			if (par.isLineSeparator(i)) {
 				// register breakpoint:
@@ -791,6 +820,16 @@ int TextMetrics::rowWidth(int right_margin, pit_type const 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;
+	}
+
 	pos_type const body_pos = par.beginOfBody();
 	pos_type i = first;
 
@@ -799,20 +838,27 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 		for ( ; i < end; ++i, ++fi) {
 			if (body_pos > 0 && i == body_pos) {
 				FontMetrics const & fm = theFontMetrics(
-					text_->getLabelFont(buffer, par));
-				w += fm.width(par.layout()->labelsep);
+					text_->labelFont(buffer, par));
+				w += fm.width(par.layout().labelsep);
 				if (par.isLineSeparator(i - 1))
 					w -= singleWidth(pit, i - 1);
 				w = max(w, label_end);
 			}
 			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);
+			}
 		}
 	}
 
 	if (body_pos > 0 && body_pos >= end) {
 		FontMetrics const & fm = theFontMetrics(
-			text_->getLabelFont(buffer, par));
-		w += fm.width(par.layout()->labelsep);
+			text_->labelFont(buffer, par));
+		w += fm.width(par.layout().labelsep);
 		if (end > 0 && par.isLineSeparator(end - 1))
 			w -= singleWidth(pit, end - 1);
 		w = max(w, label_end);
@@ -822,8 +868,8 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 }
 
 
-boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const first,
-		pos_type const end) const
+Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
+		pos_type const end, bool topBottomSpace) const
 {
 	Paragraph const & par = text_->getPar(pit);
 	// get the maximum ascent and the maximum descent
@@ -834,38 +880,40 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 	// 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 :)
-	LayoutPtr const & layout = par.layout();
+	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 = getDisplayFont(pit, first);
-	Font::FONT_SIZE const tmpsize = font.size();
-	font = text_->getLayoutFont(buffer, pit);
-	Font::FONT_SIZE const size = font.size();
-	font.setSize(tmpsize);
+	Font font = displayFont(pit, first);
+	FontSize const tmpsize = font.fontInfo().size();
+	font.fontInfo() = text_->layoutFont(buffer, pit);
+	FontSize const size = font.fontInfo().size();
+	font.fontInfo().setSize(tmpsize);
 
-	Font labelfont = text_->getLabelFont(buffer, par);
+	FontInfo labelfont = text_->labelFont(buffer, par);
 
 	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 	FontMetrics const & fontmetrics = theFontMetrics(font);
 
 	// these are minimum values
-	double const spacing_val = layout->spacing.getValue()
+	double const spacing_val = layout.spacing.getValue()
 		* text_->spacing(buffer, 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
-	InsetList::const_iterator ii = par.insetlist.begin();
-	InsetList::const_iterator iend = par.insetlist.end();
+	ParagraphMetrics const & pm = par_metrics_[pit];
+	InsetList::const_iterator ii = par.insetList().begin();
+	InsetList::const_iterator iend = par.insetList().end();
 	for ( ; ii != iend; ++ii) {
+		Dimension const & dim = pm.insetDimension(ii->inset);
 		if (ii->pos >= first && ii->pos < end) {
-			maxasc  = max(maxasc,  ii->inset->ascent());
-			maxdesc = max(maxdesc, ii->inset->descent());
+			maxasc  = max(maxasc,  dim.ascent());
+			maxdesc = max(maxdesc, dim.descent());
 		}
 	}
 
@@ -874,11 +922,11 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 	// cosmetic error for now.
 	int labeladdon = 0;
 
-	Font::FONT_SIZE maxsize =
+	FontSize maxsize =
 		par.highestFontInRange(first, end, size);
-	if (maxsize > font.size()) {
+	if (maxsize > font.fontInfo().size()) {
 		// use standard paragraph font with the maximal size
-		Font maxfont = font;
+		FontInfo maxfont = font.fontInfo();
 		maxfont.setSize(maxsize);
 		FontMetrics const & maxfontmetrics = theFontMetrics(maxfont);
 		maxasc  = max(maxasc,  maxfontmetrics.maxAscent());
@@ -892,16 +940,16 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 	ParagraphList const & pars = text_->paragraphs();
 
 	// is it a top line?
-	if (first == 0) {
+	if (first == 0 && topBottomSpace) {
 		BufferParams const & bufparams = buffer.params();
 		// some parskips VERY EASY IMPLEMENTATION
 		if (bufparams.paragraph_separation
 		    == BufferParams::PARSEP_SKIP
-			&& par.ownerCode() != Inset::ERT_CODE
-			&& par.ownerCode() != Inset::LISTINGS_CODE
+			&& par.ownerCode() != ERT_CODE
+			&& par.ownerCode() != LISTINGS_CODE
 			&& pit > 0
-			&& ((layout->isParagraph() && par.getDepth() == 0)
-			    || (pars[pit - 1].layout()->isParagraph()
+			&& ((layout.isParagraph() && par.getDepth() == 0)
+			    || (pars[pit - 1].layout().isParagraph()
 				&& pars[pit - 1].getDepth() == 0)))
 		{
 				maxasc += bufparams.getDefSkip().inPixels(*bv_);
@@ -912,25 +960,25 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 
 		// This is special code for the chapter, since the label of this
 		// layout is printed in an extra row
-		if (layout->counter == "chapter"
+		if (layout.counter == "chapter"
 		    && !par.params().labelString().empty()) {
 			labeladdon = int(labelfont_metrics.maxHeight()
-				     * layout->spacing.getValue()
+				     * layout.spacing.getValue()
 				     * text_->spacing(buffer, par));
 		}
 
 		// special code for the top label
-		if ((layout->labeltype == LABEL_TOP_ENVIRONMENT
-		     || layout->labeltype == LABEL_BIBLIO
-		     || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
+		if ((layout.labeltype == LABEL_TOP_ENVIRONMENT
+		     || layout.labeltype == LABEL_BIBLIO
+		     || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
 		    && isFirstInSequence(pit, pars)
-		    && !par.getLabelstring().empty())
+		    && !par.labelString().empty())
 		{
 			labeladdon = int(
 				  labelfont_metrics.maxHeight()
-					* layout->spacing.getValue()
+					* layout.spacing.getValue()
 					* text_->spacing(buffer, par)
-				+ (layout->topsep + layout->labelbottomsep) * dh);
+				+ (layout.topsep + layout.labelbottomsep) * dh);
 		}
 
 		// Add the layout spaces, for example before and after
@@ -944,26 +992,26 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 		    && prevpar.getDepth() == par.getDepth()
 		    && prevpar.getLabelWidthString()
 					== par.getLabelWidthString()) {
-			layoutasc = layout->itemsep * dh;
+			layoutasc = layout.itemsep * dh;
 		} else if (pit != 0 || first != 0) {
-			if (layout->topsep > 0)
-				layoutasc = layout->topsep * dh;
+			if (layout.topsep > 0)
+				layoutasc = layout.topsep * dh;
 		}
 
 		prev = outerHook(pit, pars);
 		if (prev != pit_type(pars.size())) {
-			maxasc += int(pars[prev].layout()->parsep * dh);
+			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);
+				maxasc += int(layout.parsep * dh);
 			}
 		}
 	}
 
 	// is it a bottom line?
-	if (end >= par.size()) {
+	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
@@ -974,18 +1022,18 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 			double unusual = 0;
 
 			if (pars[cpit].getDepth() > pars[nextpit].getDepth()) {
-				usual = pars[cpit].layout()->bottomsep * dh;
+				usual = pars[cpit].layout().bottomsep * dh;
 				cpit = depthHook(cpit, pars, pars[nextpit].getDepth());
 				if (pars[cpit].layout() != pars[nextpit].layout()
 					|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
 				{
-					unusual = pars[cpit].layout()->bottomsep * dh;
+					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);
+					layoutdesc = int(pars[cpit].layout().bottomsep * dh);
 			}
 		}
 	}
@@ -998,7 +1046,7 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 	// 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_) {
+	if (main_text_ && topBottomSpace) {
 		if (pit == 0 && first == 0)
 			maxasc += 20;
 		if (pit + 1 == pit_type(pars.size()) &&
@@ -1007,7 +1055,7 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 			maxdesc += 20;
 	}
 
-	return boost::make_tuple(maxasc + labeladdon, maxdesc);
+	return Dimension(0, maxasc + labeladdon, maxdesc);
 }
 
 
@@ -1025,14 +1073,13 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 	int const xo = origin_.x_;
 	x -= xo;
 	Paragraph const & par = text_->getPar(pit);
-	ParagraphMetrics const & pm = par_metrics_[pit];
 	Bidi bidi;
 	bidi.computeTables(par, buffer, row);
 
 	pos_type vc = row.pos();
 	pos_type end = row.endpos();
 	pos_type c = 0;
-	LayoutPtr const & layout = par.layout();
+	Layout const & layout = par.layout();
 
 	bool left_side = false;
 
@@ -1056,25 +1103,15 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 		last_tmpx = tmpx;
 		if (body_pos > 0 && c == body_pos - 1) {
 			FontMetrics const & fm = theFontMetrics(
-				text_->getLabelFont(buffer, par));
-			tmpx += row.label_hfill + fm.width(layout->labelsep);
+				text_->labelFont(buffer, par));
+			tmpx += row.label_hfill + fm.width(layout.labelsep);
 			if (par.isLineSeparator(body_pos - 1))
 				tmpx -= singleWidth(pit, body_pos - 1);
 		}
 
-		if (pm.hfillExpansion(row, c)) {
-			tmpx += singleWidth(pit, c);
-			if (c >= body_pos)
-				tmpx += row.hfill;
-			else
-				tmpx += row.label_hfill;
-		} else if (par.isSeparator(c)) {
-			tmpx += singleWidth(pit, c);
-			if (c >= body_pos)
+		tmpx += singleWidth(pit, c);
+		if (par.isSeparator(c) && c >= body_pos)
 				tmpx += row.separator;
-		} else {
-			tmpx += singleWidth(pit, c);
-		}
 		++vc;
 	}
 
@@ -1095,9 +1132,10 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 	bool const rtl = lastrow ? text_->isRTL(buffer, par) : false;
 	if (lastrow &&
 	    ((rtl  &&  left_side && vc == row.pos() && x < tmpx - 5) ||
-	     (!rtl && !left_side && vc == end  && x > tmpx + 5)))
-		c = end;
-	else if (vc == row.pos()) {
+	     (!rtl && !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;
@@ -1172,13 +1210,13 @@ void TextMetrics::newParMetricsDown()
 {
 	pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
 	pit_type const pit = last.first + 1;
-	if (pit == text_->paragraphs().size())
+	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());
+		+ last.second.descent() + par_metrics_[pit].ascent());
 }
 
 
@@ -1192,20 +1230,17 @@ void TextMetrics::newParMetricsUp()
 	// do it and update its position.
 	redoParagraph(pit);
 	par_metrics_[pit].setPosition(first.second.position()
-		- first.second.ascent());
+		- first.second.ascent() - par_metrics_[pit].descent());
 }
 
 // y is screen coordinate
 pit_type TextMetrics::getPitNearY(int y)
 {
 	BOOST_ASSERT(!text_->paragraphs().empty());
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": y: " << y << " cache size: " << par_metrics_.size()
-		<< endl;
+	LYXERR(Debug::DEBUG, "y: " << y << " cache size: " << par_metrics_.size());
 
 	// look for highest numbered paragraph with y coordinate less than given y
-	pit_type pit = 0;
+	pit_type pit = -1;
 	int yy = -1;
 	ParMetricsCache::const_iterator it = par_metrics_.begin();
 	ParMetricsCache::const_iterator et = par_metrics_.end();
@@ -1213,44 +1248,37 @@ pit_type TextMetrics::getPitNearY(int y)
 
 	ParagraphMetrics const & pm = it->second;
 
-	// If we are off-screen (before the visible part)
-	if (y < 0
-		// and even before the first paragraph in the cache.
-		&& y < it->second.position() - int(pm.ascent())) {
-		//  and we are not at the first paragraph in the inset.
+	if (y < it->second.position() - int(pm.ascent())) {
+		// We are looking for a position that is before the first paragraph in
+		// the cache (which is in priciple off-screen, that is before the
+		// visible part.
 		if (it->first == 0)
+			// We are already at the first paragraph in the inset.
 			return 0;
-		// then this is the paragraph we are looking for.
+		// OK, this is the paragraph we are looking for.
 		pit = it->first - 1;
-		// rebreak it and update the CoordCache.
-		redoParagraph(pit);
-		par_metrics_[pit].setPosition(it->second.position() - pm.descent());
+		newParMetricsUp();
 		return pit;
 	}
 
 	ParagraphMetrics const & pm_last = par_metrics_[last->first];
 
-	// If we are off-screen (after the visible part)
-	if (y > bv_->workHeight()
-		// and even after the first paragraph in the cache.
-		&& y >= last->second.position() + int(pm_last.descent())) {
+	if (y >= last->second.position() + int(pm_last.descent())) {
+		// We are looking for a position that is after the last paragraph in
+		// the cache (which is in priciple off-screen, that is before the
+		// visible part.
 		pit = last->first + 1;
-		//  and we are not at the last paragraph in the inset.
 		if (pit == int(text_->paragraphs().size()))
+			//  We are already at the last paragraph in the inset.
 			return last->first;
-		// then this is the paragraph we are looking for.
-		// rebreak it and update the CoordCache.
-		redoParagraph(pit);
-		par_metrics_[pit].setPosition(last->second.position() + pm_last.ascent());
+		// OK, this is the paragraph we are looking for.
+		newParMetricsDown();
 		return pit;
 	}
 
 	for (; it != et; ++it) {
-		LYXERR(Debug::DEBUG)
-			<< BOOST_CURRENT_FUNCTION
-			<< "  examining: pit: " << it->first
-			<< " y: " << it->second.position()
-			<< endl;
+		LYXERR(Debug::DEBUG, "examining: pit: " << it->first
+			<< " y: " << it->second.position());
 
 		ParagraphMetrics const & pm = par_metrics_[it->first];
 
@@ -1260,10 +1288,7 @@ pit_type TextMetrics::getPitNearY(int y)
 		}
 	}
 
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": found best y: " << yy << " for pit: " << pit
-		<< endl;
+	LYXERR(Debug::DEBUG, "found best y: " << yy << " for pit: " << pit);
 
 	return pit;
 }
@@ -1276,7 +1301,8 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
 	int yy = pm.position() - pm.ascent();
 	BOOST_ASSERT(!pm.rows().empty());
 	RowList::const_iterator rit = pm.rows().begin();
-	RowList::const_iterator const rlast = boost::prior(pm.rows().end());
+	RowList::const_iterator rlast = pm.rows().end();
+	--rlast;
 	for (; rit != rlast; yy += rit->height(), ++rit)
 		if (yy + rit->height() > y)
 			break;
@@ -1289,7 +1315,7 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
 Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
 {
 	if (lyxerr.debugging(Debug::WORKAREA)) {
-		lyxerr << "TextMetrics::editXY(cur, " << x << ", " << y << ")" << std::endl;
+		LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
 		cur.bv().coordCache().dump();
 	}
 	pit_type pit = getPitNearY(y);
@@ -1351,12 +1377,8 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 	ParagraphMetrics const & pm = par_metrics_[pit];
 
 	int yy = pm.position() - pm.ascent();
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": x: " << x
-		<< " y: " << y
-		<< " pit: " << pit
-		<< " yy: " << yy << endl;
+	LYXERR(Debug::DEBUG, "x: " << x << " y: " << y <<
+		" pit: " << pit << " yy: " << yy);
 
 	int r = 0;
 	BOOST_ASSERT(pm.rows().size());
@@ -1369,21 +1391,13 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 
 	Row const & row = pm.rows()[r];
 
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": row " << r
-		<< " from pos: " << row.pos()
-		<< endl;
+	LYXERR(Debug::DEBUG, "row " << r << " from pos: " << row.pos());
 
 	bool bound = false;
 	int xx = x;
 	pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
 
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": setting cursor pit: " << pit
-		<< " pos: " << pos
-		<< endl;
+	LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos);
 
 	text_->setCursor(cur, pit, pos, true, bound);
 	// remember new position.
@@ -1398,46 +1412,38 @@ Inset * TextMetrics::checkInsetHit(int x, int y)
 	BOOST_ASSERT(pit != -1);
 
 	Paragraph const & par = text_->paragraphs()[pit];
+	ParagraphMetrics const & pm = par_metrics_[pit];
 
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": x: " << x
-		<< " y: " << y
-		<< "  pit: " << pit
-		<< endl;
-	InsetList::const_iterator iit = par.insetlist.begin();
-	InsetList::const_iterator iend = par.insetlist.end();
+	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;
-#if 1
-		LYXERR(Debug::DEBUG)
-			<< BOOST_CURRENT_FUNCTION
-			<< ": examining inset " << inset << endl;
-
-		if (bv_->coordCache().getInsets().has(inset))
-			LYXERR(Debug::DEBUG)
-				<< BOOST_CURRENT_FUNCTION
-				<< ": xo: " << inset->xo(*bv_) << "..."
-				<< inset->xo(*bv_) + inset->width()
-				<< " yo: " << inset->yo(*bv_) - inset->ascent()
-				<< "..."
-				<< inset->yo(*bv_) + inset->descent()
-				<< endl;
-		else
-			LYXERR(Debug::DEBUG)
-				<< BOOST_CURRENT_FUNCTION
-				<< ": inset has no cached position" << endl;
-#endif
-		if (inset->covers(*bv_, x, y)) {
-			LYXERR(Debug::DEBUG)
-				<< BOOST_CURRENT_FUNCTION
-				<< ": Hit inset: " << inset << endl;
+
+		LYXERR(Debug::DEBUG, "examining inset " << inset);
+
+		if (!bv_->coordCache().getInsets().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);
+
+		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) {
+			LYXERR(Debug::DEBUG, "Hit inset: " << inset);
 			return inset;
 		}
 	}
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": No inset hit. " << endl;
+
+	LYXERR(Debug::DEBUG, "No inset hit. ");
 	return 0;
 }
 
@@ -1494,6 +1500,18 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 	    (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;
@@ -1503,6 +1521,15 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 	if (end > 0 && end < par.size() && par.isSeparator(end - 1))
 		skipped_sep_vpos = bidi.log2vis(end - 1);
 	
+	// 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)
@@ -1510,8 +1537,8 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 		pos_type pos = bidi.vis2log(vpos);
 		if (body_pos > 0 && pos == body_pos - 1) {
 			FontMetrics const & labelfm = theFontMetrics(
-				text_->getLabelFont(buffer, par));
-			x += row.label_hfill + labelfm.width(par.layout()->labelsep);
+				text_->labelFont(buffer, par));
+			x += row.label_hfill + labelfm.width(par.layout().labelsep);
 			if (par.isLineSeparator(body_pos - 1))
 				x -= singleWidth(pit, body_pos - 1);
 		}
@@ -1519,14 +1546,32 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 		// Use font span to speed things up, see above
 		if (pos < font_span.first || pos > font_span.last) {
 			font_span = par.fontSpan(pos);
-			font = getDisplayFont(pit, pos);
+			font = displayFont(pit, pos);
 		}
 
 		x += pm.singleWidth(pos, font);
 
-		if (pm.hfillExpansion(row, pos))
-			x += (pos >= body_pos) ? row.hfill : row.label_hfill;
-		else if (par.isSeparator(pos) && pos >= body_pos)
+		// 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);
+		}
+		
+		//  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;
 	}
 
@@ -1544,7 +1589,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 
 int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
 {
-	//lyxerr << "TextMetrics::cursorY: boundary: " << boundary << std::endl;
+	//lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl;
 	ParagraphMetrics const & pm = par_metrics_[sl.pit()];
 	if (pm.rows().empty())
 		return 0;
@@ -1565,45 +1610,6 @@ int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
 }
 
 
-void TextMetrics::cursorPrevious(Cursor & cur)
-{
-	pos_type cpos = cur.pos();
-	pit_type cpar = cur.pit();
-
-	int x = cur.x_target();
-	setCursorFromCoordinates(cur, x, 0);
-	cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
-
-	if (cpar == cur.pit() && cpos == cur.pos())
-		// we have a row which is taller than the workarea. The
-		// simplest solution is to move to the previous row instead.
-		cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
-
-	finishUndo();
-	cur.updateFlags(Update::Force | Update::FitCursor);
-}
-
-
-void TextMetrics::cursorNext(Cursor & cur)
-{
-	pos_type cpos = cur.pos();
-	pit_type cpar = cur.pit();
-
-	int x = cur.x_target();
-	setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
-	cur.dispatch(FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
-
-	if (cpar == cur.pit() && cpos == cur.pos())
-		// we have a row which is taller than the workarea. The
-		// simplest solution is to move to the next row instead.
-		cur.dispatch(
-			FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
-
-	finishUndo();
-	cur.updateFlags(Update::Force | Update::FitCursor);
-}
-
-
 // the cursor set functions have a special mechanism. When they
 // realize you left an empty paragraph, they will delete it.
 
@@ -1642,8 +1648,8 @@ void TextMetrics::deleteLineForward(Cursor & cur)
 {
 	BOOST_ASSERT(text_ == cur.text());
 	if (cur.lastpos() == 0) {
-		// Paragraph is empty, so we just go to the right
-		text_->cursorRight(cur);
+		// Paragraph is empty, so we just go forward
+		text_->cursorForward(cur);
 	} else {
 		cur.resetAnchor();
 		cur.selection() = true; // to avoid deletion
@@ -1654,7 +1660,7 @@ void TextMetrics::deleteLineForward(Cursor & cur)
 			text_->deleteWordForward(cur);
 		else
 			cap::cutSelection(cur, true, false);
-		checkBufferStructure(cur.buffer(), cur);
+		cur.checkBufferStructure();
 	}
 }
 
@@ -1693,15 +1699,15 @@ int TextMetrics::leftMargin(int max_width,
 	BOOST_ASSERT(pos <= par.size());
 	Buffer const & buffer = bv_->buffer();
 	//lyxerr << "TextMetrics::leftMargin: pit: " << pit << " pos: " << pos << endl;
-	TextClass const & tclass = buffer.params().getTextClass();
-	LayoutPtr const & layout = par.layout();
+	DocumentClass const & tclass = buffer.params().documentClass();
+	Layout const & layout = par.layout();
 
-	docstring parindent = layout->parindent;
+	docstring parindent = layout.parindent;
 
 	int l_margin = 0;
 
 	if (text_->isMainText(buffer))
-		l_margin += changebarMargin();
+		l_margin += bv_->leftMargin();
 
 	l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
 		tclass.leftmargin());
@@ -1710,14 +1716,15 @@ int TextMetrics::leftMargin(int max_width,
 		// find the next level paragraph
 		pit_type newpar = outerHook(pit, pars);
 		if (newpar != pit_type(pars.size())) {
-			if (pars[newpar].layout()->isEnvironment()) {
+			if (pars[newpar].layout().isEnvironment()) {
 				l_margin = leftMargin(max_width, newpar);
 			}
-			if (par.layout() == tclass.defaultLayout()) {
+			if (tclass.isDefaultLayout(par.layout()) 
+			    || tclass.isEmptyLayout(par.layout())) {
 				if (pars[newpar].params().noindent())
 					parindent.erase();
 				else
-					parindent = pars[newpar].layout()->parindent;
+					parindent = pars[newpar].layout().parindent;
 			}
 		}
 	}
@@ -1725,34 +1732,34 @@ int TextMetrics::leftMargin(int max_width,
 	// This happens after sections in standard classes. The 1.3.x
 	// code compared depths too, but it does not seem necessary
 	// (JMarc)
-	if (par.layout() == tclass.defaultLayout()
-	    && pit > 0 && pars[pit - 1].layout()->nextnoindent)
+	if (tclass.isDefaultLayout(par.layout())
+	    && pit > 0 && pars[pit - 1].layout().nextnoindent)
 		parindent.erase();
 
-	Font const labelfont = text_->getLabelFont(buffer, par);
+	FontInfo const labelfont = text_->labelFont(buffer, par);
 	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 
-	switch (layout->margintype) {
+	switch (layout.margintype) {
 	case MARGIN_DYNAMIC:
-		if (!layout->leftmargin.empty()) {
+		if (!layout.leftmargin.empty()) {
 			l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-				layout->leftmargin);
+				layout.leftmargin);
 		}
-		if (!par.getLabelstring().empty()) {
-			l_margin += labelfont_metrics.signedWidth(layout->labelindent);
-			l_margin += labelfont_metrics.width(par.getLabelstring());
-			l_margin += labelfont_metrics.width(layout->labelsep);
+		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);
 		}
 		break;
 
 	case MARGIN_MANUAL: {
-		l_margin += labelfont_metrics.signedWidth(layout->labelindent);
+		l_margin += labelfont_metrics.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 += labelfont_metrics.width(layout.labelsep);
 			}
 		}
 		break;
@@ -1760,31 +1767,31 @@ int TextMetrics::leftMargin(int max_width,
 
 	case MARGIN_STATIC: {
 		l_margin += theFontMetrics(buffer.params().getFont()).
-			signedWidth(layout->leftmargin) * 4	/ (par.getDepth() + 4);
+			signedWidth(layout.leftmargin) * 4	/ (par.getDepth() + 4);
 		break;
 	}
 
 	case MARGIN_FIRST_DYNAMIC:
-		if (layout->labeltype == LABEL_MANUAL) {
+		if (layout.labeltype == LABEL_MANUAL) {
 			if (pos >= par.beginOfBody()) {
-				l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
+				l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
 			} else {
-				l_margin += labelfont_metrics.signedWidth(layout->labelindent);
+				l_margin += labelfont_metrics.signedWidth(layout.labelindent);
 			}
 		} else if (pos != 0
 			   // Special case to fix problems with
 			   // theorems (JMarc)
-			   || (layout->labeltype == LABEL_STATIC
-			       && layout->latextype == LATEX_ENVIRONMENT
+			   || (layout.labeltype == LABEL_STATIC
+			       && layout.latextype == LATEX_ENVIRONMENT
 			       && !isFirstInSequence(pit, pars))) {
-			l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
-		} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
-			   && layout->labeltype != LABEL_BIBLIO
-			   && layout->labeltype !=
+			l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
+		} else if (layout.labeltype != LABEL_TOP_ENVIRONMENT
+			   && layout.labeltype != LABEL_BIBLIO
+			   && layout.labeltype !=
 			   LABEL_CENTERED_TOP_ENVIRONMENT) {
-			l_margin += labelfont_metrics.signedWidth(layout->labelindent);
-			l_margin += labelfont_metrics.width(layout->labelsep);
-			l_margin += labelfont_metrics.width(par.getLabelstring());
+			l_margin += labelfont_metrics.signedWidth(layout.labelindent);
+			l_margin += labelfont_metrics.width(layout.labelsep);
+			l_margin += labelfont_metrics.width(par.labelString());
 		}
 		break;
 
@@ -1799,7 +1806,7 @@ int TextMetrics::leftMargin(int max_width,
 		for ( ; rit != end; ++rit)
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
-		l_margin += theFontMetrics(params.getFont()).signedWidth(layout->leftmargin);
+		l_margin += theFontMetrics(params.getFont()).signedWidth(layout.leftmargin);
 		l_margin += minfill;
 #endif
 		// also wrong, but much shorter.
@@ -1814,29 +1821,30 @@ int TextMetrics::leftMargin(int max_width,
 	LyXAlignment align;
 
 	if (par.params().align() == LYX_ALIGN_LAYOUT)
-		align = layout->align;
+		align = layout.align;
 	else
 		align = par.params().align();
 
 	// set the correct parindent
 	if (pos == 0
-	    && (layout->labeltype == LABEL_NO_LABEL
-	       || layout->labeltype == LABEL_TOP_ENVIRONMENT
-	       || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
-	       || (layout->labeltype == LABEL_STATIC
-		   && layout->latextype == LATEX_ENVIRONMENT
-		   && !isFirstInSequence(pit, pars)))
+	    && (layout.labeltype == LABEL_NO_LABEL
+	       || layout.labeltype == LABEL_TOP_ENVIRONMENT
+	       || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
+	       || (layout.labeltype == LABEL_STATIC
+	           && layout.latextype == LATEX_ENVIRONMENT
+	           && !isFirstInSequence(pit, pars)))
 	    && align == LYX_ALIGN_BLOCK
 	    && !par.params().noindent()
 	    // in some insets, paragraphs are never indented
-	    && !(par.inInset() && par.inInset()->neverIndent(buffer))
+	    && !(par.inInset() && par.inInset()->neverIndent())
 	    // display style insets are always centered, omit indentation
 	    && !(!par.empty()
 		    && par.isInset(pos)
 		    && par.getInset(pos)->display())
-	    && (par.layout() != tclass.defaultLayout()
-		|| buffer.params().paragraph_separation ==
-		   BufferParams::PARSEP_INDENT))
+			&& ((tclass.isDefaultLayout(par.layout()) 
+	         || tclass.isEmptyLayout(par.layout()))
+	        || buffer.params().paragraph_separation == BufferParams::PARSEP_INDENT)
+	    )
 	{
 		l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
 			parindent);
@@ -1850,11 +1858,10 @@ int TextMetrics::singleWidth(pit_type pit, pos_type pos) const
 {
 	ParagraphMetrics const & pm = par_metrics_[pit];
 
-	return pm.singleWidth(pos, getDisplayFont(pit, pos));
+	return pm.singleWidth(pos, displayFont(pit, pos));
 }
 
 
-// only used for inset right now. should also be used for main text
 void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 {
 	if (par_metrics_.empty())
@@ -1880,73 +1887,99 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 
 void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const
 {
-//	lyxerr << "  paintPar: pit: " << pit << " at y: " << y << endl;
-	int const ww = bv_->workHeight();
-
+	BufferParams const & bparams = bv_->buffer().params();
 	ParagraphMetrics const & pm = par_metrics_[pit];
 	if (pm.rows().empty())
 		return;
 
-	RowList::const_iterator const rb = pm.rows().begin();
-	RowList::const_iterator const re = pm.rows().end();
-
 	Bidi bidi;
+	bool const original_drawing_state = pi.pain.isDrawingEnabled();
+	int const ww = bv_->workHeight();
+	size_t const nrows = pm.rows().size();
+
+	Cursor const & cur = bv_->cursor();
+	DocIterator sel_beg = cur.selectionBegin();
+	DocIterator sel_end = cur.selectionEnd();
+	bool selection = cur.selection()
+		// This is our text.
+		&& cur.text() == text_
+		// if the anchor is outside, this is not our selection 
+		&& cur.anchor().text() == text_
+		&& pit >= sel_beg.pit() && pit <= sel_end.pit();
+
+	// We care only about visible selection.
+	if (selection) {
+		if (pit != sel_beg.pit()) {
+			sel_beg.pit() = pit;
+			sel_beg.pos() = 0;
+		}
+		if (pit != sel_end.pit()) {
+			sel_end.pit() = pit;
+			sel_end.pos() = sel_end.lastpos();
+		}
+	}
+
+	for (size_t i = 0; i != nrows; ++i) {
 
-	y -= rb->ascent();
-	for (RowList::const_iterator rit = rb; rit != re; ++rit) {
-		y += rit->ascent();
+		Row const & row = pm.rows()[i];
+		if (i)
+			y += row.ascent();
 
-		bool const inside = (y + rit->descent() >= 0
-			&& y - rit->ascent() < ww);
-		// it is not needed to draw on screen if we are not inside.
-		pi.pain.setDrawingEnabled(inside);
-		RowPainter rp(pi, *text_, pit, *rit, bidi, x, y);
+		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);
+
+		if (selection)
+			row.setSelection(sel_beg.pos(), sel_end.pos());
+		else
+			row.setSelection(-1, -1);
 
 		// Row signature; has row changed since last paint?
-		bool row_has_changed = rit->changed();
+		row.setCrc(pm.computeRowSignature(row, bparams));
+		bool row_has_changed = row.changed();
 		
-		bool row_selection = rit->sel_beg != -1 && rit->sel_end != -1;
-
-		if (!row_selection && !pi.full_repaint && !row_has_changed) {
-			// Paint the only the insets if the text itself is
+		// 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) {
+			// Paint only the insets if the text itself is
 			// unchanged.
 			rp.paintOnlyInsets();
-			y += rit->descent();
+			y += row.descent();
 			continue;
 		}
 
-		// Paint the row if a full repaint has been requested or it has
-		// changed.
-		// Clear background of this row
-		// (if paragraph background was not cleared)
-		if (row_selection || (!pi.full_repaint && row_has_changed)) {
-			pi.pain.fillRectangle(x, y - rit->ascent(),
-				width(), rit->height(),
-				Color_color(Color::color(pi.background_color)));
+		// 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(),
+				width(), row.height(), pi.background_color);
 		}
+
+		bool row_selection = row.sel_beg != -1 && row.sel_end != -1;
 		if (row_selection) {
 			DocIterator beg = bv_->cursor().selectionBegin();
 			DocIterator end = bv_->cursor().selectionEnd();
+			bool const beg_margin = beg.pit() < pit && i == 0;
+			bool const end_margin = end.pit() > pit && i == nrows - 1;
 			beg.pit() = pit;
-			beg.pos() = rit->sel_beg;
-			if (pit == end.pit()) {
-				end.pos() = rit->sel_end;
-			} else {
-				end.pit() = pit + 1;
-				end.pos() = 0;
-			}
-			drawSelection(pi, beg, end, x);
+			beg.pos() = row.sel_beg;
+			end.pit() = pit;
+			end.pos() = row.sel_end;
+			drawRowSelection(pi, x, row, beg, end, beg_margin, end_margin);
 		}
 
 		// Instrumentation for testing row cache (see also
 		// 12 lines lower):
-		if (lyxerr.debugging(Debug::PAINTING)) {
-			if (text_->isMainText(bv_->buffer()))
-				LYXERR(Debug::PAINTING) << "\n{" <<
-				pi.full_repaint << row_has_changed << "}";
-			else
-				LYXERR(Debug::PAINTING) << "[" <<
-				pi.full_repaint << row_has_changed << "]";
+		if (lyxerr.debugging(Debug::PAINTING) && inside
+			&& (row_selection || pi.full_repaint || row_has_changed)) {
+				string const foreword = text_->isMainText(bv_->buffer()) ?
+					"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);
 		}
 
 		// Backup full_repaint status and force full repaint
@@ -1956,80 +1989,19 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 		rp.paintAppendix();
 		rp.paintDepthBar();
 		rp.paintChangeBar();
-		if (rit == rb)
+		if (i == 0)
 			rp.paintFirst();
 		rp.paintText();
-		if (rit + 1 == re)
+		if (i == nrows - 1)
 			rp.paintLast();
-		y += rit->descent();
+		y += row.descent();
 		// Restore full_repaint status.
 		pi.full_repaint = tmp;
 	}
 	// Re-enable screen drawing for future use of the painter.
-	pi.pain.setDrawingEnabled(true);
-
-	//LYXERR(Debug::PAINTING) << "." << endl;
-}
-
-
-// FIXME: only take care of one row!
-void TextMetrics::drawSelection(PainterInfo & pi,
-	DocIterator const & beg, DocIterator const & end, int x) const
-{
-	ParagraphMetrics const & pm1 = parMetrics(beg.pit());
-	ParagraphMetrics const & pm2 = parMetrics(end.pit());
-	Row const & row1 = pm1.getRow(beg.pos(), beg.boundary());
-	Row const & row2 = pm2.getRow(end.pos(), end.boundary());
-
-	// clip above
-	int middleTop;
-	bool const clipAbove = 
-		(bv_funcs::status(bv_, beg) == bv_funcs::CUR_ABOVE);
-	if (clipAbove)
-		middleTop = 0;
-	else
-		middleTop = bv_funcs::getPos(*bv_, beg, beg.boundary()).y_ + row1.descent();
-	
-	// clip below
-	int middleBottom;
-	bool const clipBelow = 
-		(bv_funcs::status(bv_, end) == bv_funcs::CUR_BELOW);
-	if (clipBelow)
-		middleBottom = bv_->workHeight();
-	else
-		middleBottom = bv_funcs::getPos(*bv_, end, end.boundary()).y_ - row2.ascent();
+	pi.pain.setDrawingEnabled(original_drawing_state);
 
-	// start and end in the same line?
-	if (!(clipAbove || clipBelow) && &row1 == &row2)
-		// then only draw this row's selection
-		drawRowSelection(pi, x, row1, beg, end, false, false);
-	else {
-		if (!clipAbove) {
-			// get row end
-			DocIterator begRowEnd = beg;
-			begRowEnd.pos() = row1.endpos();
-			begRowEnd.boundary(true);
-			
-			// draw upper rectangle
-			drawRowSelection(pi, x, row1, beg, begRowEnd, false, true);
-		}
-			
-		if (middleTop < middleBottom) {
-			// draw middle rectangle
-			pi.pain.fillRectangle(x, middleTop, width(), middleBottom - middleTop,
-				Color::selection);
-		}
-
-		if (!clipBelow) {
-			// get row begin
-			DocIterator endRowBeg = end;
-			endRowBeg.pos() = row2.pos();
-			endRowBeg.boundary(false);
-			
-			// draw low rectangle
-			drawRowSelection(pi, x, row2, endRowBeg, end, true, false);
-		}
-	}
+	//LYXERR(Debug::PAINTING, ".");
 }
 
 
@@ -2041,22 +2013,22 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 	DocIterator cur = beg;
 	int x1 = cursorX(beg.top(), beg.boundary());
 	int x2 = cursorX(end.top(), end.boundary());
-	int y1 = bv_funcs::getPos(*bv_, cur, cur.boundary()).y_ - row.ascent();
+	int y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
 	int y2 = y1 + row.height();
 	
 	// draw the margins
 	if (drawOnBegMargin) {
 		if (text_->isRTL(buffer, beg.paragraph()))
-			pi.pain.fillRectangle(x + x1, y1, width() - x1, y2 - y1, Color::selection);
+			pi.pain.fillRectangle(x + x1, y1, width() - x1, y2 - y1, Color_selection);
 		else
-			pi.pain.fillRectangle(x, y1, x1, y2 - y1, Color::selection);
+			pi.pain.fillRectangle(x, y1, x1, y2 - y1, Color_selection);
 	}
 	
 	if (drawOnEndMargin) {
 		if (text_->isRTL(buffer, beg.paragraph()))
-			pi.pain.fillRectangle(x, y1, x2, y2 - y1, Color::selection);
+			pi.pain.fillRectangle(x, y1, x2, y2 - y1, Color_selection);
 		else
-			pi.pain.fillRectangle(x + x2, y1, width() - x2, y2 - y1, Color::selection);
+			pi.pain.fillRectangle(x + x2, y1, width() - x2, y2 - y1, Color_selection);
 	}
 	
 	// if we are on a boundary from the beginning, it's probably
@@ -2069,9 +2041,9 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 	while (cur < end) {
 		bool drawNow = false;
 		
-		// simplified cursorRight code below which does not
+		// simplified cursorForward code below which does not
 		// descend into insets and which does not go into the
-		// next line. Compare the logic with the original cursorRight
+		// next line. Compare the logic with the original cursorForward
 		
 		// if left of boundary -> just jump to right side
 		// but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
@@ -2100,7 +2072,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 		if (!(cur < end) || drawNow) {
 			x2 = cursorX(cur.top(), cur.boundary());
 			pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1,
-				Color::selection);
+				Color_selection);
 			
 			// reset x1, so it is set again next round (which will be on the 
 			// right side of a boundary or at the selection end)
@@ -2120,7 +2092,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 
 int defaultRowHeight()
 {
-	return int(theFontMetrics(Font(Font::ALL_SANE)).maxHeight() *  1.2);
+	return int(theFontMetrics(sane_font).maxHeight() *  1.2);
 }
 
 } // namespace lyx