Improve the list of equations

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

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index ac95fbb35381ac7094c8ca1a5bd9a7b57e26e411..80f5f6d9d67f3a46f4f78a4f8a0ac20dac607e39 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,13 +29,21 @@ public:
        /// nestinsets have a fixed size to start with
        InsetMathNest(Buffer * buf, idx_type ncells);
        ///
-       virtual ~InsetMathNest() {}
+       virtual ~InsetMathNest();
        ///
        void setBuffer(Buffer &);
 
+       // The method below hides inset::metrics() intentionally!
+       // We have to tell clang not to be fussy about that.
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#endif
        /// the size is usually some sort of convex hull of the cells
-       /// hides inset::metrics() intentionally!
        void metrics(MetricsInfo const & mi) const;
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
        /// draw background if locked
        void draw(PainterInfo & pi, int x, int y) const;
        /// draw selection background
@@ -44,7 +52,7 @@ public:
        void drawDecoration(PainterInfo & pi, int x, int y) const
        { drawMarkers(pi, x, y); }
        ///
-       void updateLabels(ParIterator const &, UpdateType);
+       void updateBuffer(ParIterator const &, UpdateType);
        /// identifies NestInsets
        InsetMathNest * asNestInset() { return this; }
        /// identifies NestInsets
@@ -109,11 +117,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;
@@ -169,7 +178,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 +191,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 +203,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_;
+};