tex2lyx: support for \item with opt arg in itemize environment

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

diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index fa2dc9dfa6dd294ae2524cce1ef68cf33d157b76..e2169416d60ab4281a486ce892917df9c19567d7 100644 (file)
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -18,8 +18,11 @@
 #include "Dimension.h"
 #include "MathAtom.h"
 
+#include "OutputEnums.h"
+
 #include "support/strfwd.h"
 
+#include <cstddef>
 #include <vector>
 
 
@@ -35,6 +38,7 @@ class MacroContext;
 class MathMacro;
 class MetricsInfo;
 class PainterInfo;
+class ParIterator;
 class TextMetricsInfo;
 class TextPainter;
 
@@ -141,8 +145,8 @@ public:
        /// returns position of given x coordinate
        int pos2x(BufferView const * bv, size_type pos, int glue) const;
        /// returns position of given x coordinate
-       size_type x2pos(BufferView const * bv, int pos) const;
-       /// returns position of given x coordinate fstarting from a certain pos
+       size_type x2pos(BufferView const * bv, int targetx) const;
+       /// returns position of given x coordinate starting from a certain pos
        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
@@ -161,9 +165,11 @@ public:
        ///
        void swap(MathData & ar) { base_type::swap(ar); }
 
-       /// attach/detach arguments to macros, updating the cur to 
+       /// 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);
+       void updateMacros(Cursor * cur, MacroContext const & mc, UpdateType);
+       ///
+       void updateBuffer(ParIterator const &, UpdateType);
 
 protected:
        /// cached values for super/subscript placement
@@ -179,7 +185,7 @@ private:
        bool find1(MathData const & ar, size_type pos) const;
 
        ///
-       void detachMacroParameters(Cursor * cur, const size_type macroPos);
+       void detachMacroParameters(DocIterator * dit, const size_type macroPos);
        ///
        void attachMacroParameters(Cursor * cur, const size_type macroPos, 
                const size_type macroNumArgs, const int macroOptionals,