#ifndef MATH_DATA_H
#define MATH_DATA_H
-#include "Dimension.h"
-
#include "MathAtom.h"
-#include "MathRow.h"
+#include "MathClass.h"
+#include "Dimension.h"
#include "OutputEnums.h"
#include "support/strfwd.h"
#include <cstddef>
#include <vector>
-#include <map>
namespace lyx {
class Buffer;
class BufferView;
class Cursor;
+class Dimension;
class DocIterator;
+class InsetMathMacro;
class LaTeXFeatures;
-class ReplaceData;
class MacroContext;
-class InsetMathMacro;
+class MathRow;
class MetricsInfo;
class PainterInfo;
class ParIterator;
+class ReplaceData;
class TextMetricsInfo;
class TextPainter;
public:
///
- MathData(Buffer * buf = 0) : minasc_(0), mindes_(0), slevel_(0),
- sshift_(0), kerning_(0), buffer_(buf) {}
+ MathData() = default;
+ ///
+ explicit MathData(Buffer * buf) : buffer_(buf) {}
///
MathData(Buffer * buf, const_iterator from, const_iterator to);
///
/// Add this array to a math row. Return true if contents got added
bool addToMathRow(MathRow &, MetricsInfo & mi) const;
- // ascent of caret in this cell
- int caretAscent(BufferView const * bv) const;
- /// descent of caret in this cell
- int caretDescent(BufferView const * bv) const;
-
/// rebuild cached metrics information
/** When \c tight is true, the height of the cell will be at least
* the x height of the font. Otherwise, it will be the max height
void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
/// redraw cell using cache metrics information
void drawT(TextPainter & pi, int x, int y) const;
- /// approximate the math class of the data
+ /// approximate mathclass of the data
MathClass mathClass() const;
+ /// math class of first interesting element
+ MathClass firstMathClass() const;
+ /// math class of last interesting element
+ MathClass lastMathClass() const;
+ /// is the cell in display style
+ bool displayStyle() const { return display_style_; }
/// access to cached x coordinate of last drawing
int xo(BufferView const & bv) const;
/// additional super/subscript shift
int sshift() const { return sshift_; }
/// Italic correction as described in InsetMathScript.h
- int kerning(BufferView const *) const { return kerning_; }
+ int kerning(BufferView const *) const;
///
void swap(MathData & ar) { base_type::swap(ar); }
/// stay visually at the same position (cur==0 is allowed)
void updateMacros(Cursor * cur, MacroContext const & mc, UpdateType, int nesting);
///
- void updateBuffer(ParIterator const &, UpdateType);
+ void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
///
void setBuffer(Buffer & b);
protected:
/// cached values for super/subscript placement
- mutable int minasc_;
- mutable int mindes_;
- mutable int slevel_;
- mutable int sshift_;
- mutable int kerning_;
- Buffer * buffer_;
-
- /// cached object that describes typeset data
- mutable std::map<BufferView const *, MathRow> mrow_cache_;
+ mutable int minasc_ = 0;
+ mutable int mindes_ = 0;
+ mutable int slevel_ = 0;
+ mutable int sshift_ = 0;
+ /// cached value for display style
+ mutable bool display_style_ = false;
+ Buffer * buffer_ = nullptr;
private:
/// is this an exact match at this position?