Linearize macros in box edit mode too.

[lyx.git] / src / mathed / InsetMathNest.h

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 49b90eb8b6e185d2009643f677d3191d8bee6220..51670a2c64ed48c98d1602c822185c4dc1eea87c 100644 (file)
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -13,9 +13,9 @@
 #define MATH_NESTINSET_H
 
 #include "InsetMath.h"
+#include "MathData.h"
 
-// FIXME: remove
-#include "support/docstring.h"
+#include <map>
 
 namespace lyx {
 
@@ -29,20 +29,14 @@ public:
        /// nestinsets have a fixed size to start with
        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
@@ -53,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);
@@ -109,11 +103,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;
@@ -134,6 +129,9 @@ public:
        ///
        InsetCode lyxCode() const { return MATH_NEST_CODE; }
 
+       ///
+       bool confirmDeletion() const { return nargs() > 0; }
+
 protected:
        ///
        InsetMathNest(InsetMathNest const & inset);
@@ -169,7 +167,7 @@ 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
@@ -182,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
@@ -194,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_;
+};