X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.h;h=63ed0f3cdf689bc6aecf3459c6430b065c228f2c;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=096c87a5e169953ea1e23766d346e36323e85e67;hpb=a40d6cd7bcbf9a9ce3c0d5a0088455a34af0928d;p=lyx.git

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 096c87a5e1..63ed0f3cdf 100644
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -5,10 +5,10 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
  * \author Abdelrazak Younes
  *
  * Full author contact details are available in file CREDITS.
@@ -17,7 +17,11 @@
 #ifndef PARAGRAPH_METRICS_H
 #define PARAGRAPH_METRICS_H
 
-#include "Paragraph.h"
+#include "Dimension.h"
+#include "Row.h"
+
+#include <map>
+#include <vector>
 
 namespace lyx {
 
@@ -28,21 +32,24 @@ namespace lyx {
  */
 typedef std::vector<Row> RowList;
 
+class Buffer;
+class BufferView;
+class BufferParams;
+class Font;
+class Inset;
+class Paragraph;
 class MetricsInfo;
 class PainterInfo;
 
-/// Helper class for Paragraph Metrics.
-class ParagraphMetrics  {
+/// Helper class for paragraph metrics.
+class ParagraphMetrics {
 public:
 	/// Default constructor (only here for STL containers).
-	ParagraphMetrics(): par_(0) {};
+	ParagraphMetrics() : position_(0), par_(0) {}
 	/// The only useful constructor.
-	ParagraphMetrics(Paragraph const & par);
+	explicit ParagraphMetrics(Paragraph const & par);
 
 	/// Copy operator.
-	/// Important note: We don't copy \c row_change_status_ and
-	/// \c row_signature_ because those are updated externally with
-	/// \c updateRowChangeStatus() in TextMetrics::redoParagraph().
 	ParagraphMetrics & operator=(ParagraphMetrics const &);
 
 	void reset(Paragraph const & par);
@@ -54,45 +61,39 @@ public:
 	///
 	size_t pos2row(pos_type pos) const;
 
-	/// BufferView::redoParagraph updates this
+	/// TextMetrics::redoParagraph updates this
 	Dimension const & dim() const { return dim_; }
 	Dimension & dim() { return dim_; }
 	/// total height of paragraph
-	unsigned int height() const { return dim_.height(); }
+	int height() const { return dim_.height(); }
 	/// total width of paragraph, may differ from workwidth
-	unsigned int width() const { return dim_.width(); }
+	int width() const { return dim_.width(); }
 	/// ascend of paragraph above baseline
-	unsigned int ascent() const { return dim_.ascent(); }
+	int ascent() const { return dim_.ascent(); }
 	/// descend of paragraph below baseline
-	unsigned int descent() const { return dim_.descent(); }
+	int descent() const { return dim_.descent(); }
 	/// Text updates the rows using this access point
 	RowList & rows() { return rows_; }
 	/// The painter and others use this
 	RowList const & rows() const { return rows_; }
-	/// The painter and others use this
-	std::vector<bool> const & rowChangeStatus() const
-	{ return row_change_status_; }
-	///
-	void updateRowChangeStatus(BufferParams const & bparams);
 	///
-	int rightMargin(Buffer const & buffer) const;
-	///
-	int singleWidth(pos_type pos, Font const & Font) const;
+	int rightMargin(BufferView const & bv) const;
 
 	/// dump some information to lyxerr
 	void dump() const;
 
-private:
-	///
-	typedef std::vector<size_type> RowSignature;
 	///
-	size_type calculateRowSignature(Row const &, BufferParams const & bparams);
+	bool hfillExpansion(Row const & row, pos_type pos) const;
+
 	///
-	mutable RowList rows_;
+	int position() const { return position_; }
+	void setPosition(int position);
+
+private:
 	///
-	RowSignature row_signature_;
+	int position_;
 	///
-	std::vector<bool> row_change_status_;
+	mutable RowList rows_;
 	/// cached dimensions of paragraph
 	Dimension dim_;
 	///