X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=64cbb834c21bbf1ffc032920a1c6d65fbb349263;hb=b4e609bd691b326756e802bb16524bb837b5a10e;hp=3faccb8c59d0abb79413477a44ac868af69e832c;hpb=fa6ac23e1c96d3dd39128b827b675738f668e3a4;p=features.git

diff --git a/src/Text.h b/src/Text.h
index 3faccb8c59..64cbb834c2 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -19,14 +19,13 @@
 
 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;
@@ -35,8 +34,8 @@ 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.
@@ -246,6 +245,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.
@@ -259,7 +260,7 @@ public:
 	 settings are given to the new one.
 	 This function will handle a multi-paragraph selection.
 	 */
-	void setParagraphs(Cursor const & 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 const & cur, ParagraphParameters const & p);
 
@@ -309,6 +310,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