X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=99d83f4a29d25236ba69efcfb8a75faa64d28515;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=f49c8e2d91c8c41a2a7093d4dcacc8a6d751df14;hpb=425c190d623daeb6d05bce1aa2244b548225305a;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index f49c8e2d91..99d83f4a29 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -24,6 +24,7 @@ class BufferParams;
 class BufferView;
 class CompletionList;
 class Cursor;
+class CursorData;
 class CursorSlice;
 class DocIterator;
 class ErrorList;
@@ -49,7 +50,7 @@ private:
 public:
 	/// \return true if there's no content at all.
 	/// \warning a non standard layout on an empty paragraph doesn't
-	// count as empty.
+	/// count as empty.
 	bool empty() const;
 	/// Access to owner InsetText.
 	InsetText const & inset() const;
@@ -108,10 +109,12 @@ 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.
-	docstring getStringToIndex(Cursor const & cur);
+	docstring getStringForDialog(Cursor & cur);
 
 	/// Convert the paragraphs to a string.
 	/// \param AsStringParameter options. This can contain any combination of
@@ -127,7 +130,7 @@ public:
 	/// truncates str to maxlenwith an ellipsis and replaces the characters '\n'
 	/// and '\t' with spaces
 	static void shortenForOutliner(docstring & str, size_t const maxlen);
-		
+
 	/// Appends a possibly abbreviated representation of our text to \param os,
 	/// where \param maxlen defines the maximum size of \param os. If \param
 	/// shorten is true, then os is shortened as above.
@@ -157,8 +160,8 @@ public:
 	/// read-write access to individual paragraph
 	Paragraph & getPar(pit_type pit) { return pars_[pit]; }
 	// Returns the current font and depth as a message.
-	/// FIXME: replace Cursor with DocIterator.
-	docstring currentState(Cursor const & cur) const;
+	// When \param devel_mode is true, add more precise information
+	docstring currentState(CursorData const & cur, bool devel_mode) const;
 
 	/** Find the word under \c from in the relative location
 	 *  defined by \c word_location.
@@ -172,7 +175,7 @@ public:
 	void selectAll(Cursor & cur);
 	/// convenience function get the previous word or an empty string
 	docstring previousWord(CursorSlice const & sl) const;
-	
+
 	/// what type of change operation to make
 	enum ChangeOp {
 		ACCEPT,
@@ -223,9 +226,10 @@ public:
 	///
 	bool cursorVisRightOneWord(Cursor & cur);
 	/// Delete from cursor up to the end of the current or next word.
-	void deleteWordForward(Cursor & cur);
+	/// Use force to skip the confirmDeletion check.
+	void deleteWordForward(Cursor & cur, bool force = false);
 	/// Delete from cursor to start of current or prior word.
-	void deleteWordBackward(Cursor & cur);
+	void deleteWordBackward(Cursor & cur, bool force = false);
 	///
 	bool cursorUpParagraph(Cursor & cur);
 	///
@@ -256,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);
 
@@ -279,9 +283,9 @@ public:
 	double spacing(Paragraph const & par) const;
 	/// make a suggestion for a label
 	/// FIXME: replace Cursor with DocIterator.
-	docstring getPossibleLabel(Cursor const & cur) const;
+	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);
@@ -297,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.
@@ -341,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);