Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index d2730aeb48d55a04d2fae80665e3b8d6e18b236f..6f92852a0171ddb77039c82b7e6f7961be512b6f 100644 (file)
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -5,8 +5,8 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
- * \author Lars Gullik Bjønnes
+ * \author André Pönitz
+ * \author Lars Gullik Bjønnes
  * \author Stefan Schimanski
  *
  * Full author contact details are available in file CREDITS.
@@ -18,20 +18,27 @@
 #include "Dimension.h"
 #include "MathAtom.h"
 
+#include "OutputEnums.h"
+
 #include "support/strfwd.h"
 
+#include <cstddef>
 #include <vector>
 
 
 namespace lyx {
 
+class Buffer;
 class BufferView;
 class Cursor;
+class DocIterator;
 class LaTeXFeatures;
 class ReplaceData;
+class MacroContext;
 class MathMacro;
 class MetricsInfo;
 class PainterInfo;
+class ParIterator;
 class TextMetricsInfo;
 class TextPainter;
 
@@ -59,9 +66,13 @@ public:
 
 public:
        ///
-       MathData() {}
+       MathData(Buffer * buf = 0) : buffer_(buf) {}
+       ///
+       MathData(Buffer * buf, const_iterator from, const_iterator to);
+       ///
+       Buffer * buffer() { return buffer_; }
        ///
-       MathData(const_iterator from, const_iterator to);
+       Buffer const * buffer() const { return buffer_; }
        ///
        void append(MathData const & ar);
 
@@ -130,13 +141,13 @@ public:
        /// write access to coordinate;
        void setXY(BufferView & bv, int x, int y) const;
        /// returns x coordinate of given position in the array
-       int pos2x(size_type pos) const;
+       int pos2x(BufferView const * bv, size_type pos) const;
        /// returns position of given x coordinate
-       int pos2x(size_type pos, int glue) const;
+       int pos2x(BufferView const * bv, size_type pos, int glue) const;
        /// returns position of given x coordinate
-       size_type x2pos(int pos) const;
+       size_type x2pos(BufferView const * bv, int pos) const;
        /// returns position of given x coordinate fstarting from a certain pos
-       size_type x2pos(int targetx, int glue) const;
+       size_type x2pos(BufferView const * bv, int targetx, int glue) const;
        /// returns distance of this cell to the point given by x and y
        // assumes valid position and size cache
        int dist(BufferView const & bv, int x, int y) const;
@@ -150,10 +161,16 @@ public:
        /// additional super/subscript shift
        int sshift() const { return sshift_; }
        /// superscript kerning
-       int kerning() const { return kerning_; }
+       int kerning(BufferView const *) const { return kerning_; }
        ///
        void swap(MathData & ar) { base_type::swap(ar); }
 
+       /// attach/detach arguments to macros, updating the cur to 
+       /// stay visually at the same position (cur==0 is allowed)
+       void updateMacros(Cursor * cur, MacroContext const & mc, UpdateType);
+       ///
+       void updateBuffer(ParIterator const &, UpdateType);
+
 protected:
        /// cached values for super/subscript placement
        mutable int minasc_;
@@ -161,30 +178,30 @@ protected:
        mutable int slevel_;
        mutable int sshift_;
        mutable int kerning_;
-       
+       Buffer * buffer_;
+
 private:
        /// is this an exact match at this position?
        bool find1(MathData const & ar, size_type pos) const;
 
-       /// attach/detach arguments to macros
-       void updateMacros(MetricsInfo & mi);
        ///
-       void detachMacroParameters(Cursor & cur, const size_type macroPos);
+       void detachMacroParameters(DocIterator * dit, const size_type macroPos);
        ///
-       void attachMacroParameters(Cursor & cur, const size_type macroPos, 
+       void attachMacroParameters(Cursor * cur, const size_type macroPos, 
                const size_type macroNumArgs, const int macroOptionals,
-               const bool fromInitToNormalMode, const bool greedy);
+               const bool fromInitToNormalMode, const bool interactiveInit,
+               const size_t appetite);
        ///
-       void collectOptionalParameters(Cursor & cur, 
+       void collectOptionalParameters(Cursor * cur, 
                const size_type numOptionalParams, std::vector<MathData> & params, 
-               size_t & pos, const pos_type macroPos, const int thisPos, const int thisSlice);
-       ///
-       void collectParameters(Cursor & cur, 
-               const size_type numParams, std::vector<MathData> & params, 
                size_t & pos, MathAtom & scriptToPutAround,
                const pos_type macroPos, const int thisPos, const int thisSlice);
        ///
-       mutable std::vector<Dimension> atom_dims_;
+       void collectParameters(Cursor * cur, 
+               const size_type numParams, std::vector<MathData> & params, 
+               size_t & pos, MathAtom & scriptToPutAround,
+               const pos_type macroPos, const int thisPos, const int thisSlice,
+               const size_t appetite);
 };
 
 ///