X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_macrotemplate.h;h=405eeb331172e24ade293c1d44c44dfd69455dc3;hb=92d522b7f1be6046adcac062c558bbf0bf021612;hp=6552ac0b7e03e55446428c5d1bc60b5c3a061c4e;hpb=7f6bd7f12d1f084a3b7435b811ceb0020309c3cd;p=lyx.git

diff --git a/src/mathed/math_macrotemplate.h b/src/mathed/math_macrotemplate.h
index 6552ac0b7e..405eeb3311 100644
--- a/src/mathed/math_macrotemplate.h
+++ b/src/mathed/math_macrotemplate.h
@@ -1,67 +1,52 @@
 // -*- C++ -*-
-#ifndef MATHMACROTEMPLATE
-#define MATHMACROTEMPLATE
+#ifndef MATH_MACROTEMPLATE_H
+#define MATH_MACROTEMPLATE_H
 
-#include <vector>
+#include "math_nestinset.h"
+#include "LString.h"
 
-#include "math_parinset.h"
-#include "math_macroarg.h"
-
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 class MathMacro;
 
 /** This class contains the macro definition
-    \author Alejandro Aguilar Sierra
+ *  \author Alejandro Aguilar Sierra
+ *
+ * Full author contact details are available in file CREDITS
  */
-class MathMacroTemplate : public MathParInset {
+//class MathMacroTemplate : public MathInset, boost::noncopyable
+
+class MathMacroTemplate : public MathNestInset {
 public:
-	/// A template constructor needs all the data
-	explicit
-	MathMacroTemplate(string const &, int na = 0, int f = 0);
 	///
-	void draw(Painter &, int, int);
+	MathMacroTemplate();
 	///
-	void Metrics();
+	MathMacroTemplate(string const & name, int nargs,
+		MathArray const & = MathArray(), MathArray const & = MathArray());
 	///
-	void WriteDef(std::ostream &, bool fragile);
-	/// useful for special insets
-	void  setTCode(MathedTextCodes t);
+	explicit MathMacroTemplate(std::istream & is);
 	///
-	MathedTextCodes getTCode() const;
-	/// 
-	void setArgument(MathedArray *, int i= 0);
-	/// Number of arguments
-	int getNoArgs() const;
+	InsetBase * clone() const;
 	///
-	void GetMacroXY(int, int &, int &) const;
+	void write(WriteStream & os) const;
+	/// Number of arguments
+	int numargs() const;
 	///
-	MathParInset * getMacroPar(int) const;
+	void numargs(int);
 	///
-	void SetMacroFocus(int &, int, int);
+	string name() const;
 	///
-	void setEditMode(bool);
-	
-	/// Replace the appropriate arguments with a specific macro's data
-	void update(MathMacro * m = 0);
+	void draw(PainterInfo &, int x, int y) const;
 	///
-	short flags() const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
+	/// identifies macro templates
+	MathMacroTemplate * asMacroTemplate() { return this; }
+	/// identifies macro templates
+	MathMacroTemplate const * asMacroTemplate() const { return this; }
 private:
 	///
-	short flags_;
-	///
-	MathedTextCodes tcode_;
+	int numargs_;
 	///
-	std::vector<MathMacroArgument> args_;
-	///
-	int nargs_;
+	string name_;
 };
 
-
-inline
-short MathMacroTemplate::flags() const {
-	return flags_;
-}
 #endif