X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=01db6cb934b0be5c019ab2998300e84b5b56178a;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=85e57683df9208f20dfe80f3199d330eaf198cec;hpb=d2f2148c90bdb036d6ce04fdf9b95c84239fee13;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 85e57683df..01db6cb934 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -42,11 +42,11 @@
 
 #include "support/lassert.h"
 #include "support/debug.h"
+#include "support/ExceptionMessage.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include "support/bind.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -85,25 +85,36 @@ void ParagraphMetrics::reset(Paragraph const & par)
 
 
 size_t ParagraphMetrics::computeRowSignature(Row const & row,
-		BufferParams const & bparams) const
+		BufferView const & bv) const
 {
 	boost::crc_32_type crc;
 	for (pos_type i = row.pos(); i < row.endpos(); ++i) {
-		char_type const b[] = { par_->getChar(i) };
-		crc.process_bytes(b, sizeof(char_type));
-		if (bparams.trackChanges) {
+		if (par_->isInset(i)) {
+			Inset const * in = par_->getInset(i);
+			Dimension const d = in->dimension(bv);
+			int const b[] = { d.wid, d.asc, d.des };
+			crc.process_bytes(b, sizeof(b));
+		} else {
+			char_type const b[] = { par_->getChar(i) };
+			crc.process_bytes(b, sizeof(char_type));
+		}
+		if (bv.buffer().params().track_changes) {
 			Change change = par_->lookupChange(i);
 			char_type const b[] = { static_cast<char_type>(change.type) };
 			// 1 byte is enough to encode Change::Type
 			crc.process_bytes(b, 1);
-		}			
+		}
 	}
 
+	pos_type const b1[] = { row.sel_beg, row.sel_end };
+	crc.process_bytes(b1, sizeof(b1));
+
 	Dimension const & d = row.dimension();
-	char_type const b[] = { static_cast<char_type>(row.sel_beg),
-				static_cast<char_type>(row.sel_end),
-		row.begin_margin_sel, row.end_margin_sel, d.wid, d.asc, d.des};
-	crc.process_bytes(b, sizeof(b));
+	int const b2[] = { row.begin_margin_sel,
+	                   row.end_margin_sel,
+	                   d.wid, d.asc, d.des };
+	crc.process_bytes(b2, sizeof(b2));
+	crc.process_bytes(&row.separator, sizeof(row.separator));
 
 	return crc.checksum();
 }
@@ -115,27 +126,9 @@ void ParagraphMetrics::setPosition(int position)
 }
 
 
-Dimension const & ParagraphMetrics::insetDimension(Inset const * inset) const
-{
-	InsetDims::const_iterator it = inset_dims_.find(inset);
-	if (it != inset_dims_.end())
-		return it->second;
-
-	static Dimension dummy;
-	return dummy;
-}
-
-
-void ParagraphMetrics::setInsetDimension(Inset const * inset,
-		Dimension const & dim)
-{
-	inset_dims_[inset] = dim;
-}
-
-
 Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 {
-	LASSERT(!rows().empty(), /**/);
+	LBUFERR(!rows().empty());
 
 	// If boundary is set we should return the row on which
 	// the character before is inside.
@@ -154,7 +147,7 @@ Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 
 Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 {
-	LASSERT(!rows().empty(), /**/);
+	LBUFERR(!rows().empty());
 
 	// If boundary is set we should return the row on which
 	// the character before is inside.
@@ -173,7 +166,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 
 size_t ParagraphMetrics::pos2row(pos_type pos) const
 {
-	LASSERT(!rows().empty(), /**/);
+	LBUFERR(!rows().empty());
 
 	RowList::const_iterator rit = rows_.end();
 	RowList::const_iterator const begin = rows_.begin();
@@ -189,8 +182,7 @@ void ParagraphMetrics::dump() const
 {
 	lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
 	for (size_t i = 0; i != rows_.size(); ++i) {
-		lyxerr << "  row " << i << ":   ";
-		rows_[i].dump();
+		lyxerr << "  row " << i << ":   " << rows_[i];
 	}
 }
 
@@ -209,43 +201,13 @@ int ParagraphMetrics::rightMargin(BufferView const & bv) const
 }
 
 
-int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
-{
-	// The most special cases are handled first.
-	if (Inset const * inset = par_->getInset(pos))
-		return insetDimension(inset).wid;
-
-	char_type c = par_->getChar(pos);
-
-	if (c == '\t')
-		return 4 * theFontMetrics(font).width(' ');
-	
-	if (!isPrintable(c))
-		return theFontMetrics(font).width(c);
-
-	Language const * language = font.language();
-	if (language->rightToLeft()) {
-		if (language->lang() == "arabic_arabtex" ||
-			language->lang() == "arabic_arabi" ||
-			language->lang() == "farsi") {
-				if (Encodings::isArabicComposeChar(c))
-					return 0;
-				c = par_->transformChar(c, pos);
-		} else if (language->lang() == "hebrew" &&
-				Encodings::isHebrewComposeChar(c)) {
-			return 0;
-		}
-	}
-	return theFontMetrics(font).width(c);
-}
-
-
+// FIXME: this code seems bogus. Audit and rewrite (see bug #9860).
 bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 {
 	if (!par_->isHfill(pos))
 		return false;
 
-	LASSERT(pos >= row.pos() && pos < row.endpos(), /**/);
+	LASSERT(pos >= row.pos() && pos < row.endpos(), return false);
 
 	// expand at the end of a row only if there is another hfill on the same row
 	if (pos == row.endpos() - 1) {
@@ -257,9 +219,8 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 	}
 
 	// expand at the beginning of a row only if it is the first row of a paragraph
-	if (pos == row.pos()) {
+	if (pos == row.pos())
 		return pos == 0;
-	}
 
 	// do not expand in some labels
 	if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
@@ -269,7 +230,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 	// the specified position that is neither a newline nor an hfill,
 	// the hfill will be expanded, otherwise it won't
 	for (pos_type i = row.pos(); i < pos; i++) {
-		if (!par_->isNewline(i) && !par_->isHfill(i))
+		if (!par_->isNewline(i) && !par_->isEnvSeparator(i) && !par_->isHfill(i))
 			return true;
 	}
 	return false;