X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_nestinset.h;h=dda150a6dbd282394c9db5e78100b38163bc496e;hb=2c30e9b17afc036515a3d23fb657c4f55815d7c5;hp=72edfe48213ac96d0d7687086d8c89442467f823;hpb=1f9e9cf5173fa1fbafdff5f21080e5194b05818b;p=lyx.git

diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h
index 72edfe4821..dda150a6db 100644
--- a/src/mathed/math_nestinset.h
+++ b/src/mathed/math_nestinset.h
@@ -13,55 +13,50 @@
 #define MATH_NESTINSET_H
 
 #include "math_diminset.h"
-#include "math_data.h"
+
 
 /** Abstract base class for all math objects that contain nested items.
     This is basically everything that is not a single character or a
     single symbol.
 */
 
-
 class MathNestInset : public MathDimInset {
 public:
 	/// nestinsets have a fixed size to start with
 	explicit MathNestInset(idx_type ncells);
 
-	/// the size is usuall some sort of convex hull of the cells
+	/// the size is usually some sort of convex hull of the cells
 	/// hides inset::metrics() intentionally!
 	void metrics(MetricsInfo const & mi) const;
 	/// draw background if locked
 	void draw(PainterInfo & pi, int x, int y) const;
 	/// draw selection background
-	void drawSelection(PainterInfo & pi,
-		idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const;
-	/// appends itself with macro arguments substituted
-	void substitute(MathMacro const & macro);
+	void drawSelection(PainterInfo & pi, int x, int y) const;
 	/// identifies NestInsets
 	MathNestInset * asNestInset() { return this; }
 	/// identifies NestInsets
 	MathNestInset const * asNestInset() const { return this; }
 	/// get cursor position
-	void getPos(idx_type idx, pos_type pos, int & x, int & y) const;
+	void cursorPos(CursorSlice const & sl, bool boundary, int & x, int & y) const;
+	///
+	void edit(LCursor & cur, bool left);
+	///
+	InsetBase * editXY(LCursor & cur, int x, int y);
 
 	/// order of movement through the cells when pressing the left key
-	bool idxLeft(idx_type & idx, pos_type & pos) const;
+	bool idxLeft(LCursor &) const;
 	/// order of movement through the cells when pressing the right key
-	bool idxRight(idx_type & idx, pos_type & pos) const;
+	bool idxRight(LCursor &) const;
 
 	/// move one physical cell up
-	bool idxNext(idx_type & idx, pos_type & pos) const;
+	bool idxNext(LCursor &) const;
 	/// move one physical cell down
-	bool idxPrev(idx_type & idx, pos_type & pos) const;
+	bool idxPrev(LCursor &) const;
 
 	/// target pos when we enter the inset from the left by pressing "Right"
-	bool idxFirst(idx_type & idx, pos_type & pos) const;
+	bool idxFirst(LCursor &) const;
 	/// target pos when we enter the inset from the right by pressing "Left"
-	bool idxLast(idx_type & idx, pos_type & pos) const;
-
-	/// where should we go if we press home?
-	bool idxHome(idx_type & idx, pos_type & pos) const;
-	/// where should we go if we press end?
-	bool idxEnd(idx_type & idx, pos_type & pos) const;
+	bool idxLast(LCursor &) const;
 
 	/// number of cells currently governed by us
 	idx_type nargs() const;
@@ -70,7 +65,7 @@ public:
 	/// access to the lock
 	void lock(bool);
 	/// get notification when the cursor leaves this inset
-	void notifyCursorLeaves(idx_type);
+	void notifyCursorLeaves(LCursor & cur);
 
 	/// direct access to the cell
 	MathArray & cell(idx_type);
@@ -82,8 +77,6 @@ public:
 	/// request "external features"
 	void validate(LaTeXFeatures & features) const;
 
-	/// match in all cells
-	bool match(MathAtom const &) const;
 	/// replace in all cells
 	void replace(ReplaceData &);
 	/// do we contain a given pattern?
@@ -93,17 +86,40 @@ public:
 
 	/// debug helper
 	void dump() const;
-	/// is the cursor currently somewhere within this inset?
-	virtual bool editing() const;
 
 	/// writes \\, name(), and args in braces and '\\lyxlock' if necessary
 	void write(WriteStream & os) const;
 	/// writes [, name(), and args in []
 	void normalize(NormalStream & os) const;
+	///
+	int latex(Buffer const &, std::ostream & os,
+			OutputParams const & runparams) const;
 
-	/// local dispatcher
-	dispatch_result
-		dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+protected:
+	///
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+	/// do we want to handle this event?
+	bool getStatus(LCursor & cur, FuncRequest const & cmd,
+		FuncStatus & status) const;
+	///
+	void handleFont(LCursor & cur,
+		std::string const & arg, std::string const & font);
+	///
+	void handleFont2(LCursor & cur, std::string const & arg);
+
+	///
+	bool interpret(LCursor & cur, char c);
+	///
+	bool script(LCursor & cur, bool);
+
+
+private:
+	/// lfun handler
+	void lfunMousePress(LCursor &, FuncRequest &);
+	///
+	void lfunMouseRelease(LCursor &, FuncRequest &);
+	///
+	void lfunMouseMotion(LCursor &, FuncRequest &);
 
 protected:
 	/// we store the cells in a vector
@@ -112,17 +128,8 @@ protected:
 	cells_type cells_;
 	/// if the inset is locked, it can't be entered with the cursor
 	bool lock_;
-
-	/// draw four angular markers
-	void drawMarkers(PainterInfo & pi, int x, int y) const;
-	/// draw two angular markers
-	void drawMarkers2(PainterInfo & pi, int x, int y) const;
-
-	/// add space for markers
-	void metricsMarkers(int frame = 1) const;
-	/// add space for markers
-	void metricsMarkers2(int frame = 1) const;
-
+	///
+	std::string safe_;
 };
 
 #endif