fix typo that put too many include paths for most people

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 3604468d585332ee4ece78fd00667940b1769f4d..ee8059c03dc7d6409ec93883d656b4de651e309c 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -1,28 +1,32 @@
 // -*- 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
  *
- *  Dependencies: Mathed
+ *  Dependencies: Math
  *
  *  Copyright: 1996, 1997 Alejandro Aguilar Sierra
  *
- *   Version: 0.2, Mathed & Lyx project.
+ *   Version: 0.2, Math & Lyx project.
  *
  *   This code is under the GNU General Public Licence version 2 or later.
  */
-#ifndef MATH_MACRO
-#define MATH_MACRO
+#ifndef MATH_MACRO_H
+#define MATH_MACRO_H
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include <vector>
-#include "math_parinset.h"
+#include <iosfwd>
+
+#include "math_nestinset.h"
+#include "math_macroarg.h"
+#include "LString.h"
 
 class MathMacroTemplate;
 
@@ -31,71 +35,67 @@ class MathMacroTemplate;
     \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
     \version November 1996
  */
-class MathMacro : public MathParInset
-{
+class MathMacro : public MathNestInset {
 public:
-       /// A macro can only be builded from an existing template
-       explicit
-       MathMacro(MathMacroTemplate *);
-       /// or from another macro.
-       explicit
-       MathMacro(MathMacro *);
+       /// A macro can be built from an existing template
+       explicit MathMacro(string const &);
        ///
-       ~MathMacro();
+       MathMacro(MathMacro const &);
        ///
-       void draw(Painter &, int, int);
+       void draw(Painter &, int x, int y) const;
        ///
-       void Metrics();
+       void metrics(MathMetricsInfo const & st) const;
        ///
-       MathedInset * Clone();
+       MathInset * clone() const;
        ///
-       void Write(std::ostream &, bool fragile);
+       void dump() const;
+
        ///
-       bool setArgumentIdx(int);
+       bool idxUpDown(idx_type &, bool up) const;
        ///
-       int getArgumentIdx() const;
+       bool idxLeft(idx_type &, pos_type &) const;
        ///
-       int getMaxArgumentIdx() const;
+       bool idxRight(idx_type &, pos_type &) const;
+
        ///
-       int GetColumns() const;
+       void validate(LaTeXFeatures &) const;
        ///
-       void GetXY(int &, int &) const;
+       bool isMacro() const { return true; }
        ///
-       void SetFocus(int, int);
+       bool match(MathInset *) const { return false; }
+
        ///
-       MathedArray & GetData();
+       void normalize(NormalStream &) const;
        ///
-       MathedRowSt * getRowSt() const;
+       void maplize(MapleStream &) const;
        ///
-       void setData(MathedArray const &);
+       void mathmlize(MathMLStream &) const;
        ///
-       MathedTextCodes getTCode() const;
+       void octavize(OctaveStream &) const;
        ///
-       bool Permit(short) const;
+       void write(WriteStream & os) const;
+
 private:
        ///
-       MathMacroTemplate * tmplate_;
-       ///
-       struct MacroArgumentBase {
-               /// Position of the macro
-               int x;
-               ///
-               int y;
-               ///
-               MathedRowSt * row;
-               ///
-               MathedArray array;
-               ///
-               MacroArgumentBase()
-                       : x(0), y(0), row(0)
-                       {}
-       };
-       std::vector<MacroArgumentBase> args_;
-       ///
-       int idx_;
-       ///
-       int nargs_;
-       ///
-       MathedTextCodes tcode_;
+       void operator=(MathMacro const &);
+       ///
+       char const * name() const;
+       ///
+       bool defining() const;
+       ///
+       void updateExpansion() const;
+       ///
+       void expand() const;
+
+       ///
+       MathAtom & tmplate_;
+       ///
+       mutable MathXArray expanded_;
+       ///
+       mutable MathMetricsInfo mi_;
+       ///
+       mutable LyXFont font_;
 };
+
+
 #endif