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

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index a5b0a8c12b..8321b34eca 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,12 +49,9 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include <boost/current_function.hpp>
-
 using std::make_pair;
 using std::max;
 using std::min;
-using std::endl;
 using std::pair;
 
 namespace lyx {
@@ -515,9 +512,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();
@@ -557,12 +552,11 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			row.label_hfill = labelFill(pit, row) / double(nlh);
 	}
 
-	// are there any hfills in the row?
-	int const nh = numberOfHfills(par, row);
-
-	if (nh) {
-		if (w > 0)
-			row.hfill = w / nh;
+	double hfill = 0;
+	if (w > 0) {
+		// are there any hfills in the row?
+		if (int nh = numberOfHfills(par, row))
+			hfill = w / double(nh);
 	// we don't have to look at the alignment if it is ALIGN_LEFT and
 	// if the row is already larger then the permitted width as then
 	// we force the LEFT_ALIGN'edness!
@@ -641,6 +635,30 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 				row.x += row.label_hfill;
 		}
 	}
+
+	pos_type const endpos = row.endpos();
+	pos_type body_pos = par.beginOfBody();
+	if (body_pos > 0
+		&& (body_pos > endpos || !par.isLineSeparator(body_pos - 1)))
+		body_pos = 0;
+
+	ParagraphMetrics & pm = par_metrics_[pit];
+	InsetList::const_iterator ii = par.insetList().begin();
+	InsetList::const_iterator iend = par.insetList().end();
+	for ( ; ii != iend; ++ii) {
+		if (ii->pos >= endpos || ii->pos < row.pos()
+			|| ii->inset->lyxCode() != HFILL_CODE)
+			continue;
+		Dimension dim = row.dimension();
+		if (pm.hfillExpansion(row, ii->pos))
+			dim.wid = int(ii->pos >= body_pos ?
+				max(hfill, 5.0) : row.label_hfill);
+		else
+			dim.wid = 5;
+		// Cache the inset dimension. 
+		bv_->coordCache().insets().add(ii->inset, dim);
+		pm.setInsetDimension(ii->inset, dim);
+	}
 }
 
 
@@ -1048,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);
 
@@ -1085,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;
 	}
 
@@ -1222,11 +1229,10 @@ void TextMetrics::newParMetricsUp()
 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();
@@ -1234,41 +1240,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];
@@ -1279,8 +1280,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;
 }
@@ -1307,7 +1307,7 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
 Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
 {
 	if (lyxerr.debugging(Debug::WORKAREA)) {
-		lyxerr << "TextMetrics::editXY(cur, " << x << ", " << y << ")" << std::endl;
+		LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
 		cur.bv().coordCache().dump();
 	}
 	pit_type pit = getPitNearY(y);
@@ -1369,8 +1369,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());
@@ -1383,15 +1383,13 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 
 	Row const & row = pm.rows()[r];
 
-	LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-		<< ": row " << r << " from pos: " << row.pos());
+	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.
@@ -1408,41 +1406,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;
 }
 
@@ -1529,9 +1522,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 
 		x += pm.singleWidth(pos, font);
 
-		if (pm.hfillExpansion(row, pos))
-			x += (pos >= body_pos) ? row.hfill : row.label_hfill;
-		else if (par.isSeparator(pos) && pos >= body_pos)
+		if (par.isSeparator(pos) && pos >= body_pos)
 			x += row.separator;
 	}
 
@@ -1971,7 +1962,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 	// Re-enable screen drawing for future use of the painter.
 	pi.pain.setDrawingEnabled(original_drawing_state);
 
-	//LYXERR(Debug::PAINTING) << "." << endl;
+	//LYXERR(Debug::PAINTING, ".");
 }