X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.h;h=a51e3ceb912cefef657b80c71a83ddd3238d929f;hb=44cdffa39e9160bde46d824f1915f9ef3084b53e;hp=7725427b9be615d286e9ba0165fea49ba1f07c52;hpb=b8170e0e01f486fefb94b19566e24dd391419c12;p=lyx.git

diff --git a/src/Row.h b/src/Row.h
index 7725427b9b..a51e3ceb91 100644
--- a/src/Row.h
+++ b/src/Row.h
@@ -46,8 +46,6 @@ public:
 		 * correspond to any paragraph contents
 		 */
 		VIRTUAL,
-		// A stretchable space, basically
-		SEPARATOR,
 		// An inset
 		INSET,
 		// Some spacing described by its width, not a string
@@ -63,25 +61,39 @@ public:
 			: type(t), pos(p), endpos(p + 1), inset(0),
 			  extra(0), font(f), change(ch), final(false) {}
 
-		// returns total width of element, including separator overhead
-		double width() const { return dim.wid + extra; };
-		// returns position in pixels (from the left) of position
-		// \param i in the row element.
-		double pos2x(pos_type const i) const;
+		// Return total width of element, including separator overhead
+		double full_width() const { return dim.wid + extra * countSeparators(); }
+		// Return the number of separator in the element (only STRING type)
+		int countSeparators() const;
 
+		/** Return position in pixels (from the left) of position
+		 * \param i in the row element.
+		 */
+		double pos2x(pos_type const i) const;
 		/** Return character position that is the closest to
 		 *  pixel position \param x. The value \param x is
-		 *  rounded to the actual pixel position. If \param
-		 *  short is true, the pixel value is rounded by
-		 *  default.
+		 *  adjusted to the actual pixel position.
 		*/
-		pos_type x2pos(double &x, bool low = false) const;
+		pos_type x2pos(int &x) const;
+		/** Break the element if possible, so that its width is less
+		 * than \param w. Returns true on success. When \param force
+		 * is true, the string is cut at any place, other wise it
+		 * respects the row breaking rules of characters.
+		 */
+		bool breakAt(int w, bool force);
 
 		// Returns the position on left side of the element.
 		pos_type left_pos() const;
 		// Returns the position on right side of the element.
 		pos_type right_pos() const;
 
+		//
+		bool isRTL() const { return font.isVisibleRightToLeft(); }
+		// This is true for virtual elements.
+		// Note that we do not use the type here. The two definitions
+		// should be equivalent
+		bool isVirtual() const { return pos == endpos; }
+
 		// The kind of row element
 		Type type;
 		// position of the element in the paragraph
@@ -95,10 +107,10 @@ public:
 		// Non-zero only if element is an inset
 		Inset const * inset;
 
-		// Only non-null for separator elements
+		// Only non-null for justified rows
 		double extra;
 
-		// Non-empty if element is a string or separator
+		// Non-empty if element is a string or is virtual
 		docstring str;
 		//
 		Font font;
@@ -151,13 +163,18 @@ public:
 	Dimension & dimension() { return dim_; }
 	///
 	int height() const { return dim_.height(); }
-	///
+	/// The width of the row, including the left margin, but not the right one.
 	int width() const { return dim_.wid; }
 	///
 	int ascent() const { return dim_.asc; }
 	///
 	int descent() const { return dim_.des; }
 
+	// Return the number of separators in the row
+	int countSeparators() const;
+	// Set the extra spacing for every separator in STRING elements
+	void setSeparatorExtraWidth(double w);
+
 	///
 	void add(pos_type pos, Inset const * ins, Dimension const & dim,
 		 Font const & f, Change const & ch);
@@ -168,9 +185,6 @@ public:
 	void addVirtual(pos_type pos, docstring const & s,
 			Font const & f, Change const & ch);
 	///
-	void addSeparator(pos_type pos, char_type const c,
-			  Font const & f, Change const & ch);
-	///
 	void addSpace(pos_type pos, int width, Font const & f, Change const & ch);
 
 	///
@@ -209,7 +223,7 @@ public:
 	 * \param body_pos minimum amount of text to keep.
 	 * \param width maximum width of the row
 	 */
-	void shorten_if_needed(pos_type const body_pos, int const width);
+	void shortenIfNeeded(pos_type const body_pos, int const width);
 
 	/**
 	 * If last element of the row is a string, compute its width
@@ -225,12 +239,12 @@ public:
 
 	friend std::ostream & operator<<(std::ostream & os, Row const & row);
 
-	/// width of a separator (i.e. space)
+	/// additional width for separators in justified rows (i.e. space)
 	double separator;
 	/// width of hfills in the label
 	double label_hfill;
-	/// the x position of the row (left margin)
-	double x;
+	/// the left margin position of the row
+	int left_margin;
 	/// the right margin of the row
 	int right_margin;
 	///