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

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 7831c13e04..c7ccbac7fc 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -48,6 +48,7 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 
+#include <stdlib.h>
 #include <cmath>
 
 using namespace std;
@@ -80,15 +81,18 @@ int numberOfLabelHfills(Paragraph const & par, Row const & row)
 	return n;
 }
 
-
-int numberOfHfills(Row const & row, pos_type const body_pos)
+// FIXME: this needs to be rewritten, probably by merging it into some
+// code that, besides counting, sets the active status of the space
+// inset in the row element.
+int numberOfHfills(Row const & row, ParagraphMetrics const & pm,
+                   pos_type const body_pos)
 {
 	int n = 0;
 	Row::const_iterator cit = row.begin();
 	Row::const_iterator const end = row.end();
 	for ( ; cit != end ; ++cit)
 		if (cit->pos >= body_pos
-		    && cit->inset && cit->inset->isHfill())
+		    && cit->inset && pm.hfillExpansion(row, cit->pos))
 			++n;
 	return n;
 }
@@ -197,13 +201,13 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 
 int TextMetrics::rightMargin(ParagraphMetrics const & pm) const
 {
-	return main_text_? pm.rightMargin(*bv_) : 0;
+	return text_->isMainText() ? pm.rightMargin(*bv_) : 0;
 }
 
 
 int TextMetrics::rightMargin(pit_type const pit) const
 {
-	return main_text_? par_metrics_[pit].rightMargin(*bv_) : 0;
+	return text_->isMainText() ? par_metrics_[pit].rightMargin(*bv_) : 0;
 }
 
 
@@ -350,7 +354,6 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	pm.reset(par);
 
 	Buffer & buffer = bv_->buffer();
-	main_text_ = (text_ == &buffer.text());
 	bool changed = false;
 
 	// Check whether there are InsetBibItems that need fixing
@@ -400,6 +403,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 
 	// redo insets
 	Font const bufferfont = buffer.params().getFont();
+	CoordCache::Insets & insetCache = bv_->coordCache().insets();
 	InsetList::const_iterator ii = par.insetList().begin();
 	InsetList::const_iterator iend = par.insetList().end();
 	for (; ii != iend; ++ii) {
@@ -425,9 +429,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		MacroContext mc(&buffer, parPos);
 		MetricsInfo mi(bv_, font.fontInfo(), w, mc);
 		ii->inset->metrics(mi, dim);
-		Dimension const & old_dim = pm.insetDimension(ii->inset);
-		if (old_dim != dim) {
-			pm.setInsetDimension(ii->inset, dim);
+		if (!insetCache.has(ii->inset) || insetCache.dim(ii->inset) != dim) {
+			insetCache.add(ii->inset, dim);
 			changed = true;
 		}
 	}
@@ -435,48 +438,71 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	par.setBeginOfBody();
 	pos_type first = 0;
 	size_t row_index = 0;
+	bool need_new_row = false;
 	// maximum pixel width of a row
 	do {
 		if (row_index == pm.rows().size())
 			pm.rows().push_back(Row());
 		Row & row = pm.rows()[row_index];
+		row.pit(pit);
 		row.pos(first);
-		breakRow(row, right_margin, pit);
-		setRowHeight(row, pit);
+		row.pit(pit);
+		need_new_row = breakRow(row, right_margin);
+		setRowHeight(row);
 		row.setChanged(false);
-		if (row_index || row.right_boundary() || row.endpos() < par.size())
-			// If there is more than one row or the row has been
-			// broken by a display inset or a newline, expand the text
-			// to the full allowable width. This setting here is
-			// needed for the computeRowMetrics() below.
-			dim_.wid = max_width_;
+		if (row_index || row.endpos() < par.size()
+		    || (row.right_boundary() && par.inInset().lyxCode() != CELL_CODE)) {
+			/* If there is more than one row or the row has been
+			 * broken by a display inset or a newline, expand the text
+			 * to the full allowable width. This setting here is
+			 * needed for the computeRowMetrics() below. In the case
+			 * of a display inset, we do nothing when inside a table
+			 * cell, because the tabular code is not prepared for
+			 * that, and it triggers when using a caption in a
+			 * longtable (see bugs #9945 and #9757).
+			 */
+			if (dim_.wid < max_width_)
+				dim_.wid = max_width_;
+		}
 		int const max_row_width = max(dim_.wid, row.width());
-		computeRowMetrics(pit, row, max_row_width);
+		computeRowMetrics(row, max_row_width);
 		first = row.endpos();
 		++row_index;
 
 		pm.dim().wid = max(pm.dim().wid, row.width());
 		pm.dim().des += row.height();
-	} while (first < par.size());
+	} while (first < par.size() || need_new_row);
 
 	if (row_index < pm.rows().size())
 		pm.rows().resize(row_index);
 
-	// Make sure that if a par ends in newline, there is one more row
-	// under it
-	if (first > 0 && par.isNewline(first - 1)) {
-		if (row_index == pm.rows().size())
-			pm.rows().push_back(Row());
-		Row & row = pm.rows()[row_index];
-		row.pos(first);
-		row.endpos(first);
-		setRowHeight(row, pit);
-		row.setChanged(false);
-		int const max_row_width = max(dim_.wid, row.width());
-		computeRowMetrics(pit, row, max_row_width);
-		pm.dim().des += row.height();
+	// FIXME: It might be better to move this in another method
+	// specially tailored for the main text.
+	// Top and bottom margin of the document (only at top-level)
+	if (text_->isMainText()) {
+		if (pit == 0) {
+			pm.rows().front().dimension().asc += 20;
+			/* coverity[copy_paste_error]: coverity thinks that we
+			 * should update pm.dim().asc below, but all the rows
+			 * heights are actually counted as part of the paragraph metric
+			 * descent see loop above).
+			 */
+			pm.dim().des += 20;
+		}
+		ParagraphList const & pars = text_->paragraphs();
+		if (pit + 1 == pit_type(pars.size())) {
+			pm.rows().back().dimension().des += 20;
+			pm.dim().des += 20;
+		}
 	}
 
+	// The space above and below the paragraph.
+	int const top = parTopSpacing(pit);
+	pm.rows().front().dimension().asc += top;
+	int const bottom = parBottomSpacing(pit);
+	pm.rows().back().dimension().des += bottom;
+	pm.dim().des += top + bottom;
+
 	pm.dim().asc += pm.rows()[0].ascent();
 	pm.dim().des -= pm.rows()[0].ascent();
 
@@ -486,7 +512,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 }
 
 
-LyXAlignment TextMetrics::getAlign(Paragraph const & par, pos_type const pos) const
+LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const
 {
 	Layout const & layout = par.layout();
 
@@ -498,7 +524,14 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, pos_type const pos) co
 
 	// handle alignment inside tabular cells
 	Inset const & owner = text_->inset();
+	bool forced_block = false;
 	switch (owner.contentAlignment()) {
+	case LYX_ALIGN_BLOCK:
+		// In general block align is the default state, but here it is
+		// an explicit choice. Therefore it should not be overridden
+		// later.
+		forced_block = true;
+		// fall through
 	case LYX_ALIGN_CENTER:
 	case LYX_ALIGN_LEFT:
 	case LYX_ALIGN_RIGHT:
@@ -511,7 +544,7 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, pos_type const pos) co
 	}
 
 	// Display-style insets should always be on a centered row
-	if (Inset const * inset = par.getInset(pos)) {
+	if (Inset const * inset = par.getInset(row.pos())) {
 		switch (inset->display()) {
 		case Inset::AlignLeft:
 			align = LYX_ALIGN_BLOCK;
@@ -528,22 +561,28 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, pos_type const pos) co
 		}
 	}
 
-	// Has the user requested we not justify stuff?
-	if (!bv_->buffer().params().justification
-	    && align == LYX_ALIGN_BLOCK)
-		align = LYX_ALIGN_LEFT;
+	if (align == LYX_ALIGN_BLOCK) {
+		// If this row has been broken abruptly by a display inset, or
+		// it is the end of the paragraph, or the user requested we
+		// not justify stuff, then don't stretch.
+		// A forced block alignment can only be overridden the 'no
+		// justification on screen' setting.
+		if (((row.right_boundary() || row.endpos() == par.size())
+		     && !forced_block)
+		    || !bv_->buffer().params().justification)
+			align = text_->isRTL(par) ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT;
+	}
 
 	return align;
 }
 
 
-void TextMetrics::computeRowMetrics(pit_type const pit,
-		Row & row, int width) const
+void TextMetrics::computeRowMetrics(Row & row, int width) const
 {
 	row.label_hfill = 0;
 	row.separator = 0;
 
-	Paragraph const & par = text_->getPar(pit);
+	Paragraph const & par = text_->getPar(row.pit());
 
 	int const w = width - row.right_margin - row.width();
 	// FIXME: put back this assertion when the crash on new doc is solved.
@@ -567,33 +606,34 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			++nlh;
 
 		if (nlh && !par.getLabelWidthString().empty())
-			row.label_hfill = labelFill(pit, row) / double(nlh);
+			row.label_hfill = labelFill(row) / double(nlh);
 	}
 
-	double hfill = 0;
 	// are there any hfills in the row?
-	if (int const nh = numberOfHfills(row, par.beginOfBody())) {
-		if (w > 0)
-			hfill = double(w) / nh;
-	// we don't have to look at the alignment if it is ALIGN_LEFT and
-	// if the row is already larger then the permitted width as then
-	// we force the LEFT_ALIGN'edness!
-	} else if (int(row.width()) < max_width_) {
-		// is it block, flushleft or flushright?
-		// set x how you need it
-		switch (getAlign(par, row.pos())) {
+	ParagraphMetrics & pm = par_metrics_[row.pit()];
+	int nh = numberOfHfills(row, pm, par.beginOfBody());
+	int hfill = 0;
+	int hfill_rem = 0;
+
+	// We don't have to look at the alignment if the row is already
+	// larger then the permitted width as then we force the
+	// LEFT_ALIGN'edness!
+	if (int(row.width()) >= max_width_)
+		return;
+
+	if (nh == 0) {
+		// Common case : there is no hfill, and the alignment will be
+		// meaningful
+		switch (getAlign(par, row)) {
 		case LYX_ALIGN_BLOCK: {
 			int const ns = row.countSeparators();
-			/** If we have separators, and this row has
-			 * not be broken abruptly by a display inset
-			 * or newline, then stretch it */
-			if (ns && !row.right_boundary()
-			    && row.endpos() != par.size()) {
+			// If we have separators, then stretch the row
+			if (ns) {
 				row.setSeparatorExtraWidth(double(w) / ns);
-				row.dimension().wid = width;
+				row.dimension().wid += w;
 			} else if (text_->isRTL(par)) {
-				row.dimension().wid = width;
 				row.left_margin += w;
+				row.dimension().wid += w;
 			}
 			break;
 		}
@@ -602,7 +642,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			row.dimension().wid += w;
 			break;
 		case LYX_ALIGN_CENTER:
-			row.dimension().wid = width - w / 2;
+			row.dimension().wid += w / 2;
 			row.left_margin += w / 2;
 			break;
 		case LYX_ALIGN_LEFT:
@@ -612,38 +652,44 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 		case LYX_ALIGN_DECIMAL:
 			break;
 		}
+		return;
 	}
 
-	// Finally,  handle hfill insets
+	hfill = w / nh;
+	hfill_rem = w % nh;
+	row.dimension().wid += w;
+	// Set size of hfill insets
 	pos_type const endpos = row.endpos();
 	pos_type body_pos = par.beginOfBody();
 	if (body_pos > 0
 	    && (body_pos > endpos || !par.isLineSeparator(body_pos - 1)))
 		body_pos = 0;
-	ParagraphMetrics & pm = par_metrics_[pit];
+
+	CoordCache::Insets & insetCache = bv_->coordCache().insets();
 	Row::iterator cit = row.begin();
 	Row::iterator const cend = row.end();
 	for ( ; cit != cend; ++cit) {
 		if (row.label_hfill && cit->endpos == body_pos
 		    && cit->type == Row::SPACE)
 			cit->dim.wid -= int(row.label_hfill * (nlh - 1));
-		if (!cit->inset || !cit->inset->isHfill())
-			continue;
-		if (pm.hfillExpansion(row, cit->pos))
-			cit->dim.wid = int(cit->pos >= body_pos ?
-					   max(hfill, 5.0) : row.label_hfill);
-		else
-			cit->dim.wid = 5;
-		// Cache the inset dimension.
-		bv_->coordCache().insets().add(cit->inset, cit->dim);
-		pm.setInsetDimension(cit->inset, cit->dim);
+		if (cit->inset && pm.hfillExpansion(row, cit->pos)) {
+			if (cit->pos >= body_pos) {
+				cit->dim.wid += hfill;
+				--nh;
+				if (nh == 0)
+					cit->dim.wid += hfill_rem;
+			} else
+				cit->dim.wid += int(row.label_hfill);
+			// Cache the inset dimension.
+			insetCache.add(cit->inset, cit->dim);
+		}
 	}
 }
 
 
-int TextMetrics::labelFill(pit_type const pit, Row const & row) const
+int TextMetrics::labelFill(Row const & row) const
 {
-	Paragraph const & par = text_->getPar(pit);
+	Paragraph const & par = text_->getPar(row.pit());
 	LBUFERR(par.beginOfBody() > 0 || par.isEnvSeparator(0));
 
 	int w = 0;
@@ -754,16 +800,17 @@ private:
  * very sensitive to small changes :) Note that part of the
  * intelligence is also in Row::shortenIfNeeded.
  */
-void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit) const
+bool TextMetrics::breakRow(Row & row, int const right_margin) const
 {
-	Paragraph const & par = text_->getPar(pit);
+	Paragraph const & par = text_->getPar(row.pit());
 	pos_type const end = par.size();
 	pos_type const pos = row.pos();
 	pos_type const body_pos = par.beginOfBody();
 	bool const is_rtl = text_->isRTL(par);
+	bool need_new_row = false;
 
 	row.clear();
-	row.left_margin = leftMargin(max_width_, pit, pos);
+	row.left_margin = leftMargin(max_width_, row.pit(), pos);
 	row.right_margin = right_margin;
 	if (is_rtl)
 		swap(row.left_margin, row.right_margin);
@@ -775,12 +822,9 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
 
 	if (pos >= end || row.width() > width) {
 		row.endpos(end);
-		return;
+		return need_new_row;
 	}
 
-	ParagraphMetrics const & pm = par_metrics_[pit];
-	ParagraphList const & pars = text_->paragraphs();
-
 #if 0
 	//FIXME: As long as leftMargin() is not correctly implemented for
 	// MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here.
@@ -792,19 +836,22 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
 	// check for possible inline completion
 	DocIterator const & ic_it = bv_->inlineCompletionPos();
 	pos_type ic_pos = -1;
-	if (ic_it.inTexted() && ic_it.text() == text_ && ic_it.pit() == pit)
+	if (ic_it.inTexted() && ic_it.text() == text_ && ic_it.pit() == row.pit())
 		ic_pos = ic_it.pos();
 
 	// Now we iterate through until we reach the right margin
 	// or the end of the par, then build a representation of the row.
 	pos_type i = pos;
-	FontIterator fi = FontIterator(*this, par, pit, pos);
-	while (i < end && row.width() <= width) {
+	FontIterator fi = FontIterator(*this, par, row.pit(), pos);
+	do {
+		// this can happen for an empty row after a newline
+		if (i >= end)
+			break;
 		char_type c = par.getChar(i);
 		// The most special cases are handled first.
 		if (par.isInset(i)) {
 			Inset const * ins = par.getInset(i);
-			Dimension dim = pm.insetDimension(ins);
+			Dimension dim = bv_->coordCache().insets().dim(ins);
 			row.add(i, ins, dim, *fi, par.lookupChange(i));
 		} else if (c == ' ' && i + 1 == body_pos) {
 			// There is a space at i, but it should not be
@@ -815,7 +862,7 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
 			// this is needed to make sure that the row width is correct
 			row.finalizeLast();
 			int const add = max(fm.width(par.layout().labelsep),
-					    labelEnd(pit) - row.width());
+			                    labelEnd(row.pit()) - row.width());
 			row.addSpace(i, add, *fi, par.lookupChange(i));
 		} else if (c == '\t')
 			row.addSpace(i, theFontMetrics(*fi).width(from_ascii("    ")),
@@ -858,23 +905,25 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
 		    || (!row.empty() && row.back().inset
 			&& row.back().inset->display())) {
 			row.right_boundary(true);
+			need_new_row = par.isNewline(i);
 			++i;
 			break;
 		}
 
 		++i;
 		++fi;
-	}
+	} while (i < end && row.width() <= width);
 	row.finalizeLast();
 	row.endpos(i);
 
 	// End of paragraph marker
-	if (lyxrc.paragraph_markers
-	    && i == end && size_type(pit + 1) < pars.size()) {
+	ParagraphList const & pars = text_->paragraphs();
+	if (lyxrc.paragraph_markers && !need_new_row
+	    && i == end && size_type(row.pit() + 1) < pars.size()) {
 		// add a virtual element for the end-of-paragraph
 		// marker; it is shown on screen, but does not exist
 		// in the paragraph.
-		Font f(text_->layoutFont(pit));
+		Font f(text_->layoutFont(row.pit()));
 		f.fontInfo().setColor(Color_paragraphmarker);
 		BufferParams const & bparams
 			= text_->inset().buffer().params();
@@ -882,188 +931,148 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
 		row.addVirtual(end, docstring(1, char_type(0x00B6)), f, Change());
 	}
 
-	// if the row is too large, try to cut at last separator.
-	row.shortenIfNeeded(body_pos, width);
+	// if the row is too large, try to cut at last separator. In case
+	// of success, reset indication that the row was broken abruptly.
+	if (row.shortenIfNeeded(body_pos, width))
+		row.right_boundary(!row.empty() && row.back().endpos == row.endpos());
 
 	// make sure that the RTL elements are in reverse ordering
 	row.reverseRTL(is_rtl);
 	//LYXERR0("breakrow: row is " << row);
-}
 
+	return need_new_row;
+}
 
-void TextMetrics::setRowHeight(Row & row, pit_type const pit,
-				    bool topBottomSpace) const
+int TextMetrics::parTopSpacing(pit_type const pit) const
 {
 	Paragraph const & par = text_->getPar(pit);
-	// get the maximum ascent and the maximum descent
-	double layoutasc = 0;
-	double layoutdesc = 0;
-	double const dh = defaultRowHeight();
-
-	// ok, let us initialize the maxasc and maxdesc value.
-	// Only the fontsize count. The other properties
-	// are taken from the layoutfont. Nicer on the screen :)
 	Layout const & layout = par.layout();
 
-	// as max get the first character of this row then it can
-	// increase but not decrease the height. Just some point to
-	// start with so we don't have to do the assignment below too
-	// often.
-	Buffer const & buffer = bv_->buffer();
-	Font font = displayFont(pit, row.pos());
-	FontSize const tmpsize = font.fontInfo().size();
-	font.fontInfo() = text_->layoutFont(pit);
-	FontSize const size = font.fontInfo().size();
-	font.fontInfo().setSize(tmpsize);
+	int asc = 0;
+	ParagraphList const & pars = text_->paragraphs();
+	double const dh = defaultRowHeight();
 
-	FontInfo labelfont = text_->labelFont(par);
+	BufferParams const & bparams = bv_->buffer().params();
+	Inset const & inset = text_->inset();
+	// some parskips VERY EASY IMPLEMENTATION
+	if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
+		&& !inset.getLayout().parbreakIsNewline()
+		&& !par.layout().parbreak_is_newline
+		&& pit > 0
+		&& ((layout.isParagraph() && par.getDepth() == 0)
+		    || (pars[pit - 1].layout().isParagraph()
+		        && pars[pit - 1].getDepth() == 0))) {
+		asc += bparams.getDefSkip().inPixels(*bv_);
+	}
 
-	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
-	FontMetrics const & fontmetrics = theFontMetrics(font);
+	if (par.params().startOfAppendix())
+		asc += int(3 * dh);
+
+	// special code for the top label
+	if (layout.labelIsAbove()
+	    && (!layout.isParagraphGroup() || text_->isFirstInSequence(pit))
+	    && !par.labelString().empty()) {
+		FontInfo labelfont = text_->labelFont(par);
+		FontMetrics const & lfm = theFontMetrics(labelfont);
+		asc += int(lfm.maxHeight() * layout.spacing.getValue()
+		                           * text_->spacing(par)
+		           + (layout.topsep + layout.labelbottomsep) * dh);
+	}
 
-	// these are minimum values
-	double const spacing_val = layout.spacing.getValue()
-		* text_->spacing(par);
-	//lyxerr << "spacing_val = " << spacing_val << endl;
-	int maxasc  = int(fontmetrics.maxAscent()  * spacing_val);
-	int maxdesc = int(fontmetrics.maxDescent() * spacing_val);
+	// Add the layout spaces, for example before and after
+	// a section, or between the items of a itemize or enumerate
+	// environment.
 
-	// insets may be taller
-	ParagraphMetrics const & pm = par_metrics_[pit];
-	Row::const_iterator cit = row.begin();
-	Row::const_iterator cend = row.end();
-	for ( ; cit != cend; ++cit) {
-		if (cit->inset) {
-			Dimension const & dim = pm.insetDimension(cit->inset);
-			maxasc  = max(maxasc,  dim.ascent());
-			maxdesc = max(maxdesc, dim.descent());
-		}
+	pit_type prev = text_->depthHook(pit, par.getDepth());
+	Paragraph const & prevpar = pars[prev];
+	double layoutasc = 0;
+	if (prev != pit
+	    && prevpar.layout() == layout
+	    && prevpar.getDepth() == par.getDepth()
+	    && prevpar.getLabelWidthString() == par.getLabelWidthString()) {
+		layoutasc = layout.itemsep * dh;
+	} else if (pit != 0 && layout.topsep > 0)
+		layoutasc = layout.topsep * dh;
+
+	asc += int(layoutasc * 2 / (2 + pars[pit].getDepth()));
+
+	prev = text_->outerHook(pit);
+	if (prev != pit_type(pars.size())) {
+		asc += int(pars[prev].layout().parsep * dh);
+	} else if (pit != 0) {
+		Paragraph const & prevpar = pars[pit - 1];
+		if (prevpar.getDepth() != 0 || prevpar.layout() == layout)
+			asc += int(layout.parsep * dh);
 	}
 
-	// Check if any custom fonts are larger (Asger)
-	// This is not completely correct, but we can live with the small,
-	// cosmetic error for now.
-	int labeladdon = 0;
-
-	FontSize maxsize =
-		par.highestFontInRange(row.pos(), row.endpos(), size);
-	if (maxsize > font.fontInfo().size()) {
-		// use standard paragraph font with the maximal size
-		FontInfo maxfont = font.fontInfo();
-		maxfont.setSize(maxsize);
-		FontMetrics const & maxfontmetrics = theFontMetrics(maxfont);
-		maxasc  = max(maxasc,  maxfontmetrics.maxAscent());
-		maxdesc = max(maxdesc, maxfontmetrics.maxDescent());
-	}
+	return asc;
+}
 
-	// This is nicer with box insets:
-	++maxasc;
-	++maxdesc;
 
+int TextMetrics::parBottomSpacing(pit_type const pit) const
+{
+	double layoutdesc = 0;
 	ParagraphList const & pars = text_->paragraphs();
-	Inset const & inset = text_->inset();
+	double const dh = defaultRowHeight();
 
-	// is it a top line?
-	if (row.pos() == 0 && topBottomSpace) {
-		BufferParams const & bufparams = buffer.params();
-		// some parskips VERY EASY IMPLEMENTATION
-		if (bufparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
-		    && !inset.getLayout().parbreakIsNewline()
-		    && !par.layout().parbreak_is_newline
-		    && pit > 0
-		    && ((layout.isParagraph() && par.getDepth() == 0)
-			|| (pars[pit - 1].layout().isParagraph()
-			    && pars[pit - 1].getDepth() == 0))) {
-			maxasc += bufparams.getDefSkip().inPixels(*bv_);
+	// add the layout spaces, for example before and after
+	// a section, or between the items of a itemize or enumerate
+	// environment
+	pit_type nextpit = pit + 1;
+	if (nextpit != pit_type(pars.size())) {
+		pit_type cpit = pit;
+
+		if (pars[cpit].getDepth() > pars[nextpit].getDepth()) {
+			double usual = pars[cpit].layout().bottomsep * dh;
+			double unusual = 0;
+			cpit = text_->depthHook(cpit, pars[nextpit].getDepth());
+			if (pars[cpit].layout() != pars[nextpit].layout()
+				|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
+				unusual = pars[cpit].layout().bottomsep * dh;
+			layoutdesc = max(unusual, usual);
+		} else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) {
+			if (pars[cpit].layout() != pars[nextpit].layout()
+				|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
+				layoutdesc = int(pars[cpit].layout().bottomsep * dh);
 		}
+	}
 
-		if (par.params().startOfAppendix())
-			maxasc += int(3 * dh);
-
-		// special code for the top label
-		if (layout.labelIsAbove()
-		    && (!layout.isParagraphGroup() || text_->isFirstInSequence(pit))
-		    && !par.labelString().empty()) {
-			labeladdon = int(
-				  labelfont_metrics.maxHeight()
-					* layout.spacing.getValue()
-					* text_->spacing(par)
-				+ (layout.topsep + layout.labelbottomsep) * dh);
-		}
+	return int(layoutdesc * 2 / (2 + pars[pit].getDepth()));
+}
 
-		// Add the layout spaces, for example before and after
-		// a section, or between the items of a itemize or enumerate
-		// environment.
 
-		pit_type prev = text_->depthHook(pit, par.getDepth());
-		Paragraph const & prevpar = pars[prev];
-		if (prev != pit
-		    && prevpar.layout() == layout
-		    && prevpar.getDepth() == par.getDepth()
-		    && prevpar.getLabelWidthString()
-					== par.getLabelWidthString()) {
-			layoutasc = layout.itemsep * dh;
-		} else if (pit != 0 || row.pos() != 0) {
-			if (layout.topsep > 0)
-				layoutasc = layout.topsep * dh;
-		}
+void TextMetrics::setRowHeight(Row & row) const
+{
+	Paragraph const & par = text_->getPar(row.pit());
+	Layout const & layout = par.layout();
+	double const spacing_val = layout.spacing.getValue() * text_->spacing(par);
 
-		prev = text_->outerHook(pit);
-		if (prev != pit_type(pars.size())) {
-			maxasc += int(pars[prev].layout().parsep * dh);
-		} else if (pit != 0) {
-			Paragraph const & prevpar = pars[pit - 1];
-			if (prevpar.getDepth() != 0 ||
-					prevpar.layout() == layout) {
-				maxasc += int(layout.parsep * dh);
-			}
-		}
-	}
+	// Initial value for ascent (useful if row is empty).
+	Font const font = displayFont(row.pit(), row.pos());
+	FontMetrics const & fm = theFontMetrics(font);
+	int maxasc = int(fm.maxAscent() * spacing_val);
+	int maxdes = int(fm.maxDescent() * spacing_val);
 
-	// is it a bottom line?
-	if (row.endpos() >= par.size() && topBottomSpace) {
-		// add the layout spaces, for example before and after
-		// a section, or between the items of a itemize or enumerate
-		// environment
-		pit_type nextpit = pit + 1;
-		if (nextpit != pit_type(pars.size())) {
-			pit_type cpit = pit;
-
-			if (pars[cpit].getDepth() > pars[nextpit].getDepth()) {
-				double usual = pars[cpit].layout().bottomsep * dh;
-				double unusual = 0;
-				cpit = text_->depthHook(cpit, pars[nextpit].getDepth());
-				if (pars[cpit].layout() != pars[nextpit].layout()
-				    || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
-					unusual = pars[cpit].layout().bottomsep * dh;
-				layoutdesc = max(unusual, usual);
-			} else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) {
-				if (pars[cpit].layout() != pars[nextpit].layout()
-					|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
-					layoutdesc = int(pars[cpit].layout().bottomsep * dh);
-			}
+	// Find the ascent/descent of the row contents
+	Row::const_iterator cit = row.begin();
+	Row::const_iterator cend = row.end();
+	for ( ; cit != cend; ++cit) {
+		if (cit->inset) {
+			maxasc = max(maxasc, cit->dim.ascent());
+			maxdes = max(maxdes, cit->dim.descent());
+		} else {
+			FontMetrics const & fm = theFontMetrics(cit->font);
+			maxasc = max(maxasc, int(fm.maxAscent() * spacing_val));
+			maxdes = max(maxdes, int(fm.maxDescent() * spacing_val));
 		}
 	}
 
-	// incalculate the layout spaces
-	maxasc  += int(layoutasc  * 2 / (2 + pars[pit].getDepth()));
-	maxdesc += int(layoutdesc * 2 / (2 + pars[pit].getDepth()));
-
-	// FIXME: the correct way is to do the following is to move the
-	// following code in another method specially tailored for the
-	// main Text. The following test is thus bogus.
-	// Top and bottom margin of the document (only at top-level)
-	if (main_text_ && topBottomSpace) {
-		if (pit == 0 && row.pos() == 0)
-			maxasc += 20;
-		if (pit + 1 == pit_type(pars.size()) &&
-		    row.endpos() == par.size() &&
-				!(row.endpos() > 0 && par.isNewline(row.endpos() - 1)))
-			maxdesc += 20;
-	}
+	// This is nicer with box insets
+	++maxasc;
+	++maxdes;
 
-	row.dimension().asc = maxasc + labeladdon;
-	row.dimension().des = maxdesc;
+	row.dimension().asc = maxasc;
+	row.dimension().des = maxdes;
 }
 
 
@@ -1080,6 +1089,10 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x,
 	int const xo = origin_.x_;
 	x -= xo;
 
+	// Adapt to cursor row scroll offset if applicable.
+	int const offset = bv_->horizScrollOffset(text_, row.pit(), row.pos());
+	x += offset;
+
 	pos_type pos = row.pos();
 	boundary = false;
 	if (row.empty())
@@ -1125,11 +1138,18 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x,
 	 * row is larger than the end of its last element.
 	 */
 	if (!row.empty() && pos == row.back().endpos
-	    && row.back().endpos == row.endpos())
-		boundary = true;
+	    && row.back().endpos == row.endpos()) {
+		Inset const * inset = row.back().inset;
+		if (inset && (inset->lyxCode() == NEWLINE_CODE
+		              || inset->lyxCode() == SEPARATOR_CODE))
+			pos = row.back().pos;
+		else
+			boundary = row.right_boundary();
+	}
 
-	x += xo;
+	x += xo - offset;
 	//LYXERR0("getPosNearX ==> pos=" << pos << ", boundary=" << boundary);
+
 	return pos;
 }
 
@@ -1327,9 +1347,9 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 	if (edited == inset && cur.pos() == it->pos) {
 		// non-editable inset, set cursor after the inset if x is
 		// nearer to that position (bug 9628)
-		ParagraphMetrics const & pm = par_metrics_[pit];
-		Dimension const & dim = pm.insetDimension(inset);
-		Point p = bv_->coordCache().getInsets().xy(inset);
+		CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
+		Dimension const & dim = insetCache.dim(inset);
+		Point p = insetCache.xy(inset);
 		bool const is_rtl = text_->isRTL(text_->getPar(pit));
 		if (is_rtl) {
 			// "in front of" == "right of"
@@ -1389,7 +1409,7 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
 {
 	Paragraph const & par = text_->paragraphs()[pit];
-	ParagraphMetrics const & pm = par_metrics_[pit];
+	CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
 
 	LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << "  pit: " << pit);
 
@@ -1400,13 +1420,13 @@ InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
 
 		LYXERR(Debug::DEBUG, "examining inset " << inset);
 
-		if (!bv_->coordCache().getInsets().has(inset)) {
+		if (!insetCache.has(inset)) {
 			LYXERR(Debug::DEBUG, "inset has no cached position");
 			return 0;
 		}
 
-		Dimension const & dim = pm.insetDimension(inset);
-		Point p = bv_->coordCache().getInsets().xy(inset);
+		Dimension const & dim = insetCache.dim(inset);
+		Point p = insetCache.xy(inset);
 
 		LYXERR(Debug::DEBUG, "xo: " << p.x_ << "..." << p.x_ + dim.wid
 			<< " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des);
@@ -1558,7 +1578,8 @@ bool TextMetrics::cursorEnd(Cursor & cur)
 			boundary = true;
 		else
 			--end;
-	}
+	} else if (cur.paragraph().isEnvSeparator(end-1))
+		--end;
 	return text_->setCursor(cur, cur.pit(), end, true, boundary);
 }
 
@@ -1571,7 +1592,7 @@ void TextMetrics::deleteLineForward(Cursor & cur)
 		text_->cursorForward(cur);
 	} else {
 		cur.resetAnchor();
-		cur.setSelection(true); // to avoid deletion
+		cur.selection(true); // to avoid deletion
 		cursorEnd(cur);
 		cur.setSelection();
 		// What is this test for ??? (JMarc)
@@ -1584,17 +1605,17 @@ void TextMetrics::deleteLineForward(Cursor & cur)
 }
 
 
-bool TextMetrics::isLastRow(pit_type pit, Row const & row) const
+bool TextMetrics::isLastRow(Row const & row) const
 {
 	ParagraphList const & pars = text_->paragraphs();
-	return row.endpos() >= pars[pit].size()
-		&& pit + 1 == pit_type(pars.size());
+	return row.endpos() >= pars[row.pit()].size()
+		&& row.pit() + 1 == pit_type(pars.size());
 }
 
 
-bool TextMetrics::isFirstRow(pit_type pit, Row const & row) const
+bool TextMetrics::isFirstRow(Row const & row) const
 {
-	return row.pos() == 0 && pit == 0;
+	return row.pos() == 0 && row.pit() == 0;
 }
 
 
@@ -1618,6 +1639,7 @@ int TextMetrics::leftMargin(int max_width,
 	//lyxerr << "TextMetrics::leftMargin: pit: " << pit << " pos: " << pos << endl;
 	DocumentClass const & tclass = buffer.params().documentClass();
 	Layout const & layout = par.layout();
+	FontMetrics const & bfm = theFontMetrics(buffer.params().getFont());
 
 	docstring parindent = layout.parindent;
 
@@ -1626,8 +1648,7 @@ int TextMetrics::leftMargin(int max_width,
 	if (text_->isMainText())
 		l_margin += bv_->leftMargin();
 
-	l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-		tclass.leftmargin());
+	l_margin += bfm.signedWidth(tclass.leftmargin());
 
 	int depth = par.getDepth();
 	if (depth != 0) {
@@ -1645,8 +1666,7 @@ int TextMetrics::leftMargin(int max_width,
 				    buffer.params().paragraph_separation ==
 				    BufferParams::ParagraphIndentSeparation) {
 					docstring pi = pars[newpar].layout().parindent;
-					l_margin -= theFontMetrics(
-						buffer.params().getFont()).signedWidth(pi);
+					l_margin -= bfm.signedWidth(pi);
 				}
 			}
 			if (tclass.isDefaultLayout(par.layout())
@@ -1675,37 +1695,36 @@ int TextMetrics::leftMargin(int max_width,
 	}
 
 	FontInfo const labelfont = text_->labelFont(par);
-	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
+	FontMetrics const & lfm = theFontMetrics(labelfont);
 
 	switch (layout.margintype) {
 	case MARGIN_DYNAMIC:
 		if (!layout.leftmargin.empty()) {
-			l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-				layout.leftmargin);
+			l_margin += bfm.signedWidth(layout.leftmargin);
 		}
 		if (!par.labelString().empty()) {
-			l_margin += labelfont_metrics.signedWidth(layout.labelindent);
-			l_margin += labelfont_metrics.width(par.labelString());
-			l_margin += labelfont_metrics.width(layout.labelsep);
+			l_margin += lfm.signedWidth(layout.labelindent);
+			l_margin += lfm.width(par.labelString());
+			l_margin += lfm.width(layout.labelsep);
 		}
 		break;
 
 	case MARGIN_MANUAL: {
-		l_margin += labelfont_metrics.signedWidth(layout.labelindent);
+		l_margin += lfm.signedWidth(layout.labelindent);
 		// The width of an empty par, even with manual label, should be 0
 		if (!par.empty() && pos >= par.beginOfBody()) {
 			if (!par.getLabelWidthString().empty()) {
 				docstring labstr = par.getLabelWidthString();
-				l_margin += labelfont_metrics.width(labstr);
-				l_margin += labelfont_metrics.width(layout.labelsep);
+				l_margin += lfm.width(labstr);
+				l_margin += lfm.width(layout.labelsep);
 			}
 		}
 		break;
 	}
 
 	case MARGIN_STATIC: {
-		l_margin += theFontMetrics(buffer.params().getFont()).
-			signedWidth(layout.leftmargin) * 4	/ (par.getDepth() + 4);
+		l_margin += bfm.signedWidth(layout.leftmargin) * 4
+		             / (par.getDepth() + 4);
 		break;
 	}
 
@@ -1713,20 +1732,20 @@ int TextMetrics::leftMargin(int max_width,
 		if (layout.labeltype == LABEL_MANUAL) {
 			// if we are at position 0, we are never in the body
 			if (pos > 0 && pos >= par.beginOfBody())
-				l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
+				l_margin += lfm.signedWidth(layout.leftmargin);
 			else
-				l_margin += labelfont_metrics.signedWidth(layout.labelindent);
+				l_margin += lfm.signedWidth(layout.labelindent);
 		} else if (pos != 0
 			   // Special case to fix problems with
 			   // theorems (JMarc)
 			   || (layout.labeltype == LABEL_STATIC
 			       && layout.latextype == LATEX_ENVIRONMENT
 			       && !text_->isFirstInSequence(pit))) {
-			l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
+			l_margin += lfm.signedWidth(layout.leftmargin);
 		} else if (!layout.labelIsAbove()) {
-			l_margin += labelfont_metrics.signedWidth(layout.labelindent);
-			l_margin += labelfont_metrics.width(layout.labelsep);
-			l_margin += labelfont_metrics.width(par.labelString());
+			l_margin += lfm.signedWidth(layout.labelindent);
+			l_margin += lfm.width(layout.labelsep);
+			l_margin += lfm.width(par.labelString());
 		}
 		break;
 
@@ -1743,7 +1762,7 @@ int TextMetrics::leftMargin(int max_width,
 		for ( ; rit != end; ++rit)
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
-		l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(layout.leftmargin);
+		l_margin += bfm.signedWidth(layout.leftmargin);
 		l_margin += minfill;
 #endif
 		// also wrong, but much shorter.
@@ -1753,7 +1772,7 @@ int TextMetrics::leftMargin(int max_width,
 	}
 
 	if (!par.params().leftIndent().zero())
-		l_margin += par.params().leftIndent().inPixels(max_width, labelfont_metrics.em());
+		l_margin += par.params().leftIndent().inPixels(max_width, lfm.em());
 
 	LyXAlignment align;
 
@@ -1787,8 +1806,7 @@ int TextMetrics::leftMargin(int max_width,
 			// the indentation set in the document
 			// settings
 			if (buffer.params().getIndentation().asLyXCommand() == "default")
-				l_margin += theFontMetrics(
-					buffer.params().getFont()).signedWidth(parindent);
+				l_margin += bfm.signedWidth(parindent);
 			else
 				l_margin += buffer.params().getIndentation().inPixels(*bv_);
 		}
@@ -1822,15 +1840,30 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 
 void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const x, int y) const
 {
-	BufferParams const & bparams = bv_->buffer().params();
 	ParagraphMetrics const & pm = par_metrics_[pit];
 	if (pm.rows().empty())
 		return;
-
-	bool const original_drawing_state = pi.pain.isDrawingEnabled();
-	int const ww = bv_->workHeight();
 	size_t const nrows = pm.rows().size();
 
+	// Use fast lane when drawing is disabled.
+	if (!pi.pain.isDrawingEnabled()) {
+		for (size_t i = 0; i != nrows; ++i) {
+
+			Row const & row = pm.rows()[i];
+			// Adapt to cursor row scroll offset if applicable.
+			int row_x = x - bv_->horizScrollOffset(text_, pit, row.pos());
+			if (i)
+				y += row.ascent();
+
+			RowPainter rp(pi, *text_, row, row_x, y);
+
+			rp.paintOnlyInsets();
+			y += row.descent();
+		}
+		return;
+	}
+
+	int const ww = bv_->workHeight();
 	Cursor const & cur = bv_->cursor();
 	DocIterator sel_beg = cur.selectionBegin();
 	DocIterator sel_end = cur.selectionEnd();
@@ -1860,25 +1893,25 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 	for (size_t i = 0; i != nrows; ++i) {
 
 		Row const & row = pm.rows()[i];
-		int row_x = x;
+		// Adapt to cursor row scroll offset if applicable.
+		int row_x = x - bv_->horizScrollOffset(text_, pit, row.pos());
 		if (i)
 			y += row.ascent();
 
-		CursorSlice rowSlice(const_cast<InsetText &>(text_->inset()));
-		rowSlice.pit() = pit;
-		rowSlice.pos() = row.pos();
+		RowPainter rp(pi, *text_, row, row_x, y);
 
+		// It is not needed to draw on screen if we are not inside.
 		bool const inside = (y + row.descent() >= 0
 			&& y - row.ascent() < ww);
-
-		// Adapt to cursor row scroll offset if applicable.
-		if (bv_->currentRowSlice() == rowSlice)
-			row_x -= bv_->horizScrollOffset();
-
-		// 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, row_x, y);
+		pi.pain.setDrawingEnabled(inside);
+		if (!inside) {
+			// Paint only the insets to set inset cache correctly
+			// FIXME: remove paintOnlyInsets when we know that positions
+			// have already been set.
+			rp.paintOnlyInsets();
+			y += row.descent();
+			continue;
+		}
 
 		if (selection)
 			row.setSelectionAndMargins(sel_beg_par, sel_end_par);
@@ -1895,10 +1928,9 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 		}
 
 		// Row signature; has row changed since last paint?
-		if (pi.pain.isDrawingEnabled())
-			row.setCrc(pm.computeRowSignature(row, bparams));
+		row.setCrc(pm.computeRowSignature(row, *bv_));
 		bool row_has_changed = row.changed()
-			|| rowSlice == bv_->lastRowSlice();
+			|| bv_->hadHorizScrollOffset(text_, pit, row.pos());
 
 		// Take this opportunity to spellcheck the row contents.
 		if (row_has_changed && pi.do_spellcheck && lyxrc.spellcheck_continuously) {
@@ -1927,7 +1959,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 
 		// Instrumentation for testing row cache (see also
 		// 12 lines lower):
-		if (lyxerr.debugging(Debug::PAINTING) && inside
+		if (lyxerr.debugging(Debug::PAINTING)
 			&& (row.selection() || pi.full_repaint || row_has_changed)) {
 				string const foreword = text_->isMainText() ?
 					"main text redraw " : "inset text redraw: ";
@@ -1957,15 +1989,15 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 			rp.paintLast();
 		if (i == 0 && is_rtl)
 			rp.paintFirst();
-		rp.paintTooLargeMarks(row_x < 0,
-				      row_x + row.width() > bv_->workWidth());
+		rp.paintTooLargeMarks(row_x + row.left_x() < 0,
+				      row_x + row.right_x() > bv_->workWidth());
 		y += row.descent();
 
 		// Restore full_repaint status.
 		pi.full_repaint = tmp;
 	}
 	// Re-enable screen drawing for future use of the painter.
-	pi.pain.setDrawingEnabled(original_drawing_state);
+	pi.pain.setDrawingEnabled(true);
 
 	//LYXERR(Debug::PAINTING, ".");
 }
@@ -1981,18 +2013,19 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y,
 	DocIterator wordStart = bvcur;
 	wordStart.pos() -= word.length();
 
-	// get position on screen of the word start and end
-	//FIXME: Is it necessary to explicitly set this to false?
-	wordStart.boundary(false);
-	Point lxy = cur.bv().getPos(wordStart);
-	Point rxy = cur.bv().getPos(bvcur);
-
 	// calculate dimensions of the word
 	Row row;
+	row.pit(bvcur.pit());
 	row.pos(wordStart.pos());
 	row.endpos(bvcur.pos());
-	setRowHeight(row, bvcur.pit(), false);
+	setRowHeight(row);
 	dim = row.dimension();
+
+	// get position on screen of the word start and end
+	//FIXME: Is it necessary to explicitly set this to false?
+	wordStart.boundary(false);
+	Point lxy = cur.bv().getPos(wordStart);
+	Point rxy = cur.bv().getPos(bvcur);
 	dim.wid = abs(rxy.x_ - lxy.x_);
 
 	// calculate position of word