#include "Dimension.h"
#include "MathAtom.h"
+#include "OutputEnums.h"
+
#include "support/strfwd.h"
+#include <cstddef>
#include <vector>
class MathMacro;
class MetricsInfo;
class PainterInfo;
+class ParIterator;
class TextMetricsInfo;
class TextPainter;
public:
///
- MathData(Buffer * buf = 0) : buffer_(buf) {}
+ MathData(Buffer * buf = 0) : minasc_(0), mindes_(0), slevel_(0),
+ sshift_(0), kerning_(0), buffer_(buf) {}
///
MathData(Buffer * buf, const_iterator from, const_iterator to);
///
/// returns x coordinate of given position in the array
int pos2x(BufferView const * bv, size_type pos) const;
/// 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, int glue) const;
+ size_type x2pos(BufferView const * bv, int targetx) 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;
///
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
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,