X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=36d850b1d9f867d9bee153852a94d03fb47cf189;hb=fc2658eff011adb08192cf897416698c34aab268;hp=7786de5a66380bb2493c4720c41696f23e6cfdbb;hpb=ee27b58a07dee327b6d3a7e1b62e727fbbb3681d;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 7786de5a66..36d850b1d9 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -24,16 +24,18 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "debug.h"
-#include "gettext.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
+#include "Layout.h"
 #include "Font.h"
 #include "LyXRC.h"
 #include "Row.h"
 #include "OutputParams.h"
 #include "paragraph_funcs.h"
 #include "sgml.h"
+#include "TextClass.h"
 #include "TexRow.h"
 #include "VSpace.h"
 
@@ -55,23 +57,13 @@
 #include <stack>
 #include <sstream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using lyx::support::contains;
-using lyx::support::rsplit;
-using support::subst;
 
-using std::distance;
-using std::endl;
-using std::list;
-using std::stack;
-using std::string;
-using std::ostream;
-using std::ostringstream;
-
-
-ParagraphMetrics::ParagraphMetrics(Paragraph const & par): par_(&par)
+ParagraphMetrics::ParagraphMetrics(Paragraph const & par): position_(-1), par_(&par)
 {
 }
 
@@ -82,6 +74,7 @@ ParagraphMetrics & ParagraphMetrics::operator=(
 	rows_ = pm.rows_;
 	dim_ = pm.dim_;
 	par_ = pm.par_;
+	position_ = pm.position_;
 	return *this;
 }
 
@@ -90,33 +83,55 @@ void ParagraphMetrics::reset(Paragraph const & par)
 {
 	par_ = &par;
 	dim_ = Dimension();
-	rows_.clear();
+	//position_ = -1;
 }
 
 
-size_type ParagraphMetrics::calculateRowSignature(Row const & row)
+size_t ParagraphMetrics::computeRowSignature(Row const & row,
+		BufferParams const & bparams) 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, 1);
+		crc.process_bytes(b, sizeof(char_type));
+		if (bparams.trackChanges) {
+			Change change = par_->lookupChange(i);
+			char_type const b[] = { change.type };
+			// 1 byte is enough to encode Change::Type
+			crc.process_bytes(b, 1);
+		}			
 	}
+
+	Dimension const & d = row.dimension();
+	char_type const b[] = { row.sel_beg, row.sel_end, d.wid, d.asc, d.des};
+	// Each of the variable to process is 4 bytes: 4x5 = 20
+	crc.process_bytes(b, 20);
+
 	return crc.checksum();
 }
 
 
-void ParagraphMetrics::updateRowChangeStatus()
+void ParagraphMetrics::setPosition(int position)
 {
-	size_t const size = rows_.size();
-	row_change_status_.resize(size);
-	row_signature_.resize(size);
-
-	for (size_t i = 0; i != size; ++i) {
-		// Row signature; has row changed since last update?
-		size_type const row_sig = calculateRowSignature(rows_[i]);
-		row_change_status_[i] = row_signature_[i] != row_sig;
-		row_signature_[i] = row_sig;
-	}
+	position_ = 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;
 }
 
 
@@ -198,11 +213,11 @@ int ParagraphMetrics::rightMargin(Buffer const & buffer) const
 
 int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
 {
-	char_type c = par_->getChar(pos);
-
 	// The most special cases are handled first.
-	if (c == Paragraph::META_INSET)
-		return par_->getInset(pos)->width();
+	if (par_->isInset(pos))
+		return insetDimension(par_->getInset(pos)).wid;
+
+	char_type c = par_->getChar(pos);
 
 	if (!isPrintable(c))
 		return theFontMetrics(font).width(c);
@@ -223,4 +238,39 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
 }
 
 
+bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
+{
+	if (!par_->isHfill(pos))
+		return false;
+
+	BOOST_ASSERT(pos >= row.pos() && pos < row.endpos());
+
+	// expand at the end of a row only if there is another hfill on the same row
+	if (pos == row.endpos() - 1) {
+		for (pos_type i = row.pos(); i < pos; i++) {
+			if (par_->isHfill(i))
+				return true;
+		}
+		return false;
+	}
+
+	// expand at the beginning of a row only if it is the first row of a paragraph
+	if (pos == row.pos()) {
+		return pos == 0;
+	}
+
+	// do not expand in some labels
+	if (par_->layout()->margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
+		return false;
+
+	// if there is anything between the first char of the row and
+	// 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))
+			return true;
+	}
+	return false;
+}
+
 } // namespace lyx