Fix.

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 05362ee2a0d4c9f3dba45159b08cca99cacefdc3..ac9f3c497c6d1aa1675d112c7041a4f9db481cdd 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -1,8 +1,8 @@
 // -*- C++ -*-
-/*
+/**
  *  File:        math_macro.h
- *  Purpose:     Declaration of macro class for mathed 
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
+ *  Purpose:     Declaration of macro class for mathed
+ *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *  Created:     November 1996
  *  Description: WYSIWYG math macros
  *
@@ -17,14 +17,9 @@
 #ifndef MATH_MACRO_H
 #define MATH_MACRO_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include <vector>
-#include <iosfwd>
 
 #include "math_nestinset.h"
+#include "math_metricsinfo.h"
 #include "math_macroarg.h"
 #include "LString.h"
 
@@ -32,7 +27,9 @@ class MathMacroTemplate;
 
 
 /** This class contains the data for a macro
-    \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+ *  \author Alejandro Aguilar Sierra
+ *
+ * Full author contact details are available in file CREDITS
     \version November 1996
  */
 class MathMacro : public MathNestInset {
@@ -42,46 +39,59 @@ public:
        ///
        MathMacro(MathMacro const &);
        ///
-       void draw(Painter &, int x, int y) const;
+       void draw(MathPainterInfo & pi, int x, int y) const;
        ///
-       void metrics(MathStyles st) const;
+       void metrics(MathMetricsInfo & mi) const;
        ///
        MathInset * clone() const;
        ///
-       void write(std::ostream &, bool fragile) const;
-       ///
-       void writeNormal(std::ostream &) const;
-       ///
        void dump() const;
 
        ///
-       bool idxUp(idx_type &, pos_type &) const;
+       bool idxUpDown(idx_type & idx, pos_type & pos, bool up, int targetx) const;
        ///
-       bool idxDown(idx_type &, pos_type &) const;
+       bool idxLeft(idx_type & idx, pos_type & pos) const;
        ///
-       bool idxLeft(idx_type &, pos_type &) const;
-       ///
-       bool idxRight(idx_type &, pos_type &) const;
+       bool idxRight(idx_type & idx, pos_type & pos) const;
 
        ///
        void validate(LaTeXFeatures &) const;
        ///
        bool isMacro() const { return true; }
+       ///
+       bool match(MathAtom const &) const { return false; }
+
+       ///
+       void maple(MapleStream &) const;
+       ///
+       void mathmlize(MathMLStream &) const;
+       ///
+       void octave(OctaveStream &) const;
+       ///
+       void infoize(std::ostream &) const;
+       ///
+       void infoize2(std::ostream &) const;
 
 private:
        ///
        void operator=(MathMacro const &);
        ///
-       char const * name() const;
-       ///
-       bool editing() const;
+       string name() const;
        ///
        bool defining() const;
+       ///
+       void updateExpansion() const;
+       ///
+       void expand() const;
 
        ///
        MathAtom & tmplate_;
        ///
-       mutable MathXArray expanded_;
+       mutable MathArray expanded_;
+       ///
+       mutable MathMetricsInfo mi_;
+       ///
+       mutable LyXFont font_;
 };