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

diff --git a/src/lyxtext.h b/src/lyxtext.h
index b4bef7289d..8b0242bb3f 100644
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -60,6 +60,8 @@ public:
 	///
 	LyXFont getFont(Paragraph const & par, pos_type pos) const;
 	///
+	void applyOuterFont(LyXFont &) const;
+	///
 	LyXFont getLayoutFont(pit_type pit) const;
 	///
 	LyXFont getLabelFont(Paragraph const & par) const;
@@ -73,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);
@@ -93,7 +95,7 @@ public:
 	void setFont(LCursor & cur, LyXFont const &, bool toggleall = false);
 
 	/// rebreaks the given par
-	void redoParagraph(pit_type pit);
+	bool redoParagraph(pit_type pit);
 
 	/// returns pos in given par at given x coord
 	pos_type x2pos(pit_type pit, int row, int x) const;
@@ -103,7 +105,7 @@ public:
 	void toggleFree(LCursor & cur, LyXFont const &, bool toggleall = false);
 
 	///
-	std::string getStringToIndex(LCursor & cur);
+	std::string getStringToIndex(LCursor const & cur);
 
 	/// insert a character at cursor position
 	void insertChar(LCursor & cur, char c);
@@ -124,14 +126,14 @@ public:
 		FuncStatus & status) const;
 
 	/// access to out BufferView. This should go...
-//	BufferView * bv();
-	/// access to out BufferView. This should go...
 	BufferView * bv() const;
 
-	/// access to individual paragraphs
-	Paragraph & getPar(pit_type par) const;
+	/// read-only access to individual paragraph
+	Paragraph const & getPar(pit_type pit) const { return pars_[pit]; }
+	/// 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).
@@ -163,8 +165,7 @@ public:
 	bool setCursor(LCursor & cur, pit_type par, pos_type pos,
 		       bool setfont = true, bool boundary = false);
 	///
-	void setCursor(CursorSlice &, pit_type par,
-		       pos_type pos, bool boundary = false);
+	void setCursor(CursorSlice &, pit_type par, pos_type pos);
 	///
 	void setCursorIntern(LCursor & cur, pit_type par,
 	         pos_type pos, bool setfont = true, bool boundary = false);
@@ -175,10 +176,10 @@ public:
 	void recUndo(pit_type first, pit_type last) const;
 	///
 	void recUndo(pit_type first) const;
+	/// returns true if par was empty and was removed
+	bool setCursorFromCoordinates(LCursor & cur, int x, int y);
 	///
-	void setCursorFromCoordinates(LCursor & cur, int x, int y);
-	///
-	InsetBase * editXY(LCursor & cur, int x, int y) const;
+	InsetBase * editXY(LCursor & cur, int x, int y);
 	/// Move cursor one line up.
 	/**
 	 * Returns true if an update is needed after the move.
@@ -220,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);
 	///
@@ -289,7 +290,8 @@ public:
 	RowMetrics computeRowMetrics(pit_type pit, Row const & row) const;
 
 	/// access to our paragraphs
-	ParagraphList & paragraphs() const;
+	ParagraphList const & paragraphs() const { return pars_; }
+	ParagraphList & paragraphs() { return pars_; }
 	/// return true if this is the main text
 	bool isMainText() const;
 
@@ -320,9 +322,12 @@ public:
 	///
 	int descent() const;
 	///
-	int cursorX(CursorSlice const & cursor) const;
+	int cursorX(CursorSlice const & cursor, bool boundary) const;
 	///
-	int cursorY(CursorSlice const & cursor) const;
+	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;
@@ -336,7 +341,9 @@ public:
 	LyXFont current_font;
 	/// the current font
 	LyXFont real_current_font;
-	/// our buffer's default layout 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_;
@@ -349,7 +356,8 @@ public:
 	///
 	ParagraphList pars_;
 
-	/// our 'outermost' Font
+	/// our 'outermost' font. This is handed down from the surrounding
+	// inset through the pi/mi parameter (pi.base.font)
 	LyXFont font_;
 
 	///
@@ -359,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);
 
@@ -369,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);
 	///