X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacro.h;h=b7308562ff2df2c26b58733081e78e2a3e8522e8;hb=58550435998be842c6aa996c1abdd318bd95cdba;hp=c09c1dd5315b3155c82b456d96ea7b2d02a4c2e7;hpb=cf15bd840b71a01ccbb2fbbbabc7066237b4bfd2;p=lyx.git

diff --git a/src/mathed/MathMacro.h b/src/mathed/MathMacro.h
index c09c1dd531..b7308562ff 100644
--- a/src/mathed/MathMacro.h
+++ b/src/mathed/MathMacro.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -26,7 +26,7 @@ namespace lyx {
 class MathMacro : public InsetMathNest {
 public:
 	/// A macro can be built from an existing template
-	MathMacro(docstring const & name);
+	MathMacro(Buffer * buf, docstring const & name);
 	///
 	virtual MathMacro * asMacro() { return this; }
 	///
@@ -69,10 +69,14 @@ public:
 	///
 	void write(WriteStream & os) const;
 	///
+	void normalize(NormalStream & os) const;
+	///
 	void maple(MapleStream &) const;
 	///
 	void mathmlize(MathStream &) const;
 	///
+	void htmlize(HtmlStream &) const;
+	///
 	void octave(OctaveStream &) const;
 	///
 	void infoize(odocstream &) const;
@@ -90,7 +94,7 @@ public:
 		DISPLAY_INIT,
 		DISPLAY_INTERACTIVE_INIT,
 		DISPLAY_UNFOLDED,
-		DISPLAY_NORMAL,
+		DISPLAY_NORMAL
 	};
 
 	///
@@ -120,6 +124,8 @@ public:
 	}
 	/// Return the maximal number of arguments the macro is greedy for.
 	size_t appetite() const { return appetite_; }
+	///
+	InsetCode lyxCode() const { return MATH_MACRO_CODE; }
 
 protected:
 	friend class MathData;
@@ -133,7 +139,7 @@ protected:
 	/// update macro definition
 	void updateMacro(MacroContext const & mc);
 	/// check if macro definition changed, argument changed etc. and adapt
-	void updateRepresentation();
+	void updateRepresentation(Cursor * cur, MacroContext const & mc, UpdateType);
 	/// empty macro, put arguments into args, possibly strip arity-attachedArgsNum_ empty ones.
 	/// Includes the optional arguments.
 	void detachArguments(std::vector<MathData> & args, bool strip);