X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtext.h;h=949566c3e04f633500e58e9d714c3f08be4ba61c;hb=80296aac5015662a4c23ee7a818d5fde34f363bd;hp=a5a82ffdb1b986f0140b57995cb118685b083dfd;hpb=8fa8cfb4a38bf2385eea2774e2ce06a754871380;p=lyx.git

diff --git a/src/lyxtext.h b/src/lyxtext.h
index a5a82ffdb1..949566c3e0 100644
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -81,9 +81,8 @@ public:
 	  those paragraphs
 	  */
 	ParagraphList::iterator
-	setLayout(LyXCursor & actual_cursor,
-		  LyXCursor & selection_start,
-		  LyXCursor & selection_end,
+	setLayout(ParagraphList::iterator start,
+		  ParagraphList::iterator end,
 		  std::string const & layout);
 	///
 	void setLayout(std::string const & layout);
@@ -183,8 +182,6 @@ public:
 	/// reject selected change
 	void rejectChange();
 
-	/// re-computes the cached coordinates in the cursor
-	void redoCursor();
 	///
 	void setCursor(ParagraphList::iterator pit, lyx::pos_type pos);
 	/// returns true if par was empty and was removed
@@ -396,6 +393,19 @@ public:
 	/// returns whether we've seen our usual 'end' marker
 	bool read(Buffer const & buf, LyXLex & lex);
 
+	///
+	int ascent() const;
+	///
+	int descent() const;
+	///
+	int cursorX() const;
+	///
+	int cursorY() const;
+	///
+	int cursorX(LyXCursor const & cursor) const;
+	///
+	int cursorY(LyXCursor const & cursor) const;
+
 public:
 	///
 	int height;
@@ -431,12 +441,12 @@ public:
 
 
 private:
+	/// return past-the-last paragraph influenced by a layout
+	/// change on pit
+	ParagraphList::iterator undoSpan(ParagraphList::iterator pit);
+	
 	/// rebreaks the given par
 	void redoParagraphInternal(ParagraphList::iterator pit);
-
-	///
-	float getCursorX(ParagraphList::iterator pit,
-	     Row const & row, lyx::pos_type pos, bool boundary) const;
 	/// used in setlayout
 	void makeFontEntriesLayoutSpecific(BufferParams const &, Paragraph & par);