X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=6484967fe08d840b96f1924fe7377a417e9a3701;hb=0762b52334d8a455a8c2ed08f5cc6ce6d67a35d9;hp=ae99490955f948a180dcbd24c6a74ed0dd98cade;hpb=3d590d3bd71a3522d525ce71220e99bd25b6a648;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index ae99490955..6484967fe0 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -33,6 +33,9 @@ class Text;
 /// A map from a Text to the map of paragraphs metrics
 class TextMetrics
 {
+	/// noncopyable
+	TextMetrics(TextMetrics const &);
+	void operator=(TextMetrics const &);
 public:
 	/// Default constructor (only here for STL containers).
 	TextMetrics() : bv_(0), text_(0), max_width_(0) {}
@@ -42,26 +45,35 @@ public:
 	///
 	bool contains(pit_type pit) const;
 	///
-	ParagraphMetrics const & parMetrics(pit_type) const;
-	///
 	std::pair<pit_type, ParagraphMetrics const *> first() const;
 	///
 	std::pair<pit_type, ParagraphMetrics const *> last() const;
+	/// is this row the last in the text?
+	bool isLastRow(Row const & row) const;
+	/// is this row the first in the text?
+	bool isFirstRow(Row const & row) const;
+	///
+	void setRowChanged(pit_type pit, pos_type pos);
 
 	///
-	Dimension const & dimension() const { return dim_; }
+	Dimension const & dim() const { return dim_; }
 	///
 	Point const & origin() const { return origin_; }
 
-
-	/// compute text metrics.
-	bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0);
+	///
+	ParagraphMetrics const & parMetrics(pit_type) const;
+	///
+	ParagraphMetrics & parMetrics(pit_type);
 
 	///
 	void newParMetricsDown();
 	///
 	void newParMetricsUp();
 
+	/// compute text metrics.
+	bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0,
+		     bool const expand_on_multipars = true);
+
 	/// The "nodraw" drawing stage for one single paragraph: set the
 	/// positions of the insets contained this paragraph in metrics
 	/// cache. Related to BufferView::updatePosCache.
@@ -96,7 +108,7 @@ public:
 	/// Rebreaks the given paragraph.
 	/// \retval true if a full screen redraw is needed.
 	/// \retval false if a single paragraph redraw is enough.
-	bool redoParagraph(pit_type const pit);
+	bool redoParagraph(pit_type const pit, bool align_rows = true);
 	/// Clear cache of paragraph metrics
 	void clear() { par_metrics_.clear(); }
 	/// Is cache of paragraph metrics empty ?
@@ -111,6 +123,15 @@ public:
 	/// current text height.
 	int height() const { return dim_.height(); }
 
+	/**
+	 * Returns the left beginning of the text.
+	 * This information cannot be taken from the layout object, because
+	 * in LaTeX the beginning of the text fits in some cases
+	 * (for example sections) exactly the label-width.
+	 */
+	int leftMargin(pit_type pit, pos_type pos) const;
+	int leftMargin(pit_type pit) const;
+
 	///
 	int rightMargin(ParagraphMetrics const & pm) const;
 	int rightMargin(pit_type const pit) const;
@@ -124,15 +145,6 @@ private:
 	///
 	ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph);
 
-	/**
-	 * Returns the left beginning of the text.
-	 * This information cannot be taken from the layout object, because
-	 * in LaTeX the beginning of the text fits in some cases
-	 * (for example sections) exactly the label-width.
-	 */
-	int leftMargin(pit_type pit, pos_type pos) const;
-	int leftMargin(pit_type pit) const;
-
 	/// the minimum space a manual label needs on the screen in pixels
 	int labelFill(Row const & row) const;
 
@@ -144,11 +156,10 @@ private:
 	/// \return true when another row is required (after a newline)
 	bool breakRow(Row & row, int right_margin) const;
 
-	// Expand the alignment of row \param row in paragraph \param par
+	// Expands the alignment of row \param row in paragraph \param par
 	LyXAlignment getAlign(Paragraph const & par, Row const & row) const;
-	/** this calculates the specified parameters. needed when setting
-	 * the cursor and when creating a visible row */
-	void computeRowMetrics(Row & row, int width) const;
+	/// Aligns properly the row contents (computes spaces and fills)
+	void setRowAlignment(Row & row, int width) const;
 
 	/// Set the height of the row (without space above/below paragraph)
 	void setRowHeight(Row & row) const;
@@ -158,7 +169,7 @@ private:
 	int parBottomSpacing(pit_type pit) const;
 
 	// Helper function for the other checkInsetHit method.
-	InsetList::InsetTable * checkInsetHit(pit_type pit, int x, int y);
+	InsetList::Element * checkInsetHit(pit_type pit, int x, int y);
 
 
 // Temporary public:
@@ -220,11 +231,6 @@ public:
 	///
 	void deleteLineForward(Cursor & cur);
 
-	/// is this row the last in the text?
-	bool isLastRow(Row const & row) const;
-	/// is this row the first in the text?
-	bool isFirstRow(Row const & row) const;
-
 	/// Returns an inset if inset was hit, or 0 if not.
 	/// \warning This method is not recursive! It will return the
 	/// outermost inset within this Text.
@@ -236,7 +242,6 @@ public:
 		Dimension & dim) const;
 
 private:
-	friend class BufferView;
 
 	/// The BufferView owner.
 	BufferView * bv_;