X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=9736981941b2b7d99c337ef195d85f512b344dcc;hb=a42f7ea7cd0e4d5d9594f363bce628451515d24b;hp=b54277beefa3069b5d676fc5cb94d934e5cfd9cd;hpb=20976e81fb25899ee8d3ec5ed941fda6b453f59f;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index b54277beef..9736981941 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.
@@ -109,6 +109,8 @@ 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.
@@ -169,10 +171,10 @@ 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);
-	/// 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 {
@@ -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 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 */
 
@@ -283,7 +287,7 @@ public:
 	/// FIXME: replace Cursor with DocIterator.
 	docstring getPossibleLabel(DocIterator const & cur) const;
 	/// is this paragraph right-to-left?
-	bool isRTL(Paragraph const & par) const;
+	bool isRTL(pit_type pit) const;
 
 	///
 	bool checkAndActivateInset(Cursor & cur, bool front);
@@ -299,15 +303,22 @@ public:
 
 	/// delete double spaces, leading spaces, and empty paragraphs around old cursor.
 	/// \retval true if a change has happened and we need a redraw.
-	/// FIXME: replace Cursor with DocIterator. This is not possible right
-	/// now because recordUndo() is called which needs a Cursor.
+	/// Handles undo.
 	static bool deleteEmptyParagraphMechanism(Cursor & cur,
 		Cursor & old, bool & need_anchor_change);
 
 	/// delete double spaces, leading spaces, and empty paragraphs
 	/// from \first to \last paragraph
+	/// 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
@@ -343,6 +354,8 @@ public:
 	/// 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 pit_offset) const;
+	/// Return the label type at the end of paragraph \c pit.
+	int getEndLabel(pit_type pit) const;
 
 private:
 	/// The InsetText owner shall have access to everything.
@@ -354,7 +367,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