Improve the list of equations

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

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 3d990b273921b63d579d9995f6e98be4b2cb5dbc..80f5f6d9d67f3a46f4f78a4f8a0ac20dac607e39 100644 (file)
--- 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,37 +13,12 @@
 #define MATH_NESTINSET_H
 
 #include "InsetMath.h"
+#include "MathData.h"
 
-#include <deque>
+#include <map>
 
 namespace lyx {
 
-class MathCompletionList : public Inset::CompletionList {
-public:
-       ///
-       MathCompletionList(Cursor const & cur);
-       ///
-       virtual ~MathCompletionList();
-
-       ///
-       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);
-
-private:
-       ///
-       static std::vector<docstring> globals;
-       ///
-       std::vector<docstring> locals;
-       ///
-       static std::deque<docstring> favorites;
-};
-
 /** Abstract base class for all math objects that contain nested items.
     This is basically everything that is not a single character or a
     single symbol.
@@ -52,13 +27,23 @@ 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 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
@@ -66,6 +51,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,11 +88,11 @@ public:
        /// access to the lock
        void lock(bool);
        /// get notification when the cursor leaves this inset
-       bool notifyCursorLeaves(Cursor & cur);
+       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]; }
        //@}
@@ -130,12 +117,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;
@@ -146,13 +133,15 @@ public:
        ///
        bool automaticPopupCompletion() const;
        ///
-       CompletionListPtr completionList(Cursor const & cur) const;
+       CompletionList const * createCompletionList(Cursor const & cur) const;
        ///
        docstring completionPrefix(Cursor const & cur) const;
        ///
        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,19 +161,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
@@ -197,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
@@ -209,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_;
+};