X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrow_funcs.C;h=e4cd8c26ddd1cd767e0b52edb5716cb9ee24f8a9;hb=67f9c9fdae42211aa3ff8d0c6f62485bd721d8eb;hp=586c1f0320488098243a379587a00b8e1c7175d1;hpb=003bb374a563362a4dd1107b7b691c5a0430f0c8;p=lyx.git

diff --git a/src/lyxrow_funcs.C b/src/lyxrow_funcs.C
index 586c1f0320..e4cd8c26dd 100644
--- a/src/lyxrow_funcs.C
+++ b/src/lyxrow_funcs.C
@@ -1,167 +1,123 @@
+/**
+ * \file lyxrow_funcs.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
 #include "lyxrow_funcs.h"
-#include "lyxtext.h"
-#include "paragraph.h"
+#include "debug.h"
 #include "lyxlayout.h"
-
-#include <boost/next_prior.hpp>
-#include <algorithm>
+#include "lyxrow.h"
+#include "paragraph.h"
 
 using lyx::pos_type;
 
 using std::max;
 using std::min;
+using std::endl;
 
 
-bool isParEnd(LyXText const & lt,
-	ParagraphList::iterator pit, RowList::iterator rit)
-{
-	RowList::iterator next_row = boost::next(rit);
-	return next_row == lt.rows().end() || lt.getPar(next_row) != pit;
-}
-
-
-pos_type lastPos(LyXText const & lt,
-	ParagraphList::iterator pit, RowList::iterator rit)
-{
-	if (pit->empty())
-		return 0;
-
-	if (isParEnd(lt, pit, rit))
-		return pit->size() - 1;
-
-	return boost::next(rit)->pos() - 1;
-}
-
-
-namespace {
-
-bool nextRowIsAllInset(
-	ParagraphList::iterator pit, RowList::iterator rit, pos_type last)
-{
-	if (last + 1 >= pit->size())
-		return false;
-
-	if (!pit->isInset(last + 1))
-		return false;
-
-	InsetOld const * i = pit->getInset(last + 1);
-	return i->needFullRow() || i->display();
-}
-
-} // anon namespace
-
-
-pos_type lastPrintablePos(LyXText const & lt,
-	ParagraphList::iterator pit, RowList::iterator rit)
+int numberOfSeparators(Paragraph const & par, Row const & row)
 {
-	pos_type const last = lastPos(lt, pit, rit);
-
-	// if this row is an end of par, just act like lastPos()
-	if (isParEnd(lt, pit, rit))
-		return last;
-
-	if (!nextRowIsAllInset(pit, rit, last) && pit->isSeparator(last))
-		return last - 1;
-
-	return last;
-}
-
-
-int numberOfSeparators(LyXText const & lt,
-	ParagraphList::iterator pit, RowList::iterator rit)
-{
-	pos_type const last = lastPrintablePos(lt, pit, rit);
+	pos_type const first = max(row.pos(), par.beginOfBody());
+	pos_type const last = row.endpos() - 1;
 	int n = 0;
-	pos_type p = max(rit->pos(), pit->beginningOfBody());
-	for ( ; p < last; ++p)
-		if (pit->isSeparator(p))
+	for (pos_type p = first; p < last; ++p) {
+		if (par.isSeparator(p))
 			++n;
+	}
+
 	return n;
 }
 
 
 // This is called _once_ from LyXText and should at least be moved into
 // an anonymous namespace there. (Lgb)
-int numberOfHfills(LyXText const & lt,
-	ParagraphList::iterator pit, RowList::iterator rit)
+int numberOfHfills(Paragraph const & par, Row const & row)
 {
-	pos_type const last = lastPos(lt, pit, rit);
-	pos_type first = rit->pos();
+	pos_type const last = row.endpos() - 1;
+	pos_type first = row.pos();
 
 	// hfill *DO* count at the beginning of paragraphs!
 	if (first) {
-		while (first < last && pit->isHfill(first))
+		while (first < last && par.isHfill(first))
 			++first;
 	}
 
-	first = max(first, pit->beginningOfBody());
+	first = max(first, par.beginOfBody());
 
 	int n = 0;
 
 	// last, because the end is ignored!
 	for (pos_type p = first; p < last; ++p) {
-		if (pit->isHfill(p))
+		if (par.isHfill(p))
 			++n;
 	}
+
 	return n;
 }
 
 
 // This is called _once_ from LyXText and should at least be moved into
 // an anonymous namespace there. (Lgb)
-int numberOfLabelHfills(LyXText const & lt,
-	ParagraphList::iterator pit, RowList::iterator rit)
+int numberOfLabelHfills(Paragraph const & par, Row const & row)
 {
-	pos_type last = lastPos(lt, pit, rit);
-	pos_type first = rit->pos();
+	pos_type last = row.endpos() - 1;
+	pos_type first = row.pos();
 
 	// hfill *DO* count at the beginning of paragraphs!
 	if (first) {
-		while (first < last && pit->isHfill(first))
+		while (first < last && par.isHfill(first))
 			++first;
 	}
 
-	last = min(last, pit->beginningOfBody());
+	last = min(last, par.beginOfBody());
 	int n = 0;
 
-	// last, because the end is ignored!
+	// last, because the end is ignored
 	for (pos_type p = first; p < last; ++p) {
-		if (pit->isHfill(p))
+		if (par.isHfill(p))
 			++n;
 	}
+
 	return n;
 }
 
 
-bool hfillExpansion(LyXText const & lt,
-	ParagraphList::iterator pit, RowList::iterator rit, pos_type pos)
+bool hfillExpansion(Paragraph const & par, Row const & row, pos_type pos)
 {
-	if (!pit->isHfill(pos))
+	if (!par.isHfill(pos))
 		return false;
 
 	// at the end of a row it does not count
 	// unless another hfill exists on the line
-	if (pos >= lastPos(lt, pit, rit))
-		for (pos_type i = rit->pos(); i < pos && !pit->isHfill(i); ++i)
+	if (pos >= row.endpos()) {
+		for (pos_type i = row.pos(); i < pos && !par.isHfill(i); ++i)
 			return false;
+	}
 
 	// at the beginning of a row it does not count, if it is not
 	// the first row of a paragaph
-	if (rit->isParStart())
+	if (row.pos() == 0)
 		return true;
 
 	// in some labels it does not count
-	if (pit->layout()->margintype != MARGIN_MANUAL
-	    && pos < pit->beginningOfBody())
+	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 not a newline and not a hfill,
 	// the hfill will count, otherwise not
-	pos_type i = rit->pos();
-	while (i < pos && (pit->isNewline(i) || pit->isHfill(i)))
+	pos_type i = row.pos();
+	while (i < pos && (par.isNewline(i) || par.isHfill(i)))
 		++i;
 
 	return i != pos;