X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=0ae802aca5f11392edeaa1f4302c9b6b44e727be;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=20e0dfb8438dcebf23f7729c0cad204d07476eee;hpb=715b8cda54a2aded29260b57ff201b16fd906f21;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 20e0dfb843..0ae802aca5 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -21,12 +21,13 @@
 
 #include "support/types.h"
 
+#include <map>
+
 namespace lyx {
 
 class BufferView;
 class Cursor;
 class CursorSlice;
-class DocIterator;
 class MetricsInfo;
 class Text;
 
@@ -75,7 +76,7 @@ public:
 		     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;
 
@@ -98,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.
@@ -124,12 +123,14 @@ public:
 	int height() const { return dim_.height(); }
 
 	/**
-	 * Returns the left beginning of the text.
+	 * 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;
 
 	///
@@ -220,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);