using lyx::pos_type;
-using std::max;
-using std::min;
-using std::endl;
-
-
-int numberOfSeparators(Paragraph const & par, Row const & row)
-{
- pos_type const first = max(row.pos(), par.beginningOfBody());
- pos_type const last = row.endpos() - 1;
- int n = 0;
- 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(Paragraph const & par, Row const & row)
-{
- 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 && 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(Paragraph const & par, Row const & row)
-{
- pos_type last = row.endpos() - 1;
- pos_type first = row.pos();
-
- // 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(Paragraph const & par, Row const & row, pos_type pos)
{
// in some labels it does not count
if (par.layout()->margintype != MARGIN_MANUAL
- && pos < par.beginningOfBody())
+ && pos < par.beginOfBody())
return false;
// if there is anything between the first char of the row and