X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=054b6f6ee4f3ca0c527248c58a768c61ad2a3279;hb=c5301a6495b108df5b307da39dad5be65926f76b;hp=bdf2169fab7be26592c113066ad4311bf25178ba;hpb=b917c4e40f9f5cd3d101444600eddafcca54d6e3;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index bdf2169fab..054b6f6ee4 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,12 +130,16 @@ 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
-	void forOutliner(docstring & os, size_t const maxlen,
-					 bool const shorten = true) const;
+	/// shorten is true, then os is shortened as above.
+	void forOutliner(docstring & os, size_t maxlen, bool shorten = true) const;
+	/// Appends a possibly abbreviated representation of our text, from
+	/// start to end, to \param os, where \param maxlen defines the
+	/// maximum size of \param os. Omits the label of the first paragraph.
+	void forOutliner(docstring & os, size_t maxlen, pit_type start, pit_type end,
+	                 bool shorten = true) const;
 
 	/// insert a character at cursor position
 	/// FIXME: replace Cursor with DocIterator.
@@ -153,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.
@@ -168,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,
@@ -219,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);
 	///
@@ -275,7 +283,7 @@ 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;
 
@@ -329,6 +337,9 @@ public:
 	pit_type outerHook(pit_type pit) const;
 	/// Is it the first par with same depth and layout?
 	bool isFirstInSequence(pit_type pit) const;
+	/// Return the last paragraph with same depth and layout, or a strictly
+	/// greater depth
+	pit_type lastInSequence(pit_type pit) const;
 	/// Is this paragraph in the table of contents?
 	int getTocLevel(pit_type pit) const;
 	/// Get the font of the "environment" of paragraph \p par_offset in \p pars.
@@ -339,10 +350,6 @@ 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);