fix pullArg when pressing <Delete> at the end of an cell

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index f44ac9de5a132f85e9f7c275eb1eda116d02fdf5..f40f3df82905160247fc2608802b40bd47af02ed 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -6,23 +6,26 @@
  *  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_inset.h"
+#include "math_macroarg.h"
 
 class MathMacroTemplate;
 
@@ -31,71 +34,50 @@ class MathMacroTemplate;
     \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
     \version November 1996
  */
-class MathMacro : public MathParInset
-{
+class MathMacro : public MathInset {
 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(MathMacroTemplate const &);
        ///
-       ~MathMacro();
+       MathMacro(MathMacro const &);
        ///
        void draw(Painter &, int, int);
        ///
-       void Metrics();
-       ///
-       MathedInset * Clone();
-       ///
-       void Write(std::ostream &, bool fragile);
+       void Metrics(MathStyles st, int asc = 0, int des = 0);
        ///
-       bool setArgumentIdx(int);
+       MathInset * clone() const;
        ///
-       int getArgumentIdx() const;
+       void Write(std::ostream &, bool fragile) const;
        ///
-       int getMaxArgumentIdx() const;
+       void WriteNormal(std::ostream &) const;
        ///
-       int GetColumns() const;
-       ///
-       void GetXY(int &, int &) const;
-       ///
-       void SetFocus(int, int);
+       void dump(std::ostream & os) const;
+
        ///
-       MathedArray * GetData();
+       bool idxUp(int &, int &) const;
        ///
-       MathedRowSt * getRowSt() const;
+       bool idxDown(int &, int &) const;
        ///
-       void setData(MathedArray *);
+       bool idxLeft(int &, int &) const;
        ///
-       MathedTextCodes getTCode() const;
+       bool idxRight(int &, int &) const;
+
        ///
-       bool Permit(short) const;
+       void Validate(LaTeXFeatures &) 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), array(0)
-                       {}
-       };
-       std::vector<MacroArgumentBase> args_;
-       ///
-       int idx_;
+       MathMacroTemplate const * const tmplate_;
        ///
-       int nargs_;
+       MathXArray expanded_;
        ///
-       MathedTextCodes tcode_;
+       void operator=(MathMacro const &);
 };
+
+
+inline std::ostream & operator<<(std::ostream & os, MathMacro const & m)
+{
+       m.dump(os);
+       return os;
+}
 #endif