X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrow.C;h=179354bad84b0770f3799ff8075a4a9b6f33696e;hb=3f8fa07c6ed38218d6a4048f2993a512aa942c96;hp=af4c7304fc91b8f5b18226fc44bf7da6a2f3f422;hpb=5dbad757dc65fe34afc651e1b2dd1cea60c3ff0c;p=lyx.git

diff --git a/src/lyxrow.C b/src/lyxrow.C
index af4c7304fc..179354bad8 100644
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -4,8 +4,12 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
  * Metrics for an on-screen text row.
  */
@@ -13,25 +17,25 @@
 #include <config.h>
 
 #include "lyxrow.h"
-#include "paragraph.h"
-#include "layout.h"
-#include "lyxlayout.h"
+#include "debug.h"
 
-using lyx::pos_type;
 
-using std::max;
-using std::min;
+namespace lyx {
+
+
+RowMetrics::RowMetrics()
+	: separator(0), hfill(0), label_hfill(0), x(0)
+{}
+
 
 Row::Row()
-	: par_(0), pos_(0), fill_(0), height_(0), width_(0),
-	  ascent_of_text_(0), baseline_(0), next_(0), previous_(0)
+	: pos_(0), end_(0), ascent_(0), descent_(0), width_(0)
 {}
 
 
-void Row::par(Paragraph * p)
-{
-	par_ = p;
-}
+Row::Row(pos_type pos)
+	: pos_(pos), end_(0), ascent_(0), descent_(0), width_(0)
+{}
 
 
 void Row::pos(pos_type p)
@@ -46,242 +50,50 @@ pos_type Row::pos() const
 }
 
 
-void Row::fill(int f)
-{
-	fill_ = f;
-}
-
-
-int Row::fill() const
+void Row::endpos(pos_type p)
 {
-	return fill_;
+	end_ = p;
 }
 
 
-void Row::height(unsigned short h)
+pos_type Row::endpos() const
 {
-	height_ = h;
+	return end_;
 }
 
 
-void Row::width(unsigned int w)
+void Row::width(int w)
 {
 	width_ = w;
 }
 
 
-unsigned int Row::width() const
+int Row::width() const
 {
 	return width_;
 }
 
 
-void Row::ascent_of_text(unsigned short a)
-{
-	ascent_of_text_ = a;
-}
-
-
-unsigned short Row::ascent_of_text() const
-{
-	return ascent_of_text_;
-}
-
-
-void Row::top_of_text(unsigned int top)
-{
-	top_of_text_ = top;
-}
-
-
-unsigned int Row::top_of_text() const
-{
-	return top_of_text_;
-}
-
-
-void Row::baseline(unsigned int b)
-{
-	baseline_ = b;
-}
-
-
-unsigned int Row::baseline() const
-{
-	return baseline_;
-}
-
-
-void Row::next(Row * r)
-{
-	next_ = r;
-}
-
-
-void Row::previous(Row * r)
-{
-	previous_ = r;
-}
-
-
-Row * Row::previous() const
-{
-	return previous_;
-}
-
-
-bool Row::isParStart() const
-{
-	return !pos();
-}
-
-
-bool Row::isParEnd() const
+void Row::ascent(int b)
 {
-	return !next() || next()->par() != par();
+	ascent_ = b;
 }
 
 
-pos_type Row::lastPos() const
+int Row::ascent() const
 {
-	if (!par()->size())
-		return 0;
-
-	if (isParEnd()) {
-		return par()->size() - 1;
-	} else {
-		return next()->pos() - 1;
-	}
+	return ascent_;
 }
 
 
-namespace {
-
-bool nextRowIsAllInset(Row const & row, pos_type last)
+void Row::dump(const char * s) const
 {
-	if (!row.par()->isInset(last + 1))
-		return false;
-
-	Inset * i = row.par()->getInset(last + 1);
-	return i->needFullRow() || i->display();
-}
-
-};
-
-
-pos_type Row::lastPrintablePos() const
-{
-	pos_type const last = lastPos();
-
-	// if this row is an end of par, just act like lastPos()
-	if (isParEnd())
-		return last;
-
-	bool const nextrownotinset = !nextRowIsAllInset(*this, last);
-
-	if (nextrownotinset && par()->isSeparator(last))
-		return last - 1;
-
-	return last;
-}
-
-
-int Row::numberOfSeparators() const
-{
-	pos_type const last = lastPrintablePos();
-	pos_type p = max(pos(), par()->beginningOfBody());
-
-	int n = 0;
-	for (; p <= last; ++p) {
-		if (par()->isSeparator(p)) {
-			++n;
-		}
-	}
-	return n;
+	lyxerr << s << " pos: " << pos_ << " end: " << end_
+		<< " width: " << width_
+		<< " ascent: " << ascent_
+		<< " descent: " << descent_
+		<< std::endl;
 }
 
 
-int Row::numberOfHfills() const
-{
-	pos_type const last = lastPos();
-	pos_type first = 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;
-}
-
-
-int Row::numberOfLabelHfills() const
-{
-	pos_type last = lastPos();
-	pos_type first = 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 Row::hfillExpansion(pos_type pos) const
-{
-	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()) {
-		pos_type i = this->pos();
-		while (i < pos && !par()->isHfill(i)) {
-			++i;
-		}
-		if (i == pos) {
-			return false;
-		}
-	}
-
-	// at the beginning of a row it does not count, if it is not
-	// the first row of a paragaph
-	if (isParStart())
-		return true;
-
-	// in some labels it does not count
-	if (par()->layout()->margintype != MARGIN_MANUAL
-	    && pos < par()->beginningOfBody())
-		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 = this->pos();
-	while (i < pos && (par()->isNewline(i) || par()->isHfill(i)))
-		++i;
-
-	return i != pos;
-}
+} // namespace lyx