X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=e1cf6591e4b856a9108ca8360653fdfb0324564b;hb=1b56057e1f739551f2c410a4b0b3941246123531;hp=8f3f993816a74d238bf09339f993ed16b17ff091;hpb=2bff0157b6f2738723720e429e66e2a138b2d0d0;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 8f3f993816..e1cf6591e4 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -19,15 +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 "debug.h"
+#include "Cursor.h"
+#include "CutAndPaste.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"
@@ -36,16 +40,16 @@
 #include "ParIterator.h"
 #include "rowpainter.h"
 #include "Text.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::max;
-using std::min;
-using std::endl;
+using namespace std;
 
 namespace lyx {
 
@@ -123,53 +127,93 @@ 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;
-
-	//lyxerr << "Text::metrics: width: " << mi.base.textwidth
+	// backup old dimension.
+	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 
+		// the full allowable width.
+		dim_.wid = max_width_;
+
+	//lyxerr << "TextMetrics::metrics: width: " << mi.base.textwidth
 	//	<< " maxWidth: " << max_width_ << "\nfont: " << mi.base.font << endl;
 
 	bool changed = false;
-
 	unsigned int h = 0;
-	unsigned int w = 0;
-	for (pit_type pit = 0, n = text_->paragraphs().size(); pit != n; ++pit) {
+	for (pit_type pit = 0; pit != npar; ++pit) {
 		changed |= redoParagraph(pit);
 		ParagraphMetrics const & pm = par_metrics_[pit];
 		h += pm.height();
-		if (w < pm.width())
-			w = pm.width();
+		if (dim_.wid < pm.width())
+			dim_.wid = pm.width();
 	}
 
-	dim.wid = w;
-	dim.asc = par_metrics_[0].ascent();
-	dim.des = h - dim.asc;
+	dim_.asc = par_metrics_[0].ascent();
+	dim_.des = h - dim_.asc;
+	//lyxerr << "dim_.wid " << dim_.wid << endl;
+	//lyxerr << "dim_.asc " << dim_.asc << endl;
+	//lyxerr << "dim_.des " << dim_.des << endl;
 
-	changed |= dim_ != dim;
-	dim_ = dim;
+	changed |= dim_ != old_dim;
+	dim = dim_;
 	return changed;
 }
 
@@ -186,6 +230,119 @@ int TextMetrics::rightMargin(pit_type const pit) const
 }
 
 
+void TextMetrics::applyOuterFont(Font & font) const
+{
+	Font lf(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
+{
+	BOOST_ASSERT(pos >= 0);
+
+	ParagraphList const & pars = text_->paragraphs();
+	Paragraph const & par = pars[pit];
+	LayoutPtr const & layout = par.layout();
+	Buffer const & buffer = bv_->buffer();
+	// FIXME: broken?
+	BufferParams const & params = buffer.params();
+	pos_type const body_pos = par.beginOfBody();
+
+	// We specialize the 95% common case:
+	if (!par.getDepth()) {
+		Font f = par.getFontSettings(params, pos);
+		if (!text_->isMainText(buffer))
+			applyOuterFont(f);
+		bool lab = layout->labeltype == LABEL_MANUAL && pos < body_pos;
+
+		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() == INHERIT_FAMILY)
+			rlf.setFamily(params.getFont().fontInfo().family());
+		f.fontInfo().realize(rlf);
+		return f;
+	}
+
+	// The uncommon case need not be optimized as much
+	FontInfo const & layoutfont = pos < body_pos ? 
+		layout->labelfont : layout->font;
+
+	Font font = par.getFontSettings(params, pos);
+	font.fontInfo().realize(layoutfont);
+
+	if (!text_->isMainText(buffer))
+		applyOuterFont(font);
+
+	// Realize against environment font information
+	// NOTE: the cast to pit_type should be removed when pit_type
+	// changes to a unsigned integer.
+	if (pit < pit_type(pars.size()))
+		font.fontInfo().realize(outerFont(pit, pars).fontInfo());
+
+	// Realize with the fonts of lesser depth.
+	font.fontInfo().realize(params.getFont().fontInfo());
+
+	return font;
+}
+
+
+bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const
+{
+	if (!lyxrc.rtl_support || !sl.text())
+		return false;
+
+	int correction = 0;
+	if (boundary && sl.pos() > 0)
+		correction = -1;
+		
+	return getDisplayFont(sl.pit(), sl.pos() + correction).isVisibleRightToLeft();
+}
+
+
+bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
+{
+	if (!lyxrc.rtl_support)
+		return false;
+
+	// no RTL boundary at line start
+	if (pos == 0)
+		return false;
+
+	Paragraph const & par = text_->getPar(pit);
+
+	bool left = getDisplayFont(pit, pos - 1).isVisibleRightToLeft();
+	bool right;
+	if (pos == par.size())
+		right = par.isRTL(bv_->buffer().params());
+	else
+		right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+	return left != right;
+}
+
+
+bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
+		Font const & font) const
+{
+	if (!lyxrc.rtl_support)
+		return false;
+
+	Paragraph const & par = text_->getPar(pit);
+	bool left = font.isVisibleRightToLeft();
+	bool right;
+	if (pos == par.size())
+		right = par.isRTL(bv_->buffer().params());
+	else
+		right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+	return left != right;
+}
+
+
 bool TextMetrics::redoParagraph(pit_type const pit)
 {
 	Paragraph & par = text_->getPar(pit);
@@ -196,7 +353,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;
 
@@ -208,58 +364,110 @@ 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
 	// 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;
+
 	// 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_ - text_->leftMargin(buffer, max_width_, pit, ii->pos)
+		int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
 			- right_margin;
 		Font const & font = ii->inset->noFontChange() ?
-			bufferfont : text_->getFont(buffer, par, ii->pos);
-		MetricsInfo mi(bv_, font, w);
-		changed |= ii->inset->metrics(mi, dim);
+			bufferfont : getDisplayFont(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;
 	// maximum pixel width of a row
-	int width = max_width_ - right_margin; // - leftMargin(buffer, max_width_, pit, row);
+	int width = max_width_ - right_margin; // - leftMargin(max_width_, pit, row);
 	do {
 		Dimension dim;
 		pos_type end = rowBreakPoint(width, pit, first);
+		if (row_index || end < par.size())
+			// If there is more than one row, expand the text to 
+			// the full allowable width. This setting here is needed
+			// for the computeRowMetrics() below.
+			dim_.wid = max_width_;
+
+		dim = rowHeight(pit, first, end);
 		dim.wid = rowWidth(right_margin, pit, first, end);
-		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());
 
@@ -269,9 +477,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];
@@ -279,8 +486,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();
 	}
 
@@ -292,19 +499,29 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	return changed;
 }
 
+
 void TextMetrics::computeRowMetrics(pit_type const pit,
-		Row & row) const
+		Row & row, int width) const
 {
+	row.label_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);
+
+	//lyxerr << "\ndim_.wid " << dim_.wid << endl;
+	//lyxerr << "row.width() " << row.width() << endl;
+	//lyxerr << "w " << w << endl;
 
 	bool const is_rtl = text_->isRTL(buffer, par);
 	if (is_rtl)
 		row.x = rightMargin(pit);
 	else
-		row.x = text_->leftMargin(buffer, max_width_, pit, row.pos());
+		row.x = leftMargin(max_width_, pit, row.pos());
 
 	// is there a manual margin with a manual label
 	LayoutPtr const & layout = par.layout();
@@ -326,12 +543,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!
@@ -348,21 +564,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) {
@@ -383,6 +597,8 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			    && !disp_inset
 				) {
 				row.separator = w / ns;
+				//lyxerr << "row.separator " << row.separator << endl;
+				//lyxerr << "ns " << ns << endl;
 			} else if (is_rtl) {
 				row.x += w;
 			}
@@ -410,6 +626,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);
+	}
 }
 
 
@@ -443,10 +683,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();
 
@@ -457,8 +695,6 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 	return end;
 }
 
-};
-
 
 int TextMetrics::labelEnd(pit_type const pit) const
 {
@@ -466,7 +702,7 @@ int TextMetrics::labelEnd(pit_type const pit) const
 	if (text_->getPar(pit).layout()->margintype != MARGIN_MANUAL)
 		return 0;
 	// return the beginning of the body
-	return text_->leftMargin(bv_->buffer(), max_width_, pit);
+	return leftMargin(max_width_, pit);
 }
 
 
@@ -493,13 +729,13 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 	// nearest that.
 
 	int label_end = labelEnd(pit);
-	int const left = text_->leftMargin(buffer, max_width_, pit, pos);
+	int const left = leftMargin(max_width_, pit, pos);
 	int x = left;
 
 	// pixel width since last breakpoint
 	int chunkwidth = 0;
 
-	FontIterator fi = FontIterator(buffer, *text_, par, pos);
+	FontIterator fi = FontIterator(*this, par, pit, pos);
 	pos_type point = end;
 	pos_type i = pos;
 	for ( ; i < end; ++i, ++fi) {
@@ -513,7 +749,7 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 			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;
 		}
 
@@ -529,7 +765,6 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 					point = i;
 				else
 					point = i + 1;
-
 			}
 			// exit on last registered breakpoint:
 			break;
@@ -583,14 +818,14 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 	// get the pure distance
 	ParagraphMetrics const & pm = par_metrics_[pit];
 	Paragraph const & par = text_->getPar(pit);
-	int w = text_->leftMargin(buffer, max_width_, pit, first);
+	int w = leftMargin(max_width_, pit, first);
 	int label_end = labelEnd(pit);
 
 	pos_type const body_pos = par.beginOfBody();
 	pos_type i = first;
 
 	if (i < end) {
-		FontIterator fi = FontIterator(buffer, *text_, par, i);
+		FontIterator fi = FontIterator(*this, par, pit, i);
 		for ( ; i < end; ++i, ++fi) {
 			if (body_pos > 0 && i == body_pos) {
 				FontMetrics const & fm = theFontMetrics(
@@ -617,7 +852,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);
@@ -636,13 +871,13 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 	// start with so we don't have to do the assignment below too
 	// often.
 	Buffer const & buffer = bv_->buffer();
-	Font font = text_->getFont(buffer, par, 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 = getDisplayFont(pit, first);
+	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);
@@ -655,12 +890,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());
 		}
 	}
 
@@ -669,11 +906,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());
@@ -692,8 +929,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()
@@ -802,7 +1039,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);
 }
 
 
@@ -817,7 +1054,7 @@ 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);
 	Bidi bidi;
@@ -856,19 +1093,9 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 				tmpx -= singleWidth(pit, body_pos - 1);
 		}
 
-		if (par.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;
 	}
 
@@ -900,7 +1127,7 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 		bool const rtl = (bidi.level(c) % 2 == 1);
 		if (left_side == rtl) {
 			++c;
-			boundary = text_->isRTLBoundary(buffer, par, c);
+			boundary = isRTLBoundary(pit, c);
 		}
 	}
 
@@ -949,8 +1176,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];
@@ -958,28 +1189,676 @@ pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const
 }
 
 
-int TextMetrics::singleWidth(pit_type pit, pos_type pos) const
+void TextMetrics::newParMetricsDown()
+{
+	pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
+	pit_type const pit = last.first + 1;
+	if (pit == int(text_->paragraphs().size()))
+		return;
+
+	// do it and update its position.
+	redoParagraph(pit);
+	par_metrics_[pit].setPosition(last.second.position()
+		+ last.second.descent() + par_metrics_[pit].ascent());
+}
+
+
+void TextMetrics::newParMetricsUp()
+{
+	pair<pit_type, ParagraphMetrics> const & first = *par_metrics_.begin();
+	if (first.first == 0)
+		return;
+
+	pit_type const pit = first.first - 1;
+	// do it and update its position.
+	redoParagraph(pit);
+	par_metrics_[pit].setPosition(first.second.position()
+		- first.second.ascent() - par_metrics_[pit].descent());
+}
+
+// y is screen coordinate
+pit_type TextMetrics::getPitNearY(int y)
+{
+	BOOST_ASSERT(!text_->paragraphs().empty());
+	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 = -1;
+	int yy = -1;
+	ParMetricsCache::const_iterator it = par_metrics_.begin();
+	ParMetricsCache::const_iterator et = par_metrics_.end();
+	ParMetricsCache::const_iterator last = et; last--;
+
+	ParagraphMetrics const & pm = it->second;
+
+	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;
+		// OK, this is the paragraph we are looking for.
+		pit = it->first - 1;
+		newParMetricsUp();
+		return pit;
+	}
+
+	ParagraphMetrics const & pm_last = par_metrics_[last->first];
+
+	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;
+		if (pit == int(text_->paragraphs().size()))
+			//  We are already at the last paragraph in the inset.
+			return last->first;
+		// OK, this is the paragraph we are looking for.
+		newParMetricsDown();
+		return pit;
+	}
+
+	for (; it != et; ++it) {
+		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.position()) - int(pm.ascent()) <= y) {
+			pit = it->first;
+			yy = it->second.position();
+		}
+	}
+
+	LYXERR(Debug::DEBUG, "found best y: " << yy << " for pit: " << pit);
+
+	return pit;
+}
+
+
+Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
 {
+	ParagraphMetrics const & pm = par_metrics_[pit];
+
+	int yy = pm.position() - pm.ascent();
+	BOOST_ASSERT(!pm.rows().empty());
+	RowList::const_iterator rit = pm.rows().begin();
+	RowList::const_iterator rlast = pm.rows().end();
+	--rlast;
+	for (; rit != rlast; yy += rit->height(), ++rit)
+		if (yy + rit->height() > y)
+			break;
+	return *rit;
+}
+
+
+// x,y are absolute screen coordinates
+// sets cursor recursively descending into nested editable insets
+Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
+{
+	if (lyxerr.debugging(Debug::WORKAREA)) {
+		LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
+		cur.bv().coordCache().dump();
+	}
+	pit_type pit = getPitNearY(y);
+	BOOST_ASSERT(pit != -1);
+
+	Row const & row = getRowNearY(y, pit);
+	bool bound = false;
+
+	int xx = x; // is modified by getColumnNearX
+	pos_type const pos = row.pos()
+		+ getColumnNearX(pit, row, xx, bound);
+	cur.pit() = pit;
+	cur.pos() = pos;
+	cur.boundary(bound);
+	cur.setTargetX(x);
+
+	// try to descend into nested insets
+	Inset * inset = checkInsetHit(x, y);
+	//lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl;
+	if (!inset) {
+		// Either we deconst editXY or better we move current_font
+		// and real_current_font to Cursor
+		// FIXME: what is needed now that current_font and real_current_font
+		// are transferred?
+		cur.setCurrentFont();
+		return 0;
+	}
+
+	ParagraphList const & pars = text_->paragraphs();
+	Inset const * insetBefore = pos? pars[pit].getInset(pos - 1): 0;
+	//Inset * insetBehind = pars[pit].getInset(pos);
+
+	// This should be just before or just behind the
+	// cursor position set above.
+	BOOST_ASSERT((pos != 0 && inset == insetBefore)
+		|| inset == pars[pit].getInset(pos));
+
+	// Make sure the cursor points to the position before
+	// this inset.
+	if (inset == insetBefore) {
+		--cur.pos();
+		cur.boundary(false);
+	}
+
+	// Try to descend recursively inside the inset.
+	inset = inset->editXY(cur, x, y);
+
+	if (cur.top().text() == text_)
+		cur.setCurrentFont();
+	return inset;
+}
+
+
+void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const y)
+{
+	BOOST_ASSERT(text_ == cur.text());
+	pit_type pit = getPitNearY(y);
+
+	ParagraphMetrics const & pm = par_metrics_[pit];
+
+	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());
+	for (; r < int(pm.rows().size()) - 1; ++r) {
+		Row const & row = pm.rows()[r];
+		if (int(yy + row.height()) > y)
+			break;
+		yy += row.height();
+	}
+
+	Row const & row = pm.rows()[r];
+
+	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, "setting cursor pit: " << pit << " pos: " << pos);
+
+	text_->setCursor(cur, pit, pos, true, bound);
+	// remember new position.
+	cur.setTargetX();
+}
+
+
+//takes screen x,y coordinates
+Inset * TextMetrics::checkInsetHit(int x, int y)
+{
+	pit_type pit = getPitNearY(y);
+	BOOST_ASSERT(pit != -1);
+
+	Paragraph const & par = text_->paragraphs()[pit];
+	ParagraphMetrics const & pm = par_metrics_[pit];
+
+	LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << "  pit: " << pit);
+
+	InsetList::const_iterator iit = par.insetList().begin();
+	InsetList::const_iterator iend = par.insetList().end();
+	for (; iit != iend; ++iit) {
+		Inset * inset = iit->inset;
+
+		LYXERR(Debug::DEBUG, "examining inset " << inset);
+
+		if (!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, "No inset hit. ");
+	return 0;
+}
+
+
+int TextMetrics::cursorX(CursorSlice const & sl,
+		bool boundary) const
+{
+	BOOST_ASSERT(sl.text() == text_);
+	pit_type const pit = sl.pit();
+	Paragraph const & par = text_->paragraphs()[pit];
+	ParagraphMetrics const & pm = par_metrics_[pit];
+	if (pm.rows().empty())
+		return 0;
+
+	pos_type ppos = sl.pos();
+	// Correct position in front of big insets
+	bool const boundary_correction = ppos != 0 && boundary;
+	if (boundary_correction)
+		--ppos;
+
+	Row const & row = pm.getRow(sl.pos(), boundary);
+
+	pos_type cursor_vpos = 0;
+
 	Buffer const & buffer = bv_->buffer();
+	double x = row.x;
+	Bidi bidi;
+	bidi.computeTables(par, buffer, row);
+
+	pos_type const row_pos  = row.pos();
+	pos_type const end      = row.endpos();
+	// Spaces at logical line breaks in bidi text must be skipped during 
+	// cursor positioning. However, they may appear visually in the middle
+	// of a row; they must be skipped, wherever they are...
+	// * logically "abc_[HEBREW_\nHEBREW]"
+	// * visually "abc_[_WERBEH\nWERBEH]"
+	pos_type skipped_sep_vpos = -1;
+
+	if (end <= row_pos)
+		cursor_vpos = row_pos;
+	else if (ppos >= end)
+		cursor_vpos = text_->isRTL(buffer, par) ? row_pos : end;
+	else if (ppos > row_pos && ppos >= end)
+		// Place cursor after char at (logical) position pos - 1
+		cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
+			? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
+	else
+		// Place cursor before char at (logical) position ppos
+		cursor_vpos = (bidi.level(ppos) % 2 == 0)
+			? bidi.log2vis(ppos) : bidi.log2vis(ppos) + 1;
+
+	pos_type body_pos = par.beginOfBody();
+	if (body_pos > 0 &&
+	    (body_pos > end || !par.isLineSeparator(body_pos - 1)))
+		body_pos = 0;
+
+	// Use font span to speed things up, see below
+	FontSpan font_span;
+	Font font;
+
+	// If the last logical character is a separator, skip it, unless
+	// it's in the last row of a paragraph; see skipped_sep_vpos declaration
+	if (end > 0 && end < par.size() && par.isSeparator(end - 1))
+		skipped_sep_vpos = bidi.log2vis(end - 1);
+	
+	for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
+		// Skip the separator which is at the logical end of the row
+		if (vpos == skipped_sep_vpos)
+			continue;
+		pos_type pos = bidi.vis2log(vpos);
+		if (body_pos > 0 && pos == body_pos - 1) {
+			FontMetrics const & labelfm = theFontMetrics(
+				text_->getLabelFont(buffer, par));
+			x += row.label_hfill + labelfm.width(par.layout()->labelsep);
+			if (par.isLineSeparator(body_pos - 1))
+				x -= singleWidth(pit, body_pos - 1);
+		}
+
+		// Use font span to speed things up, see above
+		if (pos < font_span.first || pos > font_span.last) {
+			font_span = par.fontSpan(pos);
+			font = getDisplayFont(pit, pos);
+		}
+
+		x += pm.singleWidth(pos, font);
+
+		if (par.isSeparator(pos) && pos >= body_pos)
+			x += row.separator;
+	}
+
+	// see correction above
+	if (boundary_correction) {
+		if (isRTL(sl, boundary))
+			x -= singleWidth(pit, ppos);
+		else
+			x += singleWidth(pit, ppos);
+	}
+
+	return int(x);
+}
+
+
+int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
+{
+	//lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl;
+	ParagraphMetrics const & pm = par_metrics_[sl.pit()];
+	if (pm.rows().empty())
+		return 0;
+
+	int h = 0;
+	h -= par_metrics_[0].rows()[0].ascent();
+	for (pit_type pit = 0; pit < sl.pit(); ++pit) {
+		h += par_metrics_[pit].height();
+	}
+	int pos = sl.pos();
+	if (pos && boundary)
+		--pos;
+	size_t const rend = pm.pos2row(pos);
+	for (size_t rit = 0; rit != rend; ++rit)
+		h += pm.rows()[rit].height();
+	h += pm.rows()[rend].ascent();
+	return h;
+}
+
+
+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));
+
+	cur.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));
+
+	cur.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.
+
+bool TextMetrics::cursorHome(Cursor & cur)
+{
+	BOOST_ASSERT(text_ == cur.text());
+	ParagraphMetrics const & pm = par_metrics_[cur.pit()];
+	Row const & row = pm.getRow(cur.pos(),cur.boundary());
+	return text_->setCursor(cur, cur.pit(), row.pos());
+}
+
+
+bool TextMetrics::cursorEnd(Cursor & cur)
+{
+	BOOST_ASSERT(text_ == cur.text());
+	// if not on the last row of the par, put the cursor before
+	// the final space exept if I have a spanning inset or one string
+	// is so long that we force a break.
+	pos_type end = cur.textRow().endpos();
+	if (end == 0)
+		// empty text, end-1 is no valid position
+		return false;
+	bool boundary = false;
+	if (end != cur.lastpos()) {
+		if (!cur.paragraph().isLineSeparator(end-1)
+		    && !cur.paragraph().isNewline(end-1))
+			boundary = true;
+		else
+			--end;
+	}
+	return text_->setCursor(cur, cur.pit(), end, true, boundary);
+}
+
+
+void TextMetrics::deleteLineForward(Cursor & cur)
+{
+	BOOST_ASSERT(text_ == cur.text());
+	if (cur.lastpos() == 0) {
+		// Paragraph is empty, so we just go forward
+		text_->cursorForward(cur);
+	} else {
+		cur.resetAnchor();
+		cur.selection() = true; // to avoid deletion
+		cursorEnd(cur);
+		cur.setSelection();
+		// What is this test for ??? (JMarc)
+		if (!cur.selection())
+			text_->deleteWordForward(cur);
+		else
+			cap::cutSelection(cur, true, false);
+		checkBufferStructure(cur.buffer(), cur);
+	}
+}
+
+
+bool TextMetrics::isLastRow(pit_type pit, Row const & row) const
+{
+	ParagraphList const & pars = text_->paragraphs();
+	return row.endpos() >= pars[pit].size()
+		&& pit + 1 == pit_type(pars.size());
+}
+
+
+bool TextMetrics::isFirstRow(pit_type pit, Row const & row) const
+{
+	return row.pos() == 0 && pit == 0;
+}
+
+
+int TextMetrics::leftMargin(int max_width, pit_type pit) const
+{
+	BOOST_ASSERT(pit >= 0);
+	BOOST_ASSERT(pit < int(text_->paragraphs().size()));
+	return leftMargin(max_width, pit, text_->paragraphs()[pit].size());
+}
+
+
+int TextMetrics::leftMargin(int max_width,
+		pit_type const pit, pos_type const pos) const
+{
+	ParagraphList const & pars = text_->paragraphs();
+
+	BOOST_ASSERT(pit >= 0);
+	BOOST_ASSERT(pit < int(pars.size()));
+	Paragraph const & par = pars[pit];
+	BOOST_ASSERT(pos >= 0);
+	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();
+
+	docstring parindent = layout->parindent;
+
+	int l_margin = 0;
+
+	if (text_->isMainText(buffer))
+		l_margin += changebarMargin();
+
+	l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
+		tclass.leftmargin());
+
+	if (par.getDepth() != 0) {
+		// find the next level paragraph
+		pit_type newpar = outerHook(pit, pars);
+		if (newpar != pit_type(pars.size())) {
+			if (pars[newpar].layout()->isEnvironment()) {
+				l_margin = leftMargin(max_width, newpar);
+			}
+			if (par.layout() == tclass.defaultLayout()) {
+				if (pars[newpar].params().noindent())
+					parindent.erase();
+				else
+					parindent = pars[newpar].layout()->parindent;
+			}
+		}
+	}
+
+	// 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)
+		parindent.erase();
+
+	FontInfo const labelfont = text_->getLabelFont(buffer, par);
+	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
+
+	switch (layout->margintype) {
+	case MARGIN_DYNAMIC:
+		if (!layout->leftmargin.empty()) {
+			l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
+				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);
+		}
+		break;
+
+	case MARGIN_MANUAL: {
+		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);
+			}
+		}
+		break;
+	}
+
+	case MARGIN_STATIC: {
+		l_margin += theFontMetrics(buffer.params().getFont()).
+			signedWidth(layout->leftmargin) * 4	/ (par.getDepth() + 4);
+		break;
+	}
+
+	case MARGIN_FIRST_DYNAMIC:
+		if (layout->labeltype == LABEL_MANUAL) {
+			if (pos >= par.beginOfBody()) {
+				l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
+			} else {
+				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
+			       && !isFirstInSequence(pit, pars))) {
+			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());
+		}
+		break;
+
+	case MARGIN_RIGHT_ADDRESS_BOX: {
+#if 0
+		// ok, a terrible hack. The left margin depends on the widest
+		// row in this paragraph.
+		RowList::iterator rit = par.rows().begin();
+		RowList::iterator end = par.rows().end();
+		// FIXME: This is wrong.
+		int minfill = max_width;
+		for ( ; rit != end; ++rit)
+			if (rit->fill() < minfill)
+				minfill = rit->fill();
+		l_margin += theFontMetrics(params.getFont()).signedWidth(layout->leftmargin);
+		l_margin += minfill;
+#endif
+		// also wrong, but much shorter.
+		l_margin += max_width / 2;
+		break;
+	}
+	}
+
+	if (!par.params().leftIndent().zero())
+		l_margin += par.params().leftIndent().inPixels(max_width);
+
+	LyXAlignment align;
+
+	if (par.params().align() == LYX_ALIGN_LAYOUT)
+		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)))
+	    && align == LYX_ALIGN_BLOCK
+	    && !par.params().noindent()
+	    // in some insets, paragraphs are never indented
+	    && !(par.inInset() && par.inInset()->neverIndent(buffer))
+	    // 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))
+	{
+		l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
+			parindent);
+	}
+
+	return l_margin;
+}
+
+
+int TextMetrics::singleWidth(pit_type pit, pos_type pos) const
+{
 	ParagraphMetrics const & pm = par_metrics_[pit];
 
-	return pm.singleWidth(pos, text_->getFont(buffer, text_->getPar(pit), pos));
+	return pm.singleWidth(pos, getDisplayFont(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())
 		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();
 	}
 }
@@ -987,153 +1866,94 @@ 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)
-		if (!pi.full_repaint && row_has_changed)
-			pi.pain.fillRectangle(x, y - rit->ascent(),
-			width(), rit->height(),
-			text_->backgroundColor());
+		// 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() = 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) << "{" <<
-				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
+		// for inner insets as the Row has been cleared out.
+		bool tmp = pi.full_repaint;
+		pi.full_repaint = true;
 		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);
+	pi.pain.setDrawingEnabled(original_drawing_state);
 
-	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;
-
-	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;
-
-	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, ".");
 }
 
 
@@ -1143,24 +1963,24 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 {
 	Buffer & buffer = bv_->buffer();
 	DocIterator cur = beg;
-	int x1 = text_->cursorX(*bv_, beg.top(), beg.boundary());
-	int x2 = text_->cursorX(*bv_, end.top(), end.boundary());
-	int y1 = bv_funcs::getPos(*bv_, cur, cur.boundary()).y_ - row.ascent();
+	int x1 = cursorX(beg.top(), beg.boundary());
+	int x2 = cursorX(end.top(), end.boundary());
+	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
@@ -1173,15 +1993,15 @@ 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
 		if (cur.boundary()) {
 			cur.boundary(false);
-		}	else if (text_->isRTLBoundary(buffer, cur.paragraph(), cur.pos() + 1)) {
+		}	else if (isRTLBoundary(cur.pit(), cur.pos() + 1)) {
 			// in front of RTL boundary -> Stay on this side of the boundary because:
 			//   ab|cDDEEFFghi -> abc|DDEEFFghi
 			++cur.pos();
@@ -1198,13 +2018,13 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 			
 		if (x1 == -1) {
 			// the previous segment was just drawn, now the next starts
-			x1 = text_->cursorX(*bv_, cur.top(), cur.boundary());
+			x1 = cursorX(cur.top(), cur.boundary());
 		}
 		
 		if (!(cur < end) || drawNow) {
-			x2 = text_->cursorX(*bv_, cur.top(), cur.boundary());
+			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)
@@ -1213,7 +2033,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 	}
 }
 
-//int Text::pos2x(pit_type pit, pos_type pos) const
+//int TextMetrics::pos2x(pit_type pit, pos_type pos) const
 //{
 //	ParagraphMetrics const & pm = par_metrics_[pit];
 //	Row const & r = pm.rows()[row];
@@ -1224,7 +2044,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