X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=38ddad3502c314f36410d66c76965e567d4ce467;hb=bed546d6f6aab7c32ef51d61edd120e18089da53;hp=efce063c5081ad62f5994ffa123ebb7cde4f6abd;hpb=22de5c972a4e3432f09d8195ac41c77153f04770;p=lyx.git

diff --git a/src/Cursor.h b/src/Cursor.h
index efce063c50..38ddad3502 100644
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -129,6 +129,12 @@ public:
 	void setSelection(DocIterator const & where, int n);
 	///
 	void clearSelection();
+	/// check whether selection contains specific type of inset
+	/// returns 0 if no selection was made
+	bool insetInSelection(InsetCode const & inset);
+	/// count occurences of specific inset type in the selection
+	/// returns 0 if no selection was made
+	int countInsetsInSelection(InsetCode const & inset);
 
 	/// access to normalized selection anchor
 	CursorSlice normalAnchor() const;
@@ -165,15 +171,11 @@ public:
 	/// Repopulate the slices insets from bottom to top. Useful
 	/// for stable iterators or Undo data.
 	void sanitize();
-	///
-	bool isInside(Inset const *) const;
-	/// make sure we are outside of given inset
-	void leaveInset(Inset const & inset);
 
 	///
-	bool textUndo();
+	bool undoAction();
 	///
-	bool textRedo();
+	bool redoAction();
 
 	/// makes sure the next operation will be stored
 	void finishUndo() const;
@@ -239,9 +241,10 @@ private:
 
 	// FIXME: make them private
 public:
-	/// the current font settings
+	/// The current font settings. This holds the settings for output.
 	Font current_font;
-	/// the current font
+	/// The current display font. This holds the settings of the text
+	/// in the workarea.
 	Font real_current_font;
 };
 
@@ -257,6 +260,10 @@ public:
 	void push(Inset & inset);
 	/// add a new cursor slice, place cursor at front (move backwards)
 	void pushBackward(Inset & inset);
+	/// try to put cursor in inset before it in entry cell, or next one
+	/// if it is not empty, or exit the slice if there is no next one.
+	void editInsertedInset();
+
 	/// pop one level off the cursor
 	void pop();
 	/// pop one slice off the cursor stack and go backwards
@@ -515,13 +522,9 @@ public:
 	/// the name of the macro we are currently inputting
 	docstring macroName();
 
-
 	/// replace selected stuff with at, placing the former
 	// selection in entry cell of atom
 	void handleNest(MathAtom const & at);
-	/// replace selected stuff with at, placing the former
-	// selection in given cell of atom
-	void handleNest(MathAtom const & at, int cell);
 
 	/// make sure cursor position is valid
 	/// FIXME: It does a subset of fixIfBroken. Maybe merge them?