X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=8321b34ecadd030585ea06824e13f3dbfafbeb6b;hb=8c6ac457ecc69f57ab54cd8c9b8b7893607c65d6;hp=3acc85ad7b4f906a358cedf3acb460318f1e57ac;hpb=a8ed1add4dcae9d44abf78eafc8fbe36e587db88;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 3acc85ad7b..8321b34eca 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -19,17 +19,19 @@
 
 #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 "support/debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
+#include "InsetList.h"
+#include "Layout.h"
 #include "Length.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -38,17 +40,19 @@
 #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>
-
+using std::make_pair;
 using std::max;
 using std::min;
-using std::endl;
+using std::pair;
 
 namespace lyx {
 
@@ -126,28 +130,58 @@ TextMetrics::TextMetrics(BufferView * bv, Text * text)
 }
 
 
+bool TextMetrics::has(pit_type pit) const
+{
+	return par_metrics_.find(pit) != par_metrics_.end();
+}
+
+
 ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const
 {
 	return const_cast<TextMetrics *>(this)->parMetrics(pit, true);
 }
 
 
-ParagraphMetrics & TextMetrics::parMetrics(pit_type pit,
-		bool redo)
+
+pair<pit_type, ParagraphMetrics const *> TextMetrics::first() const
+{
+	ParMetricsCache::const_iterator it = par_metrics_.begin();
+	return make_pair(it->first, &it->second);
+}
+
+
+pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
+{
+	ParMetricsCache::const_reverse_iterator it = par_metrics_.rbegin();
+	return make_pair(it->first, &it->second);
+}
+
+
+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(
-			std::make_pair(pit, ParagraphMetrics(text_->getPar(pit)))).first;
+			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;
 }
 
 
-bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim)
+int TextMetrics::parPosition(pit_type pit) const
+{
+	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, int min_width)
 {
 	BOOST_ASSERT(mi.base.textwidth);
 	max_width_ = mi.base.textwidth;
@@ -155,6 +189,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 
@@ -201,8 +236,8 @@ int TextMetrics::rightMargin(pit_type const pit) const
 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;
 }
@@ -227,21 +262,22 @@ Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
 			applyOuterFont(f);
 		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 ? 
+	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);
@@ -250,10 +286,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;
 }
@@ -320,7 +356,6 @@ 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;
 
@@ -332,11 +367,11 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	// when layout is set; when material is pasted.
 	int const moveCursor = par.checkBiblio(buffer.params().trackChanges);
 	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
@@ -347,20 +382,68 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	// 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();
+	MacroContext mc(buffer, par);
+	InsetList::const_iterator ii = par.insetList().begin();
+	InsetList::const_iterator iend = par.insetList().end();
 	for (; ii != iend; ++ii) {
-		Dimension old_dim = ii->inset->dimension();
+		// the macro must come here, _before_ the metric call, because
+		// the macro should see itself to detect recursions. To find out
+		// whether the macro definition is a redefinition it will look
+		// at the MacroData::redefinition_. So it doesn't get confused
+		// by the already existing macro definition of itself in the 
+		// macro context.
+		if (ii->inset->lyxCode() == MATHMACRO_CODE) {
+			// get macro data
+			MathMacroTemplate const & macroTemplate
+			= static_cast<MathMacroTemplate const &>(*ii->inset);
+
+			// valid?
+			if (macroTemplate.validMacro()) {
+				MacroData macro = macroTemplate.asMacroData();
+
+				// redefinition?
+				macro.setRedefinition(mc.has(macroTemplate.name()));
+
+				// register macro (possibly overwrite the previous one of this paragraph)
+				mc.insert(macroTemplate.name(), macro);
+			}
+		}
+
+		// 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);
+		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;
@@ -372,20 +455,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;
 
@@ -399,9 +486,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];
@@ -409,8 +495,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();
 	}
 
@@ -424,17 +510,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);
 
@@ -468,12 +552,11 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			row.label_hfill = labelFill(pit, row) / double(nlh);
 	}
 
-	// are there any hfills in the row?
-	int const nh = numberOfHfills(par, row);
-
-	if (nh) {
-		if (w > 0)
-			row.hfill = w / nh;
+	double hfill = 0;
+	if (w > 0) {
+		// are there any hfills in the row?
+		if (int nh = numberOfHfills(par, row))
+			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!
@@ -490,21 +573,19 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 		// 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 (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;
+			}
 		}
 
 		switch (align) {
@@ -554,6 +635,30 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 				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);
+	}
 }
 
 
@@ -587,10 +692,8 @@ int TextMetrics::labelFill(pit_type const pit, Row const & row) const
 }
 
 
-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();
 
@@ -601,8 +704,6 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 	return end;
 }
 
-};
-
 
 int TextMetrics::labelEnd(pit_type const pit) const
 {
@@ -673,7 +774,6 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 					point = i;
 				else
 					point = i + 1;
-
 			}
 			// exit on last registered breakpoint:
 			break;
@@ -761,7 +861,7 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 }
 
 
-boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const first,
+Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 		pos_type const end) const
 {
 	Paragraph const & par = text_->getPar(pit);
@@ -781,12 +881,12 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 	// 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);
+	FontSize const tmpsize = font.fontInfo().size();
+	font.fontInfo() = text_->getLayoutFont(buffer, pit);
+	FontSize const size = font.fontInfo().size();
+	font.fontInfo().setSize(tmpsize);
 
-	Font labelfont = text_->getLabelFont(buffer, par);
+	FontInfo labelfont = text_->getLabelFont(buffer, par);
 
 	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 	FontMetrics const & fontmetrics = theFontMetrics(font);
@@ -799,12 +899,14 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 	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());
 		}
 	}
 
@@ -813,11 +915,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());
@@ -836,8 +938,8 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 		// 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()
@@ -946,7 +1048,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);
 }
 
 
@@ -961,10 +1063,9 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 	/// 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 = main_text_? 0 : bv_->coordCache().get(text_, pit).x_;
+	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);
 
@@ -1001,19 +1102,9 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 				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;
 	}
 
@@ -1094,8 +1185,12 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 
 pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const
 {
-	ParagraphMetrics const & pm = par_metrics_[pit];
-	BOOST_ASSERT(!pm.rows().empty());
+	// We play safe and use parMetrics(pit) to make sure the
+	// ParagraphMetrics will be redone and OK to use if needed.
+	// Otherwise we would use an empty ParagraphMetrics in
+	// upDownInText() while in selection mode.
+	ParagraphMetrics const & pm = parMetrics(pit);
+
 	BOOST_ASSERT(row < int(pm.rows().size()));
 	bool bound = false;
 	Row const & r = pm.rows()[row];
@@ -1103,79 +1198,89 @@ pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const
 }
 
 
+void TextMetrics::newParMetricsDown()
+{
+	pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
+	pit_type const pit = last.first + 1;
+	if (pit == int(text_->paragraphs().size()))
+		return;
+
+	// do it and update its position.
+	redoParagraph(pit);
+	par_metrics_[pit].setPosition(last.second.position()
+		+ last.second.descent());
+}
+
+
+void TextMetrics::newParMetricsUp()
+{
+	pair<pit_type, ParagraphMetrics> const & first = *par_metrics_.begin();
+	if (first.first == 0)
+		return;
+
+	pit_type const pit = first.first - 1;
+	// do it and update its position.
+	redoParagraph(pit);
+	par_metrics_[pit].setPosition(first.second.position()
+		- first.second.ascent());
+}
+
 // y is screen coordinate
 pit_type TextMetrics::getPitNearY(int y)
 {
 	BOOST_ASSERT(!text_->paragraphs().empty());
-	BOOST_ASSERT(bv_->coordCache().getParPos().find(text_) != bv_->coordCache().getParPos().end());
-	CoordCache::InnerParPosCache const & cc = bv_->coordCache().getParPos().find(text_)->second;
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": y: " << y << " cache size: " << cc.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;
-	CoordCache::InnerParPosCache::const_iterator it = cc.begin();
-	CoordCache::InnerParPosCache::const_iterator et = cc.end();
-	CoordCache::InnerParPosCache::const_iterator last = et; last--;
+	ParMetricsCache::const_iterator it = par_metrics_.begin();
+	ParMetricsCache::const_iterator et = par_metrics_.end();
+	ParMetricsCache::const_iterator last = et; last--;
 
-	ParagraphMetrics const & pm = par_metrics_[it->first];
+	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.y_ - 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);
-		bv_->coordCache().parPos()[text_][pit] =
-			Point(0, it->second.y_ - 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.y_ + 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);
-		bv_->coordCache().parPos()[text_][pit] =
-			Point(0, last->second.y_ + 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.y_
-			<< endl;
+		LYXERR(Debug::DEBUG, "examining: pit: " << it->first
+			<< " y: " << it->second.position());
 
 		ParagraphMetrics const & pm = par_metrics_[it->first];
 
-		if (it->first >= pit && int(it->second.y_) - int(pm.ascent()) <= y) {
+		if (it->first >= pit && int(it->second.position()) - int(pm.ascent()) <= y) {
 			pit = it->first;
-			yy = it->second.y_;
+			yy = it->second.position();
 		}
 	}
 
-	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;
 }
@@ -1185,10 +1290,11 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
 {
 	ParagraphMetrics const & pm = par_metrics_[pit];
 
-	int yy = bv_->coordCache().get(text_, pit).y_ - pm.ascent();
+	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;
@@ -1201,7 +1307,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);
@@ -1262,13 +1368,9 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 
 	ParagraphMetrics const & pm = par_metrics_[pit];
 
-	int yy = bv_->coordCache().get(text_, pit).y_ - pm.ascent();
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": x: " << x
-		<< " y: " << y
-		<< " pit: " << pit
-		<< " yy: " << yy << endl;
+	int yy = pm.position() - pm.ascent();
+	LYXERR(Debug::DEBUG, "x: " << x << " y: " << y <<
+		" pit: " << pit << " yy: " << yy);
 
 	int r = 0;
 	BOOST_ASSERT(pm.rows().size());
@@ -1281,21 +1383,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.
@@ -1310,46 +1404,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;
 }
 
@@ -1436,9 +1522,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 
 		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)
+		if (par.isSeparator(pos) && pos >= body_pos)
 			x += row.separator;
 	}
 
@@ -1491,7 +1575,7 @@ void TextMetrics::cursorPrevious(Cursor & cur)
 		// simplest solution is to move to the previous row instead.
 		cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
 
-	finishUndo();
+	cur.finishUndo();
 	cur.updateFlags(Update::Force | Update::FitCursor);
 }
 
@@ -1511,7 +1595,7 @@ void TextMetrics::cursorNext(Cursor & cur)
 		cur.dispatch(
 			FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
 
-	finishUndo();
+	cur.finishUndo();
 	cur.updateFlags(Update::Force | Update::FitCursor);
 }
 
@@ -1554,8 +1638,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
@@ -1641,7 +1725,7 @@ int TextMetrics::leftMargin(int max_width,
 	    && pit > 0 && pars[pit - 1].layout()->nextnoindent)
 		parindent.erase();
 
-	Font const labelfont = text_->getLabelFont(buffer, par);
+	FontInfo const labelfont = text_->getLabelFont(buffer, par);
 	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 
 	switch (layout->margintype) {
@@ -1766,19 +1850,24 @@ int TextMetrics::singleWidth(pit_type pit, pos_type pos) const
 }
 
 
-// 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())
 		return;
 
-	ParMetricsCache::const_iterator it = par_metrics_.begin();
-	ParMetricsCache::const_iterator const end = par_metrics_.end();
+	origin_.x_ = x;
+	origin_.y_ = y;
+
+	ParMetricsCache::iterator it = par_metrics_.begin();
+	ParMetricsCache::iterator const pm_end = par_metrics_.end();
 	y -= it->second.ascent();
-	for (; it != end; ++it) {
+	for (; it != pm_end; ++it) {
 		ParagraphMetrics const & pmi = it->second;
 		y += pmi.ascent();
-		drawParagraph(pi, it->first, x, y);
+		pit_type const pit = it->first;
+		// Save the paragraph position in the cache.
+		it->second.setPosition(y);
+		drawParagraph(pi, pit, x, y);
 		y += pmi.descent();
 	}
 }
@@ -1786,60 +1875,72 @@ 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();
-
-	bv_->coordCache().parPos()[text_][pit] = Point(x, y);
-
+	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();
 
-	y -= rb->ascent();
-	for (RowList::const_iterator rit = rb; rit != re; ++rit) {
-		y += rit->ascent();
+	for (size_t i = 0; i != nrows; ++i) {
 
-		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);
+		Row const & row = pm.rows()[i];
+		if (i)
+			y += row.ascent();
+
+		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);
 
 		// 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();
 		
+		// 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 the only the insets if the text itself is
+			// 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)
+		// 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 - rit->ascent(),
-				width(), rit->height(),
-				Color_color(Color::color(pi.background_color)));
+			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() = 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)) {
+				std::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
@@ -1849,111 +1950,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;
-}
-
-
-// only used for inset right now. should also be used for main text
-void TextMetrics::drawSelection(PainterInfo & pi, int x, int) const
-{
-	Cursor & cur = bv_->cursor();
-	if (!cur.selection())
-		return;
-	if (!ptr_cmp(cur.text(), text_))
-		return;
-	
-	//if the anchor is outside, this is not our selection 
-	if (!ptr_cmp(cur.anchor().text(), text_))		
-		return;
-
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< "draw selection at " << x
-		<< endl;
-
-	DocIterator beg = cur.selectionBegin();
-	DocIterator end = cur.selectionEnd();
-
-	// the selection doesn't touch the visible screen?
-	if (bv_funcs::status(bv_, beg) == bv_funcs::CUR_BELOW
-	    || bv_funcs::status(bv_, end) == bv_funcs::CUR_ABOVE)
-		return;
-
-	if (beg.pit() < par_metrics_.begin()->first) {
-		beg.pit() = par_metrics_.begin()->first;
-		beg.pos() = 0;
-	}
-	if (end.pit() > par_metrics_.rbegin()->first) {
-		end.pit() = par_metrics_.rbegin()->first;
-		end.pos() = end.lastpos();
-	}
+	pi.pain.setDrawingEnabled(original_drawing_state);
 
-	ParagraphMetrics const & pm1 = par_metrics_[beg.pit()];
-	ParagraphMetrics const & pm2 = par_metrics_[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();
-
-	// 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, ".");
 }
 
 
@@ -1965,22 +1974,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
@@ -1993,9 +2002,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
@@ -2024,7 +2033,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)
@@ -2044,7 +2053,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