Replace LString.h with support/std_string.h,

[features.git] / src / mathed / math_macrotemplate.h

diff --git a/src/mathed/math_macrotemplate.h b/src/mathed/math_macrotemplate.h
index 324af9b11392ac3c6c6c11ef8ef45bc16c587008..97441accdd14ce559fb711151b9ee0035674d1ec 100644 (file)
--- a/src/mathed/math_macrotemplate.h
+++ b/src/mathed/math_macrotemplate.h
@@ -1,50 +1,61 @@
 // -*- C++ -*-
+/**
+ * \file math_macrotemplate.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_MACROTEMPLATE_H
 #define MATH_MACROTEMPLATE_H
 
-#include <set>
+#include "math_nestinset.h"
+#include "support/std_string.h"
 
-#include "math_inset.h"
-
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 class MathMacro;
 
-/** This class contains the macro definition
-    \author Alejandro Aguilar Sierra
- */
-//class MathMacroTemplate : public MathInset, boost::noncopyable 
+//class MathMacroTemplate : public MathInset, boost::noncopyable
 
-class MathMacroTemplate : public MathInset {
+/// This class contains the macro definition.
+class MathMacroTemplate : public MathNestInset {
 public:
        ///
        MathMacroTemplate();
        ///
-       MathMacroTemplate(string const & name, int nargs);
+       MathMacroTemplate(string const & name, int nargs, string const & type,
+               MathArray const & = MathArray(), MathArray const & = MathArray());
+       ///
+       explicit MathMacroTemplate(std::istream & is);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       void Write(std::ostream &, bool fragile) const;
+       void write(WriteStream & os) const;
        /// Number of arguments
        int numargs() const;
        ///
        void numargs(int);
        ///
-       void draw(Painter &, int, int);
+       string name() const;
        ///
-       void Metrics(MathStyles st, int asc = 0, int des = 0);
+       void draw(PainterInfo &, int x, int y) 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:
        ///
        int numargs_;
        ///
-       std::set<MathMacro *> users_;
-
-       /// unimplemented
-       void operator=(MathMacroTemplate const &);
-       /// unimplemented
-       //MathMacroTemplate(MathMacroTemplate const &);
+       string name_;
+       /// newcommand or renewcommand or def
+       string type_;
 };
 
 #endif