X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=801642e52576bfe9a78922797944d0d0f1f2200c;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=d9272f225501213a6fa82e9d5cd3bc648bce8e0b;hpb=7d97e555fc9bc2be2d55e4c5fc61e1a7010dec5d;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index d9272f2255..801642e525 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -24,16 +24,16 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "debug.h"
-#include "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"
 
@@ -42,10 +42,12 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetOptArg.h"
 
+#include "support/lassert.h"
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/convert.h"
-#include "support/unicode.h"
 
 #include <boost/bind.hpp>
 #include <boost/crc.hpp>
@@ -55,25 +57,15 @@
 #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)
+{}
 
 
 ParagraphMetrics & ParagraphMetrics::operator=(
@@ -82,6 +74,7 @@ ParagraphMetrics & ParagraphMetrics::operator=(
 	rows_ = pm.rows_;
 	dim_ = pm.dim_;
 	par_ = pm.par_;
+	position_ = pm.position_;
 	return *this;
 }
 
@@ -90,29 +83,61 @@ void ParagraphMetrics::reset(Paragraph const & par)
 {
 	par_ = &par;
 	dim_ = Dimension();
+	//position_ = -1;
 }
 
 
-void ParagraphMetrics::computeRowSignature(Row & row,
-		BufferParams const & bparams)
+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);
 		}			
 	}
-	row.setCrc(crc.checksum());
+
+	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::setPosition(int position)
+{
+	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;
 }
 
 
 Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 {
-	BOOST_ASSERT(!rows().empty());
+	LASSERT(!rows().empty(), /**/);
 
 	// If boundary is set we should return the row on which
 	// the character before is inside.
@@ -131,7 +156,7 @@ Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 
 Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 {
-	BOOST_ASSERT(!rows().empty());
+	LASSERT(!rows().empty(), /**/);
 
 	// If boundary is set we should return the row on which
 	// the character before is inside.
@@ -150,7 +175,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 
 size_t ParagraphMetrics::pos2row(pos_type pos) const
 {
-	BOOST_ASSERT(!rows().empty());
+	LASSERT(!rows().empty(), /**/);
 
 	RowList::const_iterator rit = rows_.end();
 	RowList::const_iterator const begin = rows_.begin();
@@ -171,15 +196,15 @@ void ParagraphMetrics::dump() const
 	}
 }
 
-int ParagraphMetrics::rightMargin(Buffer const & buffer) const
+int ParagraphMetrics::rightMargin(BufferView const & bv) const
 {
-	BufferParams const & params = buffer.params();
-	TextClass const & tclass = params.getTextClass();
+	BufferParams const & params = bv.buffer().params();
+	DocumentClass const & tclass = params.documentClass();
 	frontend::FontMetrics const & fm = theFontMetrics(params.getFont());
 	int const r_margin =
-		lyx::rightMargin()
+		bv.rightMargin()
 		+ fm.signedWidth(tclass.rightmargin())
-		+ fm.signedWidth(par_->layout()->rightmargin)
+		+ fm.signedWidth(par_->layout().rightmargin)
 		* 4 / (par_->getDepth() + 4);
 
 	return r_margin;
@@ -188,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 (Inset const * inset = par_->getInset(pos))
+		return insetDimension(inset).wid;
+
+	char_type c = par_->getChar(pos);
 
 	if (!isPrintable(c))
 		return theFontMetrics(font).width(c);
@@ -202,12 +227,13 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
 		if (language->lang() == "arabic_arabtex" ||
 			language->lang() == "arabic_arabi" ||
 			language->lang() == "farsi") {
-				if (Encodings::isComposeChar_arabic(c))
+				if (Encodings::isArabicComposeChar(c))
 					return 0;
 				c = par_->transformChar(c, pos);
 		} else if (language->lang() == "hebrew" &&
-			Encodings::isComposeChar_hebrew(c))
-			return 0;
+				Encodings::isHebrewComposeChar(c)) {
+			return 0;	
+		}
 	}
 	return theFontMetrics(font).width(c);
 }
@@ -218,7 +244,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 	if (!par_->isHfill(pos))
 		return false;
 
-	BOOST_ASSERT(pos >= row.pos() && pos < row.endpos());
+	LASSERT(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) {
@@ -235,7 +261,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 	}
 
 	// do not expand in some labels
-	if (par_->layout()->margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
+	if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
 		return false;
 
 	// if there is anything between the first char of the row and