X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathNest.h;h=a503fb96db3563c7ce2f527c5ba8985db940ec35;hb=2c5c2a66833a0c2aefdfdb8f465a83a912e40e4b;hp=7e2b7a40a869b89496707beb55c6206fd32c63f0;hpb=2f67f8c2b3feba92aab8401fc176a45824ae71f2;p=lyx.git

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 7e2b7a40a8..a503fb96db 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.
  */
@@ -14,33 +14,9 @@
 
 #include "InsetMath.h"
 
-namespace lyx {
-
-class MathCompletionList : public Inset::CompletionList {
-public:
-	///
-	MathCompletionList(Cursor const & cur);
-	///
-	virtual ~MathCompletionList();
+#include <map>
 
-	///
-	virtual bool sorted() const { return false; }
-	///
-	virtual size_t size() const;
-	///
-	virtual docstring const & data(size_t idx) const;
-	///
-	virtual std::string icon(size_t idx) const;
-
-	///
-	static void addToFavorites(docstring const & completion);
-
-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,9 +26,11 @@ 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!
@@ -64,6 +42,8 @@ public:
 	/// 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
@@ -101,9 +81,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,11 +108,12 @@ public:
 	/// writes [, name(), and args in []
 	void normalize(NormalStream & os) const;
 	///
-	int latex(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;
@@ -150,6 +131,8 @@ 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; }
 
 protected:
 	///
@@ -172,21 +155,21 @@ protected:
 	/// 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,
-		docstring const & arg = docstring());
+	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
@@ -211,8 +194,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_;
+};