X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathNest.h;h=51670a2c64ed48c98d1602c822185c4dc1eea87c;hb=5d7dae9e382f0b01800f5652e673e12fa6923740;hp=4e18dbda71e25d787945371e654213922e212474;hpb=5036ca8500368bfa5e445c2734834185b7d78978;p=lyx.git

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 4e18dbda71..51670a2c64 100644
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -13,9 +13,7 @@
 #define MATH_NESTINSET_H
 
 #include "InsetMath.h"
-
-// FIXME: remove
-#include "support/docstring.h"
+#include "MathData.h"
 
 #include <map>
 
@@ -35,16 +33,10 @@ public:
 	///
 	void setBuffer(Buffer &);
 
-	/// the size is usually some sort of convex hull of the cells
-	/// hides inset::metrics() intentionally!
-	void metrics(MetricsInfo const & mi) const;
+	/// Update the cells metrics
+	void cellsMetrics(MetricsInfo const & mi) const;
 	/// draw background if locked
 	void draw(PainterInfo & pi, int x, int y) const;
-	/// draw selection background
-	void drawSelection(PainterInfo & pi, int x, int y) const;
-	/// draw decorations.
-	void drawDecoration(PainterInfo & pi, int x, int y) const
-	{ drawMarkers(pi, x, y); }
 	///
 	void updateBuffer(ParIterator const &, UpdateType);
 	/// identifies NestInsets
@@ -55,7 +47,7 @@ public:
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
 		bool boundary, int & x, int & y) const;
 	///
-	void edit(Cursor & cur, bool front, 
+	void edit(Cursor & cur, bool front,
 		EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
@@ -137,6 +129,9 @@ public:
 	///
 	InsetCode lyxCode() const { return MATH_NEST_CODE; }
 
+	///
+	bool confirmDeletion() const { return nargs() > 0; }
+
 protected:
 	///
 	InsetMathNest(InsetMathNest const & inset);
@@ -172,7 +167,7 @@ public:
 	/// interpret \p str and insert the result at the current position of
 	/// \p cur if it is something known. Return whether \p cur was
 	/// inserted.
-	bool interpretString(Cursor & cur, docstring const & str);
+	virtual bool interpretString(Cursor & cur, docstring const & str);
 
 private:
 	/// lfun handler
@@ -185,9 +180,9 @@ private:
 	/// afterwards if found
 	bool findMacroToFoldUnfold(Cursor & searchCur, bool fold) const;
 	/// move cursor forward
-	bool cursorMathForward(Cursor & cur);
+	bool cursorMathForward(Cursor & cur, bool enter = true);
 	/// move cursor backwards
-	bool cursorMathBackward(Cursor & cur);
+	bool cursorMathBackward(Cursor & cur, bool enter = true);
 
 protected:
 	/// we store the cells in a vector