We only support gcc >= 4.9.

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

diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index 810223d5be970c9721c1169d9fe633bd428d717e..865742df4cb9603040cf5ec8456d3f9bdf54a585 100644 (file)
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -15,11 +15,10 @@
 #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"
@@ -33,14 +32,16 @@ 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;
 
@@ -68,8 +69,9 @@ public:
 
 public:
        ///
-       MathData(Buffer * buf = 0) : minasc_(0), mindes_(0), slevel_(0),
-                                    sshift_(0), buffer_(buf) {}
+       MathData() = default;
+       ///
+       explicit MathData(Buffer * buf) : buffer_(buf) {}
        ///
        MathData(Buffer * buf, const_iterator from, const_iterator to);
        ///
@@ -140,8 +142,14 @@ public:
        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;
@@ -178,17 +186,19 @@ public:
        /// 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_;
-       Buffer * buffer_;
+       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?