X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=447900c43f4c8714befc159f059cd548169da87d;hb=67e61a395698fdfc8a50d2af593b1c2dd89ac018;hp=ca136207f13a289e9bbe631814cc94df462a51fb;hpb=aa64f8da6833058f74abbc5a9b4a96987fa3ce1d;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index ca136207f1..447900c43f 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -81,10 +81,10 @@ public:
 
 	/// set layout over selection
 	void setLayout(Buffer const & buffer, pit_type start, pit_type end,
-		std::string const & layout);
+		docstring const & layout);
 	/// Set given layout to current cursor position.
 	/// FIXME: replace Cursor with DocIterator.
-	void setLayout(Cursor & cur, std::string const & layout);
+	void setLayout(Cursor & cur, docstring const & layout);
 
 	/// what type of depth change to make
 	enum DEPTH_CHANGE {
@@ -335,6 +335,13 @@ public:
 	bool isRTL(Buffer const &, Paragraph const & par) const;
 	/// is this position in the paragraph right-to-left?
 	bool isRTL(Buffer const & buffer, CursorSlice const & sl, bool boundary) const;
+	/// is between pos-1 and pos an RTL<->LTR boundary?
+	bool isRTLBoundary(Buffer const & buffer, Paragraph const & par,
+	  pos_type pos) const;
+	/// would be a RTL<->LTR boundary between pos and the given font?
+	bool isRTLBoundary(Buffer const & buffer, Paragraph const & par,
+	  pos_type pos, Font const & font) const;
+
 	///
 	bool checkAndActivateInset(Cursor & cur, bool front);
 
@@ -371,8 +378,6 @@ public:
 	///
 	int background_color_;
 
-	///
-	mutable Bidi bidi;
 	///
 	ParagraphList pars_;
 
@@ -409,9 +414,8 @@ private:
 	void number(Cursor & cur);
 	/// draw selection for a single row
 	void drawRowSelection(PainterInfo & pi, int x, Row const & row,
-												DocIterator const & beg, DocIterator const & end, 
-												bool drawOnBegMargin, bool drawOnEndMargin) const;
-
+		DocIterator const & beg, DocIterator const & end, 
+		bool drawOnBegMargin, bool drawOnEndMargin) const;
 
 	/// paste plain text at current cursor.
 	/// \param str string to paste