X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtext.h;h=8b0242bb3fb943a66a97e3abeff189192d7a4209;hb=37d42d45f3f4a5d3e916a080af50b37ae4a9d118;hp=52f9b6b34b292b945551576f8049c539693cf2d0;hpb=81efcd9cf68b493a545f10fd49f98b35415c7a52;p=lyx.git

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 52f9b6b34b..8b0242bb3f 100644
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -75,7 +75,7 @@ public:
 	void breakParagraph(LCursor & cur, bool keep_layout = false);
 
 	/// set layout over selection
-	pit_type setLayout(pit_type start, pit_type end,
+	void setLayout(pit_type start, pit_type end,
 		std::string const & layout);
 	///
 	void setLayout(LCursor & cur, std::string const & layout);
@@ -133,7 +133,7 @@ public:
 	/// read-write access to individual paragraph
 	Paragraph & getPar(pit_type pit) { return pars_[pit]; }
 	// Returns the current font and depth as a message.
-	std::string LyXText::currentState(LCursor & cur);
+	std::string currentState(LCursor & cur);
 
 	/** returns row near the specified
 	  * y-coordinate in given paragraph (relative to the screen).
@@ -176,8 +176,8 @@ public:
 	void recUndo(pit_type first, pit_type last) const;
 	///
 	void recUndo(pit_type first) const;
-	///
-	void setCursorFromCoordinates(LCursor & cur, int x, int y);
+	/// returns true if par was empty and was removed
+	bool setCursorFromCoordinates(LCursor & cur, int x, int y);
 	///
 	InsetBase * editXY(LCursor & cur, int x, int y);
 	/// Move cursor one line up.
@@ -221,9 +221,9 @@ public:
 	///
 	void cursorBottom(LCursor & cur);
 	///
-	void Delete(LCursor & cur);
+	bool Delete(LCursor & cur);
 	///
-	void backspace(LCursor & cur);
+	bool backspace(LCursor & cur);
 	///
 	bool selectWordWhenUnderCursor(LCursor & cur, lyx::word_location);
 	///
@@ -326,6 +326,9 @@ public:
 	///
 	int cursorY(CursorSlice const & cursor, bool boundary) const;
 
+	/// delete double space or empty paragraphs around old cursor
+	bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old);
+
 	///
 	friend class LyXScreen;
 
@@ -339,6 +342,8 @@ public:
 	/// the current font
 	LyXFont real_current_font;
 	/// our buffer's default layout font. This is textclass specific
+	/* This is actually never initialized! Should be replaced by a
+	 * defaultfont() method that looks at the textclass (easy). [JMarc]*/
 	LyXFont defaultfont_;
 	///
 	int background_color_;
@@ -362,9 +367,6 @@ private:
 	/// change on pit
 	pit_type undoSpan(pit_type pit);
 
-	/// used in setlayout
-	void makeFontEntriesLayoutSpecific(BufferParams const &, Paragraph & par);
-
 	/// Calculate and set the height of the row
 	void setHeightOfRow(pit_type, Row & row);
 
@@ -372,9 +374,6 @@ private:
 	// position. Called by deleteEmptyParagraphMechanism
 	void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where);
 
-	/// delete double space or empty paragraphs around old cursor
-	bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor const & old);
-
 	///
 	void deleteWordForward(LCursor & cur);
 	///