Replace LString.h with support/std_string.h,

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 17aeb7cbf999afa6bdc1782c9e29b3ce485dd881..5f356d861a31f8c2d2894ee10ffdd45a80cc1616 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -1,38 +1,28 @@
 // -*- C++ -*-
-/*
- *  File:        math_macro.h
- *  Purpose:     Declaration of macro class for mathed
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *  Created:     November 1996
- *  Description: WYSIWYG math macros
+/**
+ * \file math_macro.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  Dependencies: Math
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
  *
- *  Copyright: 1996, 1997 Alejandro Aguilar Sierra
- *
- *   Version: 0.2, Math & Lyx project.
- *
- *   This code is under the GNU General Public Licence version 2 or later.
+ * Full author contact details are available in file CREDITS.
  */
+
 #ifndef MATH_MACRO_H
 #define MATH_MACRO_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "math_nestinset.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
 #include "math_macroarg.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class MathMacroTemplate;
 
 
-/** This class contains the data for a macro
-    \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
-    \version November 1996
- */
+/// This class contains the data for a macro.
 class MathMacro : public MathNestInset {
 public:
        /// A macro can be built from an existing template
@@ -40,11 +30,11 @@ public:
        ///
        MathMacro(MathMacro const &);
        ///
-       void draw(MathPainterInfo &, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       void metrics(MathMetricsInfo & st) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        void dump() const;
 
@@ -60,18 +50,18 @@ public:
        ///
        bool isMacro() const { return true; }
        ///
-       bool match(MathInset *) const { return false; }
+       bool match(MathAtom const &) const { return false; }
 
        ///
-       void normalize(NormalStream &) const;
-       ///
-       void maplize(MapleStream &) const;
+       void maple(MapleStream &) const;
        ///
        void mathmlize(MathMLStream &) const;
        ///
-       void octavize(OctaveStream &) const;
+       void octave(OctaveStream &) const;
+       ///
+       void infoize(std::ostream &) const;
        ///
-       void write(WriteStream & os) const;
+       void infoize2(std::ostream &) const;
 
 private:
        ///
@@ -88,9 +78,9 @@ private:
        ///
        MathAtom & tmplate_;
        ///
-       mutable MathXArray expanded_;
+       mutable MathArray expanded_;
        ///
-       mutable MathMetricsInfo mi_;
+       mutable MetricsInfo mi_;
        ///
        mutable LyXFont font_;
 };