X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=f794914fe083b70a63f620e7ec94fe3a8dd4b6a8;hb=da640391fc82fab25708a074d54ee4dce1fe26e7;hp=a53605c794f411fcee6aacbfad27a6cdf4b6cf2a;hpb=6cdf6bd6ab12d320662ae76bc332d214e11ca6b2;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index a53605c794..f794914fe0 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -24,8 +24,6 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Layout.h"
@@ -44,9 +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 <boost/bind.hpp>
 #include <boost/crc.hpp>
@@ -62,9 +63,9 @@ using namespace lyx::support;
 namespace lyx {
 
 
-ParagraphMetrics::ParagraphMetrics(Paragraph const & par): position_(-1), par_(&par)
-{
-}
+ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
+	position_(-1), par_(&par)
+{}
 
 
 ParagraphMetrics & ParagraphMetrics::operator=(
@@ -102,9 +103,10 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
 	}
 
 	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);
+	char_type const b[] = { row.sel_beg, row.sel_end, 
+		row.begin_margin_sel, row.end_margin_sel, d.wid, d.asc, d.des};
+	// Each of the variable to process is 4 bytes: 4x7 = 28
+	crc.process_bytes(b, 28);
 
 	return crc.checksum();
 }
@@ -136,7 +138,7 @@ void ParagraphMetrics::setInsetDimension(Inset const * inset,
 
 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.
@@ -155,7 +157,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.
@@ -174,7 +176,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();
@@ -198,12 +200,12 @@ void ParagraphMetrics::dump() const
 int ParagraphMetrics::rightMargin(BufferView const & bv) const
 {
 	BufferParams const & params = bv.buffer().params();
-	TextClass const & tclass = params.getTextClass();
+	DocumentClass const & tclass = params.documentClass();
 	frontend::FontMetrics const & fm = theFontMetrics(params.getFont());
 	int const r_margin =
 		bv.rightMargin()
 		+ fm.signedWidth(tclass.rightmargin())
-		+ fm.signedWidth(par_->layout()->rightmargin)
+		+ fm.signedWidth(par_->layout().rightmargin)
 		* 4 / (par_->getDepth() + 4);
 
 	return r_margin;
@@ -218,6 +220,9 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
 
 	char_type c = par_->getChar(pos);
 
+	if (c == '\t')
+		return 4 * theFontMetrics(font).width(' ');
+	
 	if (!isPrintable(c))
 		return theFontMetrics(font).width(c);
 
@@ -226,11 +231,11 @@ 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)) {
+				Encodings::isHebrewComposeChar(c)) {
 			return 0;	
 		}
 	}
@@ -243,7 +248,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) {
@@ -260,7 +265,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