compilation fix

[lyx.git] / src / lyxrow_funcs.C

diff --git a/src/lyxrow_funcs.C b/src/lyxrow_funcs.C
index 0e857444c8477696b7a4379a33b4af1e16aeb2f8..ec805f892e415e120dc6af884323568c91fb86e2 100644 (file)
--- a/src/lyxrow_funcs.C
+++ b/src/lyxrow_funcs.C
@@ -1,183 +1,52 @@
+/**
+ * \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;
-
-
-bool isParEnd(LyXText const & lt, RowList::iterator rit)
-{
-       RowList::iterator next_row = boost::next(rit);
-
-       return next_row == lt.rows().end() ||
-               next_row->par() != rit->par();
-}
-
-
-// It seems that this is only used in LyXText, it
-// perhaps this function should be moved into LyXText. (Lgb)
-pos_type lastPos(LyXText const & lt, RowList::iterator rit)
-{
-       if (rit->par()->empty())
-               return 0;
-
-       if (isParEnd(lt, rit)) {
-               return rit->par()->size() - 1;
-       } else {
-               return boost::next(rit)->pos() - 1;
-       }
-}
-
-
-namespace {
-
-bool nextRowIsAllInset(Row const & row, pos_type last)
-{
-       Paragraph const * par = row.par();
-
-       if (last + 1 >= par->size())
-               return false;
-
-       if (!par->isInset(last + 1))
-               return false;
-
-       Inset const * i = par->getInset(last + 1);
-       return i->needFullRow() || i->display();
-}
-
-} // anon namespace
-
-
-pos_type lastPrintablePos(LyXText const & lt, RowList::iterator rit)
-{
-       pos_type const last = lastPos(lt, rit);
-
-       // if this row is an end of par, just act like lastPos()
-       if (isParEnd(lt, rit))
-               return last;
 
-       bool const nextrownotinset = !nextRowIsAllInset(*rit, last);
 
-       if (nextrownotinset && rit->par()->isSeparator(last))
-               return last - 1;
-
-       return last;
-}
-
-
-int numberOfSeparators(LyXText const & lt, RowList::iterator rit)
-{
-        pos_type const last = lastPrintablePos(lt, rit);
-       Paragraph const * par = rit->par();
-
-        int n = 0;
-
-        pos_type p = max(rit->pos(), par->beginningOfBody());
-        for (; 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, RowList::iterator rit)
-{
-       pos_type const last = lastPos(lt, rit);
-       pos_type first = rit->pos();
-       Paragraph const * par = rit->par();
-
-       // hfill *DO* count at the beginning of paragraphs!
-       if (first) {
-               while (first < last && par->isHfill(first)) {
-                       ++first;
-               }
-       }
-
-       first = max(first, par->beginningOfBody());
-
-       int n = 0;
-
-       // last, because the end is ignored!
-       for (pos_type p = first; p < last; ++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, RowList::iterator rit)
+bool hfillExpansion(Paragraph const & par, Row const & row, pos_type pos)
 {
-       pos_type last = lastPos(lt, rit);
-       pos_type first = rit->pos();
-       Paragraph const * par = rit->par();
-
-       // hfill *DO* count at the beginning of paragraphs!
-       if (first) {
-               while (first < last && par->isHfill(first))
-                       ++first;
-       }
-
-       last = min(last, par->beginningOfBody());
-       int n = 0;
-
-       // last, because the end is ignored!
-       for (pos_type p = first; p < last; ++p) {
-               if (par->isHfill(p))
-                       ++n;
-       }
-       return n;
-}
-
-
-bool hfillExpansion(LyXText const & lt, RowList::iterator rit, pos_type pos)
-{
-       Paragraph const * par = rit->par();
-
-       if (!par->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, rit)) {
-               pos_type i = rit->pos();
-               while (i < pos && !par->isHfill(i)) {
-                       ++i;
-               }
-               if (i == pos) {
+       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 (par->layout()->margintype != MARGIN_MANUAL
-           && pos < par->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 && (par->isNewline(i) || par->isHfill(i)))
+       pos_type i = row.pos();
+       while (i < pos && (par.isNewline(i) || par.isHfill(i)))
                ++i;
 
        return i != pos;