X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=bdf2169fab7be26592c113066ad4311bf25178ba;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=e6759ef4361887018ed5ccceabfd0ed3e5086a67;hpb=8ed7f52584b6724429a08a6c31d33c23a246a076;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index e6759ef436..bdf2169fab 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -123,14 +123,16 @@ 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.)
-	void forOutliner(docstring & os, size_t maxlen, bool shorten = true) const;
+
+	/// 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;
 
 	/// insert a character at cursor position
 	/// FIXME: replace Cursor with DocIterator.
@@ -180,19 +182,12 @@ 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);
 
-	///
-	void recUndo(Cursor & cur, pit_type first, pit_type last) const;
-	///
-	void recUndo(Cursor & cur, pit_type first) const;
-
 	/// Move cursor one position backwards
 	/**
 	 * Returns true if an update is needed after the move.
@@ -247,7 +242,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);
 
@@ -325,20 +320,20 @@ 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;
 	/// 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.
@@ -378,19 +373,15 @@ private:
 	InsetText * owner_;
 	///
 	ParagraphList pars_;
-	///
-	bool autoBreakRows_;
 	/// position of the text in the buffer.
 	DocIterator macrocontext_position_;
-	///
-	unsigned int undo_counter_;
 };
 
 
 ///
 void breakParagraphConservative(BufferParams const & bparams,
 				ParagraphList & paragraphs,
-				pit_type par,
+				pit_type pit,
 				pos_type pos);
 
 /**
@@ -398,7 +389,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);