X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=0ae802aca5f11392edeaa1f4302c9b6b44e727be;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=26156fa100b48ae8fa439bacbe08f4d0c831dcf5;hpb=7f0525e9e09459e5bccc8442d889a1aafffa071f;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 26156fa100..0ae802aca5 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -21,18 +21,22 @@
 
 #include "support/types.h"
 
+#include <map>
+
 namespace lyx {
 
 class BufferView;
 class Cursor;
 class CursorSlice;
-class DocIterator;
 class MetricsInfo;
 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) {}
@@ -57,20 +61,22 @@ public:
 	///
 	Point const & origin() const { return origin_; }
 
-
 	///
 	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 metrics(MetricsInfo const & 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
+	/// positions of the insets contained in this paragraph in metrics
 	/// cache. Related to BufferView::updatePosCache.
 	void updatePosCache(pit_type pit) const;
 
@@ -93,11 +99,9 @@ public:
 	/// is this position in the paragraph right-to-left?
 	bool isRTL(CursorSlice const & sl, bool boundary) const;
 	/// is between pos-1 and pos an RTL<->LTR boundary?
-	bool isRTLBoundary(pit_type pit,
-	  pos_type pos) const;
+	bool isRTLBoundary(pit_type pit, pos_type pos) const;
 	/// would be a RTL<->LTR boundary between pos and the given font?
-	bool isRTLBoundary(pit_type pit,
-	  pos_type pos, Font const & font) const;
+	bool isRTLBoundary(pit_type pit, pos_type pos, Font const & font) const;
 
 
 	/// Rebreaks the given paragraph.
@@ -118,6 +122,17 @@ public:
 	/// current text height.
 	int height() const { return dim_.height(); }
 
+	/**
+	 * Returns the left beginning of a row starting at \c pos.
+	 * 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;
+	/// Return the left beginning of a row which is not the first one.
+	/// This is the left margin when there is no indentation.
+	int leftMargin(pit_type pit) const;
+
 	///
 	int rightMargin(ParagraphMetrics const & pm) const;
 	int rightMargin(pit_type const pit) const;
@@ -131,15 +146,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;
 
@@ -215,9 +221,9 @@ public:
 	void setCursorFromCoordinates(Cursor & cur, int x, int y);
 
 	///
-	int cursorX(CursorSlice const & cursor, bool boundary) const;
+	int cursorX(CursorSlice const & sl, bool boundary) const;
 	///
-	int cursorY(CursorSlice const & cursor, bool boundary) const;
+	int cursorY(CursorSlice const & sl, bool boundary) const;
 
 	///
 	bool cursorHome(Cursor & cur);
@@ -237,7 +243,6 @@ public:
 		Dimension & dim) const;
 
 private:
-	friend class BufferView;
 
 	/// The BufferView owner.
 	BufferView * bv_;