X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=01d47d69662ffba9ff06d21103222d62a99e3473;hb=9ec80456feed688440360e0a493cbf537c4fe5f9;hp=b5160a95389deed6eba93631f9bafe6aea316883;hpb=f9aadae29093d64876963c111a95f1ceeea54f32;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index b5160a9538..01d47d6966 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -19,23 +19,23 @@
 
 namespace lyx {
 
-class Buffer;
 class BufferParams;
 class BufferView;
+class Change;
 class CompletionList;
 class Cursor;
 class CursorData;
 class CursorSlice;
-class DocIterator;
 class ErrorList;
 class Font;
 class FontInfo;
 class FuncRequest;
 class FuncStatus;
 class Inset;
+class InsetText;
 class Lexer;
-class PainterInfo;
-class Spacing;
+class Paragraph;
+class ParagraphParameters;
 
 /// This class encapsulates the main text data and operations in LyX.
 /// This is more or less the private implementation of InsetText.
@@ -94,11 +94,11 @@ public:
 	};
 	/// Increase or decrease the nesting depth of the selected paragraph(s)
 	/// FIXME: replace Cursor with DocIterator.
-	void changeDepth(Cursor & cur, DEPTH_CHANGE type);
+	void changeDepth(Cursor const & cur, DEPTH_CHANGE type);
 
 	/// Returns whether something would be changed by changeDepth
 	/// FIXME: replace Cursor with DocIterator.
-	bool changeDepthAllowed(Cursor & cur, DEPTH_CHANGE type) const;
+	bool changeDepthAllowed(Cursor const & cur, DEPTH_CHANGE type) const;
 
 	/// Set font over selection paragraphs and rebreak.
 	/// FIXME: replace Cursor with DocIterator.
@@ -171,6 +171,8 @@ public:
 	void getWord(CursorSlice & from, CursorSlice & to, word_location const) const;
 	/// just selects the word the cursor is in
 	void selectWord(Cursor & cur, word_location loc);
+	/// expands the selection to the word the cursor is in
+	void expandWordSel(Cursor & cur);
 	/// select all text
 	void selectAll(Cursor & cur);
 
@@ -245,6 +247,8 @@ public:
 	// Dissolve the inset under cursor
 	/// FIXME: replace Cursor with DocIterator.
 	bool dissolveInset(Cursor & cur);
+	/// FIXME: replace Cursor with DocIterator.
+	bool splitInset(Cursor & cur);
 	///
 	bool selectWordWhenUnderCursor(Cursor & cur, word_location);
 	/// Change the case of the word at cursor position.
@@ -258,9 +262,9 @@ public:
 	 settings are given to the new one.
 	 This function will handle a multi-paragraph selection.
 	 */
-	void setParagraphs(Cursor & cur, docstring const & arg, bool modify = false);
+	void setParagraphs(Cursor const & cur, docstring const & arg, bool merge = false);
 	/// Sets parameters for current or selected paragraphs
-	void setParagraphs(Cursor & cur, ParagraphParameters const & p);
+	void setParagraphs(Cursor const & cur, ParagraphParameters const & p);
 
 	/* these things are for search and replace */
 
@@ -308,6 +312,13 @@ public:
 	/// Does NOT handle undo (responsibility of the caller)
 	void deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges);
 
+	/// delete double spaces, leading spaces, and empty paragraphs
+	/// from \first to \last paragraph and \first_pos to \last_pos
+	/// Does NOT handle undo (responsibility of the caller)
+	void deleteEmptyParagraphMechanism(pit_type first, pit_type last,
+					   pos_type first_pos, pos_type last_pos,
+					   bool trackChanges);
+
 	/// To resolve macros properly the texts get their DocIterator.
 	/// Every macro definition is stored with its DocIterator
 	/// as well. Only those macros with a smaller iterator become
@@ -320,8 +331,9 @@ public:
 	bool completionSupported(Cursor const & cur) const;
 	///
 	CompletionList const * createCompletionList(Cursor const & cur) const;
-	///
-	bool insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/);
+	/// Do a completion at the cursor position. Return true on success.
+	/// The completion does not contain the prefix. Handles undo.
+	bool insertCompletion(Cursor & cur, docstring const & s);
 	///
 	docstring completionPrefix(Cursor const & cur) const;
 	/// find a paragraph before \p par with the given \p depth, if such
@@ -356,7 +368,7 @@ private:
 	/// handle the case where bibitems were deleted
 	bool handleBibitems(Cursor & cur);
 	/// are we in a list item (description etc.)?
-	bool inDescriptionItem(Cursor & cur) const;
+	bool inDescriptionItem(Cursor const & cur) const;
 	///
 	void charInserted(Cursor & cur);
 	/// set 'number' font property