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

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index dd70909037..e1cf6591e4 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -27,7 +27,7 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
@@ -49,13 +49,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include <boost/current_function.hpp>
-
-using std::make_pair;
-using std::max;
-using std::min;
-using std::endl;
-using std::pair;
+using namespace std;
 
 namespace lyx {
 
@@ -359,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;
 
@@ -382,35 +375,28 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	// 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();
-	MacroContext mc(buffer, par);
 	InsetList::const_iterator ii = par.insetList().begin();
 	InsetList::const_iterator iend = par.insetList().end();
 	for (; ii != iend; ++ii) {
-		// the macro must come here, _before_ the metric call, because
-		// the macro should see itself to detect recursions. To find out
-		// whether the macro definition is a redefinition it will look
-		// at the MacroData::redefinition_. So it doesn't get confused
-		// by the already existing macro definition of itself in the 
-		// macro context.
-		if (ii->inset->lyxCode() == MATHMACRO_CODE) {
-			// get macro data
-			MathMacroTemplate const & macroTemplate
-			= static_cast<MathMacroTemplate const &>(*ii->inset);
-
-			// valid?
-			if (macroTemplate.validMacro()) {
-				MacroData macro = macroTemplate.asMacroData();
-
-				// redefinition?
-				macro.setRedefinition(mc.has(macroTemplate.name()));
-
-				// register macro (possibly overwrite the previous one of this paragraph)
-				mc.insert(macroTemplate.name(), macro);
-			}
+		// 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
@@ -419,6 +405,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 			- right_margin;
 		Font const & font = ii->inset->noFontChange() ?
 			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);
@@ -477,11 +464,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());
 
@@ -502,7 +488,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();
 	}
 
@@ -518,9 +503,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();
@@ -560,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!
@@ -644,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);
+	}
 }
 
 
@@ -743,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;
 		}
 
@@ -1051,7 +1057,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);
 
@@ -1088,19 +1093,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;
 	}
 
@@ -1204,7 +1199,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());
 }
 
 
@@ -1218,18 +1213,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());
+	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();
@@ -1237,41 +1231,36 @@ 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
+		LYXERR(Debug::DEBUG, "examining: pit: " << it->first
 			<< " y: " << it->second.position());
 
 		ParagraphMetrics const & pm = par_metrics_[it->first];
@@ -1282,8 +1271,7 @@ pit_type TextMetrics::getPitNearY(int y)
 		}
 	}
 
-	LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-		<< ": found best y: " << yy << " for pit: " << pit);
+	LYXERR(Debug::DEBUG, "found best y: " << yy << " for pit: " << pit);
 
 	return pit;
 }
@@ -1310,7 +1298,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);
@@ -1372,8 +1360,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);
+	LYXERR(Debug::DEBUG, "x: " << x << " y: " << y <<
+		" pit: " << pit << " yy: " << yy);
 
 	int r = 0;
 	BOOST_ASSERT(pm.rows().size());
@@ -1386,15 +1374,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());
+	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);
+	LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos);
 
 	text_->setCursor(cur, pit, pos, true, bound);
 	// remember new position.
@@ -1411,41 +1397,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);
+	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);
+		LYXERR(Debug::DEBUG, "examining inset " << inset);
 
 		if (!bv_->coordCache().getInsets().has(inset)) {
-			LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-				<< ": inset has no cached position");
+			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
+		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);
+			LYXERR(Debug::DEBUG, "Hit inset: " << inset);
 			return inset;
 		}
 	}
 
-	LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << ": No inset hit. ");
+	LYXERR(Debug::DEBUG, "No inset hit. ");
 	return 0;
 }
 
@@ -1532,9 +1513,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;
 	}
 
@@ -1552,7 +1531,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;
@@ -1862,7 +1841,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())
@@ -1888,72 +1866,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.
+		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, *rit, bidi, x, y);
+		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(), 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;
-			bool const end_margin = end.pit() > pit;
+			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;
+			beg.pos() = row.sel_beg;
 			end.pit() = pit;
-			end.pos() = rit->sel_end;
-			drawRowSelection(pi, x, *rit, beg, end, beg_margin, end_margin);
+			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
@@ -1963,19 +1941,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(original_drawing_state);
 
-	//LYXERR(Debug::PAINTING) << "." << endl;
+	//LYXERR(Debug::PAINTING, ".");
 }