X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathNest.h;h=51670a2c64ed48c98d1602c822185c4dc1eea87c;hb=a48581f48c93b3981ffd3e058f57e3ed95b53641;hp=fab9f8d9ab8ee34e02b29404a2c40ca8d50491b0;hpb=c3bdbe38d7969a4ce4447bd3003c8657341d6843;p=lyx.git

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index fab9f8d9ab..51670a2c64 100644
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,34 +13,11 @@
 #define MATH_NESTINSET_H
 
 #include "InsetMath.h"
+#include "MathData.h"
 
-namespace lyx {
-
-class MathCompletionList : public Inset::CompletionList {
-public:
-	///
-	MathCompletionList(Cursor const & cur);
-	///
-	virtual ~MathCompletionList();
-
-	///
-	virtual bool sorted() const { return false; }
-	///
-	virtual size_t size() const;
-	///
-	virtual docstring data(size_t idx) const;
-	///
-	virtual std::string icon(size_t idx) const;
-
-	///
-	static void addToFavorites(docstring const & completion);
+#include <map>
 
-private:
-	///
-	static std::vector<docstring> globals;
-	///
-	std::vector<docstring> locals;
-};
+namespace lyx {
 
 /** Abstract base class for all math objects that contain nested items.
     This is basically everything that is not a single character or a
@@ -50,20 +27,18 @@ private:
 class InsetMathNest : public InsetMath {
 public:
 	/// nestinsets have a fixed size to start with
-	explicit InsetMathNest(idx_type ncells);
+	InsetMathNest(Buffer * buf, idx_type ncells);
+	///
+	virtual ~InsetMathNest();
 	///
-	virtual ~InsetMathNest() {}
+	void setBuffer(Buffer &);
 
-	/// the size is usually some sort of convex hull of the cells
-	/// hides inset::metrics() intentionally!
-	void metrics(MetricsInfo const & mi) const;
+	/// Update the cells metrics
+	void cellsMetrics(MetricsInfo const & mi) const;
 	/// draw background if locked
 	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); }
+	///
+	void updateBuffer(ParIterator const &, UpdateType);
 	/// identifies NestInsets
 	InsetMathNest * asNestInset() { return this; }
 	/// identifies NestInsets
@@ -72,7 +47,7 @@ public:
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
 		bool boundary, int & x, int & y) const;
 	///
-	void edit(Cursor & cur, bool front, 
+	void edit(Cursor & cur, bool front,
 		EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
@@ -101,9 +76,9 @@ public:
 	/// get notification when the cursor leaves this inset
 	bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
 
-	/// direct access to the cell.
-	/// inlined because shows in profile.
 	//@{
+	/// direct access to the cell.
+	/// Inlined because of performance reasons.
 	MathData & cell(idx_type i) { return cells_[i]; }
 	MathData const & cell(idx_type i) const { return cells_[i]; }
 	//@}
@@ -128,12 +103,12 @@ public:
 	/// writes [, name(), and args in []
 	void normalize(NormalStream & os) const;
 	///
-	int latex(Buffer const &, odocstream & os,
-			OutputParams const & runparams) const;
+	void latex(otexstream & os, OutputParams const & runparams) const;
 	///
-	bool setMouseHover(bool mouse_hover);
+	bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
 	///
-	bool mouseHovered() const { return mouse_hover_; }
+	bool mouseHovered(BufferView const * bv) const 
+		{ return mouse_hover_[bv]; }
 
 	///
 	bool completionSupported(Cursor const &) const;
@@ -151,6 +126,11 @@ public:
 	bool insertCompletion(Cursor & cur, docstring const & s, bool finished);
 	///
 	void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
+	///
+	InsetCode lyxCode() const { return MATH_NEST_CODE; }
+
+	///
+	bool confirmDeletion() const { return nargs() > 0; }
 
 protected:
 	///
@@ -170,19 +150,24 @@ protected:
 		docstring const & arg, char const * const font);
 	///
 	void handleFont2(Cursor & cur, docstring const & arg);
+	/// Grab and erase selection and insert the InsetMathNest atom in every
+	/// previously selected cell, insert the grabbed former data and \c arg
+	/// in the first cell of the inserted atom.
+	void handleNest(Cursor & cur, MathAtom const & nest);
+	void handleNest(Cursor & cur, MathAtom const & nest, 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(Cursor & cur, char_type c);
 	///
-	bool script(Cursor & cur, bool,
-		docstring const & save_selection = docstring());
+	bool script(Cursor & cur, bool);
+	bool script(Cursor & cur, bool, docstring const & save_selection);
 
 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(Cursor & cur, docstring const & str);
+	virtual bool interpretString(Cursor & cur, docstring const & str);
 
 private:
 	/// lfun handler
@@ -195,9 +180,9 @@ private:
 	/// afterwards if found
 	bool findMacroToFoldUnfold(Cursor & searchCur, bool fold) const;
 	/// move cursor forward
-	bool cursorMathForward(Cursor & cur);
+	bool cursorMathForward(Cursor & cur, bool enter = true);
 	/// move cursor backwards
-	bool cursorMathBackward(Cursor & cur);
+	bool cursorMathBackward(Cursor & cur, bool enter = true);
 
 protected:
 	/// we store the cells in a vector
@@ -207,8 +192,8 @@ protected:
 	/// if the inset is locked, it can't be entered with the cursor
 	bool lock_;
 	///
-	bool mouse_hover_;
-};
+	mutable std::map<BufferView const *, bool> mouse_hover_;
+};