X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=046ca9d4c83753db394a575cbba94f49e9298139;hb=7920a12065458b4106d893cafd41afc53efd1b3c;hp=7aed1655f0ce1cffa4c845fa29a18505ebf0d7b2;hpb=11ca1406671f3e7b126bbe9b51694e8d32ba161c;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index 7aed1655f0..046ca9d4c8 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -123,14 +123,20 @@ public:
 	///
 	docstring asString(pit_type beg, pit_type end,
 		int options = AS_STR_NONE) const;
-	/// 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 we will shorten
-	/// \param os to maxlen chars and replace the final three by "...,
-	/// if \param os is longer than maxlen chars.
-	/// if \param maxlen is passed as 0, then it is ignored. (In fact,
-	/// it is reset to the maximum value for size_t.)
+
+	/// 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 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.
@@ -151,8 +157,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(Cursor const & cur, bool devel_mode) const;
 
 	/** Find the word under \c from in the relative location
 	 *  defined by \c word_location.
@@ -166,7 +172,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,
@@ -180,12 +186,10 @@ public:
 	void rejectChanges();
 
 	/// returns true if par was empty and was removed
-	bool setCursor(Cursor & cur, pit_type par, pos_type pos,
+	bool setCursor(Cursor & cur, pit_type pit, pos_type pos,
 		       bool setfont = true, bool boundary = false);
 	///
-	void setCursor(CursorSlice &, pit_type par, pos_type pos);
-	///
-	void setCursorIntern(Cursor & cur, pit_type par,
+	void setCursorIntern(Cursor & cur, pit_type pit,
 		 pos_type pos, bool setfont = true, bool boundary = false);
 
 	/// Move cursor one position backwards
@@ -219,9 +223,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);
 	///
@@ -242,7 +247,7 @@ public:
 	///
 	bool selectWordWhenUnderCursor(Cursor & cur, word_location);
 	/// Change the case of the word at cursor position.
-	void changeCase(Cursor & cur, TextCase action);
+	void changeCase(Cursor & cur, TextCase action, bool partial);
 	/// Transposes the character at the cursor with the one before it
 	void charsTranspose(Cursor & cur);
 
@@ -320,20 +325,23 @@ public:
 	docstring completionPrefix(Cursor const & cur) const;
 	/// find a paragraph before \p par with the given \p depth, if such
 	/// a paragraph cannot be found, \p par is returned
-	pit_type depthHook(pit_type par, depth_type depth) const;
+	pit_type depthHook(pit_type pit, depth_type depth) const;
 	/// find a paragraph before \p par with depth less than the
 	/// depth of \p par. If such paragraph cannot be found because
 	/// \p par already has depth 0, lastpar + 1 is returned. If
 	/// such paragraph cannot be found because there isn't a par
 	/// with less depth before this one, \p par is returned.
-	pit_type outerHook(pit_type par) const;
+	pit_type outerHook(pit_type pit) const;
 	/// Is it the first par with same depth and layout?
-	bool isFirstInSequence(pit_type par) const;
+	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 par) const;
+	int getTocLevel(pit_type pit) const;
 	/// 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 par_offset) const;
+	Font const outerFont(pit_type pit_offset) const;
 
 private:
 	/// The InsetText owner shall have access to everything.
@@ -381,7 +389,7 @@ private:
 ///
 void breakParagraphConservative(BufferParams const & bparams,
 				ParagraphList & paragraphs,
-				pit_type par,
+				pit_type pit,
 				pos_type pos);
 
 /**
@@ -389,7 +397,7 @@ void breakParagraphConservative(BufferParams const & bparams,
  * Be careful, this doesent make any check at all.
  */
 void mergeParagraph(BufferParams const & bparams,
-	ParagraphList & paragraphs, pit_type par);
+	ParagraphList & paragraphs, pit_type pit);
 
 /// accept the changes within the complete ParagraphList
 void acceptChanges(ParagraphList & pars, BufferParams const & bparams);