X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathNest.h;h=3e8e1a7087904a898e6504930d9fc5dae39eea67;hb=58ab972f714309aa87e7d956ceda00e18337875f;hp=4810bf16ce3984e8a517ca286df6279335c092f1;hpb=8b67659646c6850377cb9f44a2a0a22c0e80840c;p=lyx.git

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 4810bf16ce..3e8e1a7087 100644
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -12,7 +12,10 @@
 #ifndef MATH_NESTINSET_H
 #define MATH_NESTINSET_H
 
-#include "InsetMathDim.h"
+#include "InsetMath.h"
+
+
+namespace lyx {
 
 
 /** Abstract base class for all math objects that contain nested items.
@@ -20,10 +23,12 @@
     single symbol.
 */
 
-class InsetMathNest : public InsetMathDim {
+class InsetMathNest : public InsetMath {
 public:
 	/// nestinsets have a fixed size to start with
 	explicit InsetMathNest(idx_type ncells);
+	///
+	virtual ~InsetMathNest() {}
 
 	/// the size is usually some sort of convex hull of the cells
 	/// hides inset::metrics() intentionally!
@@ -32,6 +37,9 @@ public:
 	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); }
 	/// identifies NestInsets
 	InsetMathNest * asNestInset() { return this; }
 	/// identifies NestInsets
@@ -40,24 +48,24 @@ public:
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
 		bool boundary, int & x, int & y) const;
 	///
-	void edit(LCursor & cur, bool left);
+	void edit(Cursor & cur, bool left);
 	///
-	InsetBase * editXY(LCursor & cur, int x, int y);
+	Inset * editXY(Cursor & cur, int x, int y);
 
 	/// order of movement through the cells when pressing the left key
-	bool idxLeft(LCursor &) const;
+	bool idxLeft(Cursor &) const;
 	/// order of movement through the cells when pressing the right key
-	bool idxRight(LCursor &) const;
+	bool idxRight(Cursor &) const;
 
 	/// move one physical cell up
-	bool idxNext(LCursor &) const;
+	bool idxNext(Cursor &) const;
 	/// move one physical cell down
-	bool idxPrev(LCursor &) const;
+	bool idxPrev(Cursor &) const;
 
 	/// target pos when we enter the inset from the left by pressing "Right"
-	bool idxFirst(LCursor &) const;
+	bool idxFirst(Cursor &) const;
 	/// target pos when we enter the inset from the right by pressing "Left"
-	bool idxLast(LCursor &) const;
+	bool idxLast(Cursor &) const;
 
 	/// number of cells currently governed by us
 	idx_type nargs() const;
@@ -66,12 +74,14 @@ public:
 	/// access to the lock
 	void lock(bool);
 	/// get notification when the cursor leaves this inset
-	bool notifyCursorLeaves(LCursor & cur);
+	bool notifyCursorLeaves(Cursor & cur);
 
-	/// direct access to the cell
-	MathArray & cell(idx_type);
-	/// direct access to the cell
-	MathArray const & cell(idx_type) const;
+	/// direct access to the cell.
+	/// inlined because shows in profile.
+	//@{
+	MathData & cell(idx_type i) { return cells_[i]; }
+	MathData const & cell(idx_type i) const { return cells_[i]; }
+	//@}
 
 	/// can we move into this cell (see macroarg.h)
 	bool isActive() const;
@@ -81,9 +91,9 @@ public:
 	/// replace in all cells
 	void replace(ReplaceData &);
 	/// do we contain a given pattern?
-	bool contains(MathArray const &) const;
+	bool contains(MathData const &) const;
 	/// glue everything to a single cell
-	MathArray glue() const;
+	MathData glue() const;
 
 	/// debug helper
 	void dump() const;
@@ -93,49 +103,65 @@ public:
 	/// writes [, name(), and args in []
 	void normalize(NormalStream & os) const;
 	///
-	int latex(Buffer const &, lyx::odocstream & os,
+	int latex(Buffer const &, odocstream & os,
 			OutputParams const & runparams) const;
+	///
+	bool setMouseHover(bool mouse_hover);
+	///
+	bool mouseHovered() const { return mouse_hover_; }
 
 protected:
 	///
-	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+	InsetMathNest(InsetMathNest const & inset);
+	///
+	InsetMathNest & operator=(InsetMathNest const &);
+
+	///
+	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 	/// do we want to handle this event?
-	bool getStatus(LCursor & cur, FuncRequest const & cmd,
+	bool getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & status) const;
 	///
-	void handleFont(LCursor & cur,
-		std::string const & arg, std::string const & font);
+	void handleFont(Cursor & cur,
+		docstring const & arg, docstring const & font);
+	void handleFont(Cursor & cur,
+		docstring const & arg, char const * const font);
 	///
-	void handleFont2(LCursor & cur, std::string const & arg);
+	void handleFont2(Cursor & cur, docstring const & arg);
 
 	/// interpret \p c and insert the result at the current position of
 	/// of \p cur. Return whether the cursor should stay in the formula.
-	bool interpretChar(LCursor & cur, char c);
+	bool interpretChar(Cursor & cur, char_type c);
 	///
-	bool script(LCursor & cur, bool,
-		std::string const & save_selection = std::string());
+	bool script(Cursor & cur, bool,
+		docstring const & save_selection = docstring());
 
 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(LCursor & cur, std::string const & str);
+	bool interpretString(Cursor & cur, docstring const & str);
 
 private:
 	/// lfun handler
-	void lfunMousePress(LCursor &, FuncRequest &);
+	void lfunMousePress(Cursor &, FuncRequest &);
 	///
-	void lfunMouseRelease(LCursor &, FuncRequest &);
+	void lfunMouseRelease(Cursor &, FuncRequest &);
 	///
-	void lfunMouseMotion(LCursor &, FuncRequest &);
+	void lfunMouseMotion(Cursor &, FuncRequest &);
 
 protected:
 	/// we store the cells in a vector
-	typedef std::vector<MathArray> cells_type;
+	typedef std::vector<MathData> cells_type;
 	/// thusly:
 	cells_type cells_;
 	/// if the inset is locked, it can't be entered with the cursor
 	bool lock_;
+	///
+	bool mouse_hover_;
 };
 
+
+
+} // namespace lyx
 #endif