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

diff --git a/src/mathed/MathMacro.h b/src/mathed/MathMacro.h
index 48acb298cf..276cbdb21f 100644
--- a/src/mathed/MathMacro.h
+++ b/src/mathed/MathMacro.h
@@ -18,8 +18,9 @@
 #include "MacroTable.h"
 #include "MathData.h"
 
-namespace lyx {
+#include <map>
 
+namespace lyx {
 
 /// This class contains the data for a macro.
 class MathMacro : public InsetMathNest {
@@ -40,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;
@@ -49,24 +50,24 @@ public:
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
 
-	/// target pos when we enter the inset from the left by pressing "Right"
+	/// target pos when we enter the inset while moving forward
 	bool idxFirst(Cursor &) const;
-	/// target pos when we enter the inset from the right by pressing "Left"
+	/// target pos when we enter the inset while moving backwards
 	bool idxLast(Cursor &) const;
 
 	///
 	virtual bool notifyCursorLeaves(Cursor &);
 	
 	/// Remove cell (starting from 0)
-	void removeArgument(size_t pos);
+	void removeArgument(pos_type pos);
 	/// Insert empty cell (starting from 0)
-	void insertArgument(size_t pos);
+	void insertArgument(pos_type pos);
 
 	///
 	void validate(LaTeXFeatures &) const;
 
 	///
-	void MathMacro::write(WriteStream & os) const;
+	void write(WriteStream & os) const;
 	///
 	void maple(MapleStream &) const;
 	///
@@ -87,6 +88,7 @@ public:
 		
 	enum DisplayMode {
 		DISPLAY_INIT,
+		DISPLAY_INTERACTIVE_INIT,
 		DISPLAY_UNFOLDED,
 		DISPLAY_NORMAL,
 	};
@@ -97,7 +99,6 @@ public:
 	///
 	bool extraBraces() const { return displayMode_ == DISPLAY_NORMAL && arity() > 0; }
 
-	
 	///
 	docstring name() const;
 	///
@@ -111,7 +112,7 @@ public:
 	}
 		
 	///
-	int optionals() const { return optionals_; }
+	size_t optionals() const { return optionals_; }
 	///
 	void setOptionals(int n) { 
 		if (n <= int(nargs()))
@@ -121,15 +122,16 @@ public:
 protected:
 	friend class MathData;
 	friend class ArgumentProxy;
+	friend class Cursor;
 
 	/// update the display mode (should only be called after detaching arguments)
 	void setDisplayMode(DisplayMode mode);
 	/// compute the next display mode
-	DisplayMode computeDisplayMode(MetricsInfo const & mi) const;
+	DisplayMode computeDisplayMode() const;
 	/// update macro definition
-	void updateMacro(MetricsInfo & mi);
+	void updateMacro(MacroContext const & mc);
 	/// check if macro definition changed, argument changed etc. and adapt
-	void updateRepresentation(MetricsInfo & mi);
+	void updateRepresentation(Cursor const * bvCur);
 	/// empty macro, put arguments into args, possibly strip arity-attachedArgsNum_ empty ones.
 	/// Includes the optional arguments.
 	void detachArguments(std::vector<MathData> & args, bool strip);
@@ -137,30 +139,26 @@ 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() { return editing_; }
-	///
 	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
-	int previousCurIdx_;
 	/// optional argument attached? (only in DISPLAY_NORMAL mode)
-	int optionals_;
+	size_t optionals_;
 	/// fold mode to be set in next metrics call?
 	bool nextFoldMode_;
 	/// if macro_ == true, then here is a copy of the macro
@@ -170,7 +168,7 @@ private:
 	/// this might invalidate after metrics was called
 	MacroData const * macro_;
 	///
-	bool editing_;
+	mutable std::map<BufferView const *, bool> editing_;
 	///
 	std::string requires_;
 	/// update macro representation