X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=99d83f4a29d25236ba69efcfb8a75faa64d28515;hb=b536759c0769dab641993347baeb62400455be04;hp=f09acc814b7045878a61364361d2bbda8dcc68c5;hpb=ba0f28a09b5d2037b836395400e8520801618647;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index f09acc814b..99d83f4a29 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -109,6 +109,8 @@ public:
 
 	///
 	void toggleFree(Cursor & cur, Font const &, bool toggleall = false);
+	/// Stack to save recent text propterty applications
+	std::vector<docstring> getFreeFonts() const;
 
 	/// ???
 	/// FIXME: replace Cursor with DocIterator.
@@ -258,7 +260,7 @@ public:
 	 settings are given to the new one.
 	 This function will handle a multi-paragraph selection.
 	 */
-	void setParagraphs(Cursor & cur, docstring arg, bool modify = false);
+	void setParagraphs(Cursor & cur, docstring const & arg, bool modify = false);
 	/// Sets parameters for current or selected paragraphs
 	void setParagraphs(Cursor & cur, ParagraphParameters const & p);
 
@@ -283,7 +285,7 @@ public:
 	/// FIXME: replace Cursor with DocIterator.
 	docstring getPossibleLabel(DocIterator const & cur) const;
 	/// is this paragraph right-to-left?
-	bool isRTL(Paragraph const & par) const;
+	bool isRTL(pit_type pit) const;
 
 	///
 	bool checkAndActivateInset(Cursor & cur, bool front);
@@ -299,13 +301,13 @@ public:
 
 	/// delete double spaces, leading spaces, and empty paragraphs around old cursor.
 	/// \retval true if a change has happened and we need a redraw.
-	/// FIXME: replace Cursor with DocIterator. This is not possible right
-	/// now because recordUndo() is called which needs a Cursor.
+	/// Handles undo.
 	static bool deleteEmptyParagraphMechanism(Cursor & cur,
 		Cursor & old, bool & need_anchor_change);
 
 	/// delete double spaces, leading spaces, and empty paragraphs
 	/// from \first to \last paragraph
+	/// Does NOT handle undo (responsibility of the caller)
 	void deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges);
 
 	/// To resolve macros properly the texts get their DocIterator.
@@ -343,15 +345,13 @@ public:
 	/// Get the font of the "environment" of paragraph \p par_offset in \p pars.
 	/// All font changes of the paragraph are relative to this font.
 	Font const outerFont(pit_type pit_offset) const;
+	/// Return the label type at the end of paragraph \c pit.
+	int getEndLabel(pit_type pit) const;
 
 private:
 	/// The InsetText owner shall have access to everything.
 	friend class InsetText;
 
-	// fix the cursor `cur' after a characters has been deleted at `where'
-	// position. Called by deleteEmptyParagraphMechanism
-	static void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where);
-
 	// At cursor position 0, try to merge the paragraph with the one before it.
 	// Ignore change tracking, i.e., physically remove the end-of-par character
 	bool backspacePos0(Cursor & cur);