X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=e28d8fc9785873de5b8d8733a2163d117b502870;hb=1ab314f8e6e145dc73d0a26b7e82a280b497ea3c;hp=3dd79c234fc7510d31b0388513eee7aaf2db8630;hpb=55beda376a4614ab9db56733e4a1cb42286568ae;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 3dd79c234f..e28d8fc978 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -24,11 +24,12 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "Color.h"
+#include "CoordCache.h"
+#include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
+#include "InsetList.h"
 #include "Layout.h"
 #include "Length.h"
 #include "LyXRC.h"
@@ -38,18 +39,18 @@
 #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>
+#include "support/debug.h"
 
-using std::make_pair;
-using std::max;
-using std::min;
-using std::endl;
-using std::pair;
+using namespace std;
 
 namespace lyx {
 
@@ -154,17 +155,15 @@ pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
 }
 
 
-ParagraphMetrics & TextMetrics::parMetrics(pit_type pit,
-		bool redo)
+ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo)
 {
 	ParMetricsCache::iterator pmc_it = par_metrics_.find(pit);
 	if (pmc_it == par_metrics_.end()) {
 		pmc_it = par_metrics_.insert(
 			make_pair(pit, ParagraphMetrics(text_->getPar(pit)))).first;
 	}
-	if (pmc_it->second.rows().empty() && redo) {
+	if (pmc_it->second.rows().empty() && redo)
 		redoParagraph(pit);
-	}
 	return pmc_it->second;
 }
 
@@ -173,7 +172,7 @@ int TextMetrics::parPosition(pit_type pit) const
 {
 	if (pit < par_metrics_.begin()->first)
 		return -1000000;
-	else if (pit > par_metrics_.rbegin()->first)
+	if (pit > par_metrics_.rbegin()->first)
 		return +1000000;
 
 	return par_metrics_[pit].position();
@@ -222,21 +221,21 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 
 int TextMetrics::rightMargin(ParagraphMetrics const & pm) const
 {
-	return main_text_? pm.rightMargin(bv_->buffer()) : 0;
+	return main_text_? pm.rightMargin(*bv_) : 0;
 }
 
 
 int TextMetrics::rightMargin(pit_type const pit) const
 {
-	return main_text_? par_metrics_[pit].rightMargin(bv_->buffer()) : 0;
+	return main_text_? par_metrics_[pit].rightMargin(*bv_) : 0;
 }
 
 
 void TextMetrics::applyOuterFont(Font & font) const
 {
 	Font lf(font_);
-	lf.reduce(bv_->buffer().params().getFont());
-	lf.realize(font);
+	lf.fontInfo().reduce(bv_->buffer().params().getFont().fontInfo());
+	lf.fontInfo().realize(font.fontInfo());
 	lf.setLanguage(font.language());
 	font = lf;
 }
@@ -261,21 +260,22 @@ Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
 			applyOuterFont(f);
 		bool lab = layout->labeltype == LABEL_MANUAL && pos < body_pos;
 
-		Font const & lf = lab ? layout->labelfont : layout->font;
-		Font rlf = lab ? layout->reslabelfont : layout->resfont;
+		FontInfo const & lf = lab ? layout->labelfont : layout->font;
+		FontInfo rlf = lab ? layout->reslabelfont : layout->resfont;
 		
 		// In case the default family has been customized
-		if (lf.family() == Font::INHERIT_FAMILY)
-			rlf.setFamily(params.getFont().family());
-		return f.realize(rlf);
+		if (lf.family() == INHERIT_FAMILY)
+			rlf.setFamily(params.getFont().fontInfo().family());
+		f.fontInfo().realize(rlf);
+		return f;
 	}
 
 	// The uncommon case need not be optimized as much
-	Font const & layoutfont = pos < body_pos ? 
+	FontInfo const & layoutfont = pos < body_pos ? 
 		layout->labelfont : layout->font;
 
 	Font font = par.getFontSettings(params, pos);
-	font.realize(layoutfont);
+	font.fontInfo().realize(layoutfont);
 
 	if (!text_->isMainText(buffer))
 		applyOuterFont(font);
@@ -284,10 +284,10 @@ Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
 	// NOTE: the cast to pit_type should be removed when pit_type
 	// changes to a unsigned integer.
 	if (pit < pit_type(pars.size()))
-		font.realize(outerFont(pit, pars));
+		font.fontInfo().realize(outerFont(pit, pars).fontInfo());
 
 	// Realize with the fonts of lesser depth.
-	font.realize(params.getFont());
+	font.fontInfo().realize(params.getFont().fontInfo());
 
 	return font;
 }
@@ -354,7 +354,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;
 
@@ -366,30 +365,58 @@ 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;
+	else {
+		LYXERR(Debug::INFO, "MacroContext not initialised!"
+			<< " Going through the buffer again and hope"
+			<< " the context is better then.");
+		updateLabels(bv_->buffer());
+		parPos = text_->macrocontextPosition();
+		BOOST_ASSERT(!parPos.empty());
+		parPos.pit() = pit;
+	}
+	
 	// redo insets
 	// FIXME: We should always use getFont(), see documentation of
 	// noFontChange() in Inset.h.
 	Font const bufferfont = buffer.params().getFont();
-	InsetList::const_iterator ii = par.insetlist.begin();
-	InsetList::const_iterator iend = par.insetlist.end();
+	InsetList::const_iterator ii = par.insetList().begin();
+	InsetList::const_iterator iend = par.insetList().end();
 	for (; ii != iend; ++ii) {
+		// position already initialized?
+		if (!parPos.empty()) {
+			parPos.pos() = ii->pos;
+		
+			// A macro template would normally not be visible 
+			// by itself. But the tex macro semantics allow 
+			// recursion, so we artifically take the context
+			// after the macro template to simulate this.
+			if (ii->inset->lyxCode() == MATHMACRO_CODE)
+				parPos.pos()++;
+		}
+
+		// do the metric calculation
 		Dimension dim;
 		int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
 			- right_margin;
 		Font const & font = ii->inset->noFontChange() ?
 			bufferfont : getDisplayFont(pit, ii->pos);
-		MetricsInfo mi(bv_, font, w);
+		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);
@@ -432,8 +459,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 			// 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];
@@ -447,11 +474,10 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		row.setDimension(dim);
 		int const max_row_width = max(dim_.wid, dim.wid);
 		computeRowMetrics(pit, row, max_row_width);
-		pm.computeRowSignature(row, bparams);
 		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());
 
@@ -461,9 +487,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];
@@ -473,7 +498,6 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		row.setDimension(dim);
 		int const max_row_width = max(dim_.wid, dim.wid);
 		computeRowMetrics(pit, row, max_row_width);
-		pm.computeRowSignature(row, bparams);
 		pm.dim().des += dim.height();
 	}
 
@@ -489,9 +513,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 void TextMetrics::computeRowMetrics(pit_type const pit,
 		Row & row, int width) const
 {
-
 	row.label_hfill = 0;
-	row.hfill = 0;
 	row.separator = 0;
 
 	Buffer & buffer = bv_->buffer();
@@ -531,12 +553,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!
@@ -550,24 +571,19 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			align = par.params().align();
 
 		// Display-style insets should always be on a centred row
-		// The test on par.size() is to catch zero-size pars, which
-		// would trigger the assert in Paragraph::getInset().
-		//inset = par.size() ? par.getInset(row.pos()) : 0;
-		if (row.pos() < par.size()
-		    && par.isInset(row.pos()))
-		{
-		    switch(par.getInset(row.pos())->display()) {
-			case Inset::AlignLeft:
-				align = LYX_ALIGN_BLOCK;
-				break;
-			case Inset::AlignCenter:
-				align = LYX_ALIGN_CENTER;
-				break;
-                        case Inset::Inline:
-                        case Inset::AlignRight:
-                                // unchanged (use align)
-                                break;
-                    }
+		if (Inset const * inset = par.getInset(row.pos())) {
+			switch (inset->display()) {
+				case Inset::AlignLeft:
+					align = LYX_ALIGN_BLOCK;
+					break;
+				case Inset::AlignCenter:
+					align = LYX_ALIGN_CENTER;
+					break;
+				case Inset::Inline:
+				case Inset::AlignRight:
+					// unchanged (use align)
+					break;
+			}
 		}
 
 		switch (align) {
@@ -617,6 +633,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);
+	}
 }
 
 
@@ -650,10 +690,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();
 
@@ -664,8 +702,6 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 	return end;
 }
 
-};
-
 
 int TextMetrics::labelEnd(pit_type const pit) const
 {
@@ -720,7 +756,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;
 		}
 
@@ -736,7 +772,6 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 					point = i;
 				else
 					point = i + 1;
-
 			}
 			// exit on last registered breakpoint:
 			break;
@@ -746,20 +781,22 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 			point = i + 1;
 			break;
 		}
+		Inset const * inset = 0;
 		// Break before...
 		if (i + 1 < end) {
-			if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
+			if ((inset = par.getInset(i + 1)) && inset->display()) {
 				point = i + 1;
 				break;
 			}
 			// ...and after.
-			if (par.isInset(i) && par.getInset(i)->display()) {
+			if ((inset = par.getInset(i)) && inset->display()) {
 				point = i + 1;
 				break;
 			}
 		}
 
-		if (!par.isInset(i) || par.getInset(i)->isChar()) {
+		inset = par.getInset(i);
+		if (!inset || inset->isChar()) {
 			// some insets are line separators too
 			if (par.isLineSeparator(i)) {
 				// register breakpoint:
@@ -824,7 +861,7 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 }
 
 
-boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const first,
+Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 		pos_type const end) const
 {
 	Paragraph const & par = text_->getPar(pit);
@@ -844,12 +881,12 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 	// often.
 	Buffer const & buffer = bv_->buffer();
 	Font font = getDisplayFont(pit, first);
-	Font::FONT_SIZE const tmpsize = font.size();
-	font = text_->getLayoutFont(buffer, pit);
-	Font::FONT_SIZE const size = font.size();
-	font.setSize(tmpsize);
+	FontSize const tmpsize = font.fontInfo().size();
+	font.fontInfo() = text_->getLayoutFont(buffer, pit);
+	FontSize const size = font.fontInfo().size();
+	font.fontInfo().setSize(tmpsize);
 
-	Font labelfont = text_->getLabelFont(buffer, par);
+	FontInfo labelfont = text_->getLabelFont(buffer, par);
 
 	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 	FontMetrics const & fontmetrics = theFontMetrics(font);
@@ -863,8 +900,8 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 
 	// insets may be taller
 	ParagraphMetrics const & pm = par_metrics_[pit];
-	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 const & dim = pm.insetDimension(ii->inset);
 		if (ii->pos >= first && ii->pos < end) {
@@ -878,11 +915,11 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 	// cosmetic error for now.
 	int labeladdon = 0;
 
-	Font::FONT_SIZE maxsize =
+	FontSize maxsize =
 		par.highestFontInRange(first, end, size);
-	if (maxsize > font.size()) {
+	if (maxsize > font.fontInfo().size()) {
 		// use standard paragraph font with the maximal size
-		Font maxfont = font;
+		FontInfo maxfont = font.fontInfo();
 		maxfont.setSize(maxsize);
 		FontMetrics const & maxfontmetrics = theFontMetrics(maxfont);
 		maxasc  = max(maxasc,  maxfontmetrics.maxAscent());
@@ -1011,7 +1048,7 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 			maxdesc += 20;
 	}
 
-	return boost::make_tuple(maxasc + labeladdon, maxdesc);
+	return Dimension(0, maxasc + labeladdon, maxdesc);
 }
 
 
@@ -1029,7 +1066,6 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 	int const xo = origin_.x_;
 	x -= xo;
 	Paragraph const & par = text_->getPar(pit);
-	ParagraphMetrics const & pm = par_metrics_[pit];
 	Bidi bidi;
 	bidi.computeTables(par, buffer, row);
 
@@ -1066,19 +1102,9 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 				tmpx -= singleWidth(pit, body_pos - 1);
 		}
 
-		if (pm.hfillExpansion(row, c)) {
-			tmpx += singleWidth(pit, c);
-			if (c >= body_pos)
-				tmpx += row.hfill;
-			else
-				tmpx += row.label_hfill;
-		} else if (par.isSeparator(c)) {
-			tmpx += singleWidth(pit, c);
-			if (c >= body_pos)
+		tmpx += singleWidth(pit, c);
+		if (par.isSeparator(c) && c >= body_pos)
 				tmpx += row.separator;
-		} else {
-			tmpx += singleWidth(pit, c);
-		}
 		++vc;
 	}
 
@@ -1099,9 +1125,10 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 	bool const rtl = lastrow ? text_->isRTL(buffer, par) : false;
 	if (lastrow &&
 	    ((rtl  &&  left_side && vc == row.pos() && x < tmpx - 5) ||
-	     (!rtl && !left_side && vc == end  && x > tmpx + 5)))
-		c = end;
-	else if (vc == row.pos()) {
+	     (!rtl && !left_side && vc == end  && x > tmpx + 5))) {
+		if (!par.isNewline(end - 1))
+			c = end;
+	} else if (vc == row.pos()) {
 		c = bidi.vis2log(vc);
 		if (bidi.level(c) % 2 == 1)
 			++c;
@@ -1182,7 +1209,7 @@ void TextMetrics::newParMetricsDown()
 	// do it and update its position.
 	redoParagraph(pit);
 	par_metrics_[pit].setPosition(last.second.position()
-		+ last.second.descent());
+		+ last.second.descent() + par_metrics_[pit].ascent());
 }
 
 
@@ -1196,20 +1223,17 @@ void TextMetrics::newParMetricsUp()
 	// do it and update its position.
 	redoParagraph(pit);
 	par_metrics_[pit].setPosition(first.second.position()
-		- first.second.ascent());
+		- first.second.ascent() - par_metrics_[pit].descent());
 }
 
 // y is screen coordinate
 pit_type TextMetrics::getPitNearY(int y)
 {
 	BOOST_ASSERT(!text_->paragraphs().empty());
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": y: " << y << " cache size: " << par_metrics_.size()
-		<< endl;
+	LYXERR(Debug::DEBUG, "y: " << y << " cache size: " << par_metrics_.size());
 
 	// look for highest numbered paragraph with y coordinate less than given y
-	pit_type pit = 0;
+	pit_type pit = -1;
 	int yy = -1;
 	ParMetricsCache::const_iterator it = par_metrics_.begin();
 	ParMetricsCache::const_iterator et = par_metrics_.end();
@@ -1217,44 +1241,37 @@ pit_type TextMetrics::getPitNearY(int y)
 
 	ParagraphMetrics const & pm = it->second;
 
-	// If we are off-screen (before the visible part)
-	if (y < 0
-		// and even before the first paragraph in the cache.
-		&& y < it->second.position() - int(pm.ascent())) {
-		//  and we are not at the first paragraph in the inset.
+	if (y < it->second.position() - int(pm.ascent())) {
+		// We are looking for a position that is before the first paragraph in
+		// the cache (which is in priciple off-screen, that is before the
+		// visible part.
 		if (it->first == 0)
+			// We are already at the first paragraph in the inset.
 			return 0;
-		// then this is the paragraph we are looking for.
+		// OK, this is the paragraph we are looking for.
 		pit = it->first - 1;
-		// rebreak it and update the CoordCache.
-		redoParagraph(pit);
-		par_metrics_[pit].setPosition(it->second.position() - pm.descent());
+		newParMetricsUp();
 		return pit;
 	}
 
 	ParagraphMetrics const & pm_last = par_metrics_[last->first];
 
-	// If we are off-screen (after the visible part)
-	if (y > bv_->workHeight()
-		// and even after the first paragraph in the cache.
-		&& y >= last->second.position() + int(pm_last.descent())) {
+	if (y >= last->second.position() + int(pm_last.descent())) {
+		// We are looking for a position that is after the last paragraph in
+		// the cache (which is in priciple off-screen, that is before the
+		// visible part.
 		pit = last->first + 1;
-		//  and we are not at the last paragraph in the inset.
 		if (pit == int(text_->paragraphs().size()))
+			//  We are already at the last paragraph in the inset.
 			return last->first;
-		// then this is the paragraph we are looking for.
-		// rebreak it and update the CoordCache.
-		redoParagraph(pit);
-		par_metrics_[pit].setPosition(last->second.position() + pm_last.ascent());
+		// OK, this is the paragraph we are looking for.
+		newParMetricsDown();
 		return pit;
 	}
 
 	for (; it != et; ++it) {
-		LYXERR(Debug::DEBUG)
-			<< BOOST_CURRENT_FUNCTION
-			<< "  examining: pit: " << it->first
-			<< " y: " << it->second.position()
-			<< endl;
+		LYXERR(Debug::DEBUG, "examining: pit: " << it->first
+			<< " y: " << it->second.position());
 
 		ParagraphMetrics const & pm = par_metrics_[it->first];
 
@@ -1264,10 +1281,7 @@ pit_type TextMetrics::getPitNearY(int y)
 		}
 	}
 
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": found best y: " << yy << " for pit: " << pit
-		<< endl;
+	LYXERR(Debug::DEBUG, "found best y: " << yy << " for pit: " << pit);
 
 	return pit;
 }
@@ -1294,7 +1308,7 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
 Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
 {
 	if (lyxerr.debugging(Debug::WORKAREA)) {
-		lyxerr << "TextMetrics::editXY(cur, " << x << ", " << y << ")" << std::endl;
+		LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
 		cur.bv().coordCache().dump();
 	}
 	pit_type pit = getPitNearY(y);
@@ -1356,12 +1370,8 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 	ParagraphMetrics const & pm = par_metrics_[pit];
 
 	int yy = pm.position() - pm.ascent();
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": x: " << x
-		<< " y: " << y
-		<< " pit: " << pit
-		<< " yy: " << yy << endl;
+	LYXERR(Debug::DEBUG, "x: " << x << " y: " << y <<
+		" pit: " << pit << " yy: " << yy);
 
 	int r = 0;
 	BOOST_ASSERT(pm.rows().size());
@@ -1374,21 +1384,13 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 
 	Row const & row = pm.rows()[r];
 
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": row " << r
-		<< " from pos: " << row.pos()
-		<< endl;
+	LYXERR(Debug::DEBUG, "row " << r << " from pos: " << row.pos());
 
 	bool bound = false;
 	int xx = x;
 	pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
 
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": setting cursor pit: " << pit
-		<< " pos: " << pos
-		<< endl;
+	LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos);
 
 	text_->setCursor(cur, pit, pos, true, bound);
 	// remember new position.
@@ -1405,51 +1407,36 @@ Inset * TextMetrics::checkInsetHit(int x, int y)
 	Paragraph const & par = text_->paragraphs()[pit];
 	ParagraphMetrics const & pm = par_metrics_[pit];
 
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": x: " << x
-		<< " y: " << y
-		<< "  pit: " << pit
-		<< endl;
-	InsetList::const_iterator iit = par.insetlist.begin();
-	InsetList::const_iterator iend = par.insetlist.end();
+	LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << "  pit: " << pit);
+
+	InsetList::const_iterator iit = par.insetList().begin();
+	InsetList::const_iterator iend = par.insetList().end();
 	for (; iit != iend; ++iit) {
 		Inset * inset = iit->inset;
 
-		LYXERR(Debug::DEBUG)
-			<< BOOST_CURRENT_FUNCTION
-			<< ": examining inset " << inset << endl;
+		LYXERR(Debug::DEBUG, "examining inset " << inset);
 
 		if (!bv_->coordCache().getInsets().has(inset)) {
-			LYXERR(Debug::DEBUG)
-				<< BOOST_CURRENT_FUNCTION
-				<< ": inset has no cached position" << endl;
+			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)
-			<< BOOST_CURRENT_FUNCTION
-			<< ": xo: " << p.x_ << "..." << p.x_ + dim.wid
-			<< " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des
-			<< endl;
+		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)
-				<< BOOST_CURRENT_FUNCTION
-				<< ": Hit inset: " << inset << endl;
+			LYXERR(Debug::DEBUG, "Hit inset: " << inset);
 			return inset;
 		}
 	}
 
-	LYXERR(Debug::DEBUG)
-		<< BOOST_CURRENT_FUNCTION
-		<< ": No inset hit. " << endl;
+	LYXERR(Debug::DEBUG, "No inset hit. ");
 	return 0;
 }
 
@@ -1536,9 +1523,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 
 		x += pm.singleWidth(pos, font);
 
-		if (pm.hfillExpansion(row, pos))
-			x += (pos >= body_pos) ? row.hfill : row.label_hfill;
-		else if (par.isSeparator(pos) && pos >= body_pos)
+		if (par.isSeparator(pos) && pos >= body_pos)
 			x += row.separator;
 	}
 
@@ -1556,7 +1541,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 
 int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
 {
-	//lyxerr << "TextMetrics::cursorY: boundary: " << boundary << std::endl;
+	//lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl;
 	ParagraphMetrics const & pm = par_metrics_[sl.pit()];
 	if (pm.rows().empty())
 		return 0;
@@ -1654,8 +1639,8 @@ void TextMetrics::deleteLineForward(Cursor & cur)
 {
 	BOOST_ASSERT(text_ == cur.text());
 	if (cur.lastpos() == 0) {
-		// Paragraph is empty, so we just go to the right
-		text_->cursorRight(cur);
+		// Paragraph is empty, so we just go forward
+		text_->cursorForward(cur);
 	} else {
 		cur.resetAnchor();
 		cur.selection() = true; // to avoid deletion
@@ -1666,7 +1651,7 @@ void TextMetrics::deleteLineForward(Cursor & cur)
 			text_->deleteWordForward(cur);
 		else
 			cap::cutSelection(cur, true, false);
-		checkBufferStructure(cur.buffer(), cur);
+		cur.checkBufferStructure();
 	}
 }
 
@@ -1713,7 +1698,7 @@ int TextMetrics::leftMargin(int max_width,
 	int l_margin = 0;
 
 	if (text_->isMainText(buffer))
-		l_margin += changebarMargin();
+		l_margin += bv_->leftMargin();
 
 	l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
 		tclass.leftmargin());
@@ -1725,6 +1710,7 @@ int TextMetrics::leftMargin(int max_width,
 			if (pars[newpar].layout()->isEnvironment()) {
 				l_margin = leftMargin(max_width, newpar);
 			}
+			//FIXME Should this check for emptyLayout() as well?
 			if (par.layout() == tclass.defaultLayout()) {
 				if (pars[newpar].params().noindent())
 					parindent.erase();
@@ -1741,7 +1727,7 @@ int TextMetrics::leftMargin(int max_width,
 	    && pit > 0 && pars[pit - 1].layout()->nextnoindent)
 		parindent.erase();
 
-	Font const labelfont = text_->getLabelFont(buffer, par);
+	FontInfo const labelfont = text_->getLabelFont(buffer, par);
 	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 
 	switch (layout->margintype) {
@@ -1836,7 +1822,7 @@ int TextMetrics::leftMargin(int max_width,
 	       || layout->labeltype == LABEL_TOP_ENVIRONMENT
 	       || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
 	       || (layout->labeltype == LABEL_STATIC
-		   && layout->latextype == LATEX_ENVIRONMENT
+		         && layout->latextype == LATEX_ENVIRONMENT
 		   && !isFirstInSequence(pit, pars)))
 	    && align == LYX_ALIGN_BLOCK
 	    && !par.params().noindent()
@@ -1846,7 +1832,7 @@ int TextMetrics::leftMargin(int max_width,
 	    && !(!par.empty()
 		    && par.isInset(pos)
 		    && par.getInset(pos)->display())
-	    && (par.layout() != tclass.defaultLayout()
+	    && (par.layout() != tclass.defaultLayout() //should this check emptyLayout()?
 		|| buffer.params().paragraph_separation ==
 		   BufferParams::PARSEP_INDENT))
 	{
@@ -1866,7 +1852,6 @@ int TextMetrics::singleWidth(pit_type pit, pos_type pos) const
 }
 
 
-// only used for inset right now. should also be used for main text
 void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 {
 	if (par_metrics_.empty())
@@ -1892,73 +1877,72 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 
 void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const
 {
-//	lyxerr << "  paintPar: pit: " << pit << " at y: " << y << endl;
-	int const ww = bv_->workHeight();
-
+	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();
 		
-		bool row_selection = rit->sel_beg != -1 && rit->sel_end != -1;
-
-		if (!row_selection && !pi.full_repaint && !row_has_changed) {
-			// Paint the only the insets if the text itself is
+		// Don't paint the row if a full repaint has not been requested
+		// and if it has not changed.
+		if (!pi.full_repaint && !row_has_changed) {
+			// Paint only the insets if the text itself is
 			// unchanged.
 			rp.paintOnlyInsets();
-			y += rit->descent();
+			y += row.descent();
 			continue;
 		}
 
-		// Paint the row if a full repaint has been requested or it has
-		// changed.
-		// Clear background of this row
-		// (if paragraph background was not cleared)
-		if (row_selection || (!pi.full_repaint && row_has_changed)) {
-			pi.pain.fillRectangle(x, y - rit->ascent(),
-				width(), rit->height(),
-				Color_color(Color::color(pi.background_color)));
+		// Clear background of this row if paragraph background was not
+		// already cleared because of a full repaint.
+		if (!pi.full_repaint && row_has_changed) {
+			pi.pain.fillRectangle(x, y - row.ascent(),
+				width(), row.height(), pi.background_color);
 		}
+
+		bool row_selection = row.sel_beg != -1 && row.sel_end != -1;
 		if (row_selection) {
 			DocIterator beg = bv_->cursor().selectionBegin();
 			DocIterator end = bv_->cursor().selectionEnd();
+			bool const beg_margin = beg.pit() < pit && i == 0;
+			bool const end_margin = end.pit() > pit && i == nrows - 1;
 			beg.pit() = pit;
-			beg.pos() = rit->sel_beg;
-			if (pit == end.pit()) {
-				end.pos() = rit->sel_end;
-			} else {
-				end.pit() = pit + 1;
-				end.pos() = 0;
-			}
-			drawSelection(pi, beg, end, x);
+			beg.pos() = row.sel_beg;
+			end.pit() = pit;
+			end.pos() = row.sel_end;
+			drawRowSelection(pi, x, row, beg, end, beg_margin, end_margin);
 		}
 
 		// Instrumentation for testing row cache (see also
 		// 12 lines lower):
-		if (lyxerr.debugging(Debug::PAINTING)) {
-			if (text_->isMainText(bv_->buffer()))
-				LYXERR(Debug::PAINTING) << "\n{" << inside <<
-				pi.full_repaint << row_has_changed << "}";
-			else
-				LYXERR(Debug::PAINTING) << "[" << inside <<
-				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
@@ -1968,78 +1952,19 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 		rp.paintAppendix();
 		rp.paintDepthBar();
 		rp.paintChangeBar();
-		if (rit == rb)
+		if (i == 0)
 			rp.paintFirst();
 		rp.paintText();
-		if (rit + 1 == re)
+		if (i == nrows - 1)
 			rp.paintLast();
-		y += rit->descent();
+		y += row.descent();
 		// Restore full_repaint status.
 		pi.full_repaint = tmp;
 	}
 	// Re-enable screen drawing for future use of the painter.
-	pi.pain.setDrawingEnabled(true);
-
-	//LYXERR(Debug::PAINTING) << "." << endl;
-}
+	pi.pain.setDrawingEnabled(original_drawing_state);
 
-
-// FIXME: only take care of one row!
-void TextMetrics::drawSelection(PainterInfo & pi,
-	DocIterator const & beg, DocIterator const & end, int x) const
-{
-	ParagraphMetrics const & pm1 = parMetrics(beg.pit());
-	ParagraphMetrics const & pm2 = parMetrics(end.pit());
-	Row const & row1 = pm1.getRow(beg.pos(), beg.boundary());
-	Row const & row2 = pm2.getRow(end.pos(), end.boundary());
-
-	// clip above
-	int middleTop;
-	bool const clipAbove = (bv_->cursorStatus(beg) == CUR_ABOVE);
-	if (clipAbove)
-		middleTop = 0;
-	else
-		middleTop = bv_->getPos(beg, beg.boundary()).y_ + row1.descent();
-	
-	// clip below
-	int middleBottom;
-	bool const clipBelow = (bv_->cursorStatus(end) == CUR_BELOW);
-	if (clipBelow)
-		middleBottom = bv_->workHeight();
-	else
-		middleBottom = bv_->getPos(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, ".");
 }
 
 
@@ -2057,16 +1982,16 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 	// 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
@@ -2079,9 +2004,9 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 	while (cur < end) {
 		bool drawNow = false;
 		
-		// simplified cursorRight code below which does not
+		// simplified cursorForward code below which does not
 		// descend into insets and which does not go into the
-		// next line. Compare the logic with the original cursorRight
+		// next line. Compare the logic with the original cursorForward
 		
 		// if left of boundary -> just jump to right side
 		// but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
@@ -2110,7 +2035,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 		if (!(cur < end) || drawNow) {
 			x2 = cursorX(cur.top(), cur.boundary());
 			pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1,
-				Color::selection);
+				Color_selection);
 			
 			// reset x1, so it is set again next round (which will be on the 
 			// right side of a boundary or at the selection end)
@@ -2130,7 +2055,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