X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=0a90fb69252449976b930bce5b4a54d82ad0bf3b;hb=12c7e7dde3851ad894380fd42ba741dd3d0cbcc7;hp=fee38fb6e4b36890cb7e441a6ab33c3ee7c9d348;hpb=6b28f08ff2f15fee2697fee4395225d6d9ec8daf;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index fee38fb6e4..0a90fb6925 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,7 +31,6 @@
 #include "LyXRC.h"
 #include "Row.h"
 #include "OutputParams.h"
-#include "paragraph_funcs.h"
 #include "sgml.h"
 #include "TextClass.h"
 #include "TexRow.h"
@@ -40,15 +39,15 @@
 #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>
@@ -102,9 +101,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 +136,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 +155,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 +174,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();
@@ -218,6 +218,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);
 
@@ -243,7 +246,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) {