X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathData.h;h=6f92852a0171ddb77039c82b7e6f7961be512b6f;hb=f6d505c1ee494ab0d30eebba86082c86a915e1df;hp=d44455a0a313e3ea2f09adb1be59b0d3ffe7a3e9;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index d44455a0a3..6f92852a01 100644
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -18,13 +18,17 @@
 #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;
@@ -34,6 +38,7 @@ class MacroContext;
 class MathMacro;
 class MetricsInfo;
 class PainterInfo;
+class ParIterator;
 class TextMetricsInfo;
 class TextPainter;
 
@@ -61,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);
 
@@ -158,7 +167,9 @@ public:
 
 	/// 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
@@ -167,13 +178,14 @@ 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;
 
 	///
-	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,