X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=85e57683df9208f20dfe80f3199d330eaf198cec;hb=a2e8cb758b70269da40d13d7b272d256a29a022a;hp=09631228b919197dac0f8f5b66788cb08653dcc2;hpb=2e7d1199dfa7ec7b7d963c374a014f2a2227ae7c;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 09631228b9..85e57683df 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -4,13 +4,13 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -31,24 +31,22 @@
 #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"
 
 #include "frontends/FontMetrics.h"
 
 #include "insets/InsetBibitem.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
 
-#include "support/convert.h"
+#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -62,9 +60,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=(
@@ -95,16 +93,17 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
 		crc.process_bytes(b, sizeof(char_type));
 		if (bparams.trackChanges) {
 			Change change = par_->lookupChange(i);
-			char_type const b[] = { change.type };
+			char_type const b[] = { static_cast<char_type>(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);
+	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));
 
 	return crc.checksum();
 }
@@ -136,7 +135,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 +154,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 +173,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 +197,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 +217,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,12 +228,12 @@ 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);
@@ -243,7 +245,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 +262,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