X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacro.h;h=276cbdb21f222fda328bce6d05e45f3524e537e8;hb=7ac601f4292412b289178fc3108ad9e715a7c221;hp=b8c91f4d0afc0192b01b7e5e25bc201739bd89b2;hpb=dc9081c208c604c8bb558cf0479281ac9d40d212;p=lyx.git

diff --git a/src/mathed/MathMacro.h b/src/mathed/MathMacro.h
index b8c91f4d0a..276cbdb21f 100644
--- a/src/mathed/MathMacro.h
+++ b/src/mathed/MathMacro.h
@@ -41,7 +41,7 @@ public:
 	///
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
-	int kerning() const;
+	int kerning(BufferView const * bv) const;
 	/// get cursor position
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
 		bool boundary, int & x, int & y) const;
@@ -139,28 +139,24 @@ protected:
 	/// including the optional ones (even if it can be empty here)
 	void attachArguments(std::vector<MathData> const & args, size_t arity, int optionals);
 	///
-	bool editing(BufferView * bv) { return editing_[bv]; }
-	///
 	MacroData const * macro() { return macro_; }
-
+	///
+	bool editMetrics(BufferView const * bv) const;
+	
 private:
 	///
 	virtual Inset * clone() const;
-	/// the index of the cursor slice of the macro, or -1 if it is not edited
-	int cursorIdx(Cursor const & cur) const;
 	///
-	bool editMode(Cursor const & cur) const;
+	bool editMode(BufferView const * bv) const;
 	
 	/// name of macro
 	docstring name_;
 	/// current display mode
 	DisplayMode displayMode_;
-	/// display mode before change
+	/// expanded macro with ArgumentProxies
 	InsetMathSqrt expanded_;
 	/// number of arguments that were really attached
 	size_t attachedArgsNum_;
-	/// cursor position during last draw
-	mutable std::map<BufferView const *, idx_type> previousCurIdx_;
 	/// optional argument attached? (only in DISPLAY_NORMAL mode)
 	size_t optionals_;
 	/// fold mode to be set in next metrics call?