X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacro.h;h=c0a9c7d4c0386ed95ddd068d7ce27741a473e4cb;hb=58ab972f714309aa87e7d956ceda00e18337875f;hp=5d1428c7c0ee6c6a68669f0ff85ef8a307bd2d60;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/mathed/MathMacro.h b/src/mathed/MathMacro.h
index 5d1428c7c0..c0a9c7d4c0 100644
--- a/src/mathed/MathMacro.h
+++ b/src/mathed/MathMacro.h
@@ -37,7 +37,7 @@ public:
 	void drawDecoration(PainterInfo & pi, int x, int y) const
 	{ drawMarkers2(pi, x, y); }
 	///
-	bool metrics(MetricsInfo & mi, Dimension & dim) const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	/// get cursor position
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
 		bool boundary, int & x, int & y) const;
@@ -48,10 +48,14 @@ public:
 	/// target pos when we enter the inset from the right by pressing "Left"
 	bool idxLast(Cursor &) const;
 	///
+	bool idxUpDown(Cursor & cur, bool up) const;
+	///
 	virtual bool notifyCursorLeaves(Cursor &);
 	///
 	docstring name() const;
 	///
+	int kerning() const { return kerning_; }
+	///
 	void setExpansion(MathData const & exp, MathData const & args) const;
 
 	///
@@ -69,11 +73,9 @@ public:
 	void infoize2(odocstream &) const;
 
 private:
-	virtual std::auto_ptr<Inset> doClone() const;
+	virtual Inset * clone() const;
 	///
 	void updateExpansion() const;
-	///
-	void expand() const;
 
 	/// name of macro
 	docstring name_;
@@ -81,6 +83,12 @@ private:
 	mutable MathData tmpl_;
 	/// the macro substituted with our args
 	mutable MathData expanded_;
+	///
+	mutable MacroData macroBackup_;
+	///
+	mutable bool editing_;
+	///
+	mutable int kerning_;
 };