Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index f44ac9de5a132f85e9f7c275eb1eda116d02fdf5..2a3637578f4bf3f26b8b86ea8080d0de97065441 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -1,101 +1,68 @@
 // -*- 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: Mathed
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
  *
- *  Copyright: 1996, 1997 Alejandro Aguilar Sierra
- *
- *   Version: 0.2, Mathed & 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
-#define MATH_MACRO
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#ifndef MATH_MACRO_H
+#define MATH_MACRO_H
 
-#include <vector>
-#include "math_parinset.h"
+#include "math_nestinset.h"
+#include "math_data.h"
+#include "math_nestinset.h"
+#include "math_macrotable.h"
 
-class MathMacroTemplate;
 
-
-/** This class contains the data for a macro
-    \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
-    \version November 1996
- */
-class MathMacro : public MathParInset
-{
+/// This class contains the data for a macro.
+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 *);
-       ///
-       ~MathMacro();
-       ///
-       void draw(Painter &, int, int);
-       ///
-       void Metrics();
-       ///
-       MathedInset * Clone();
-       ///
-       void Write(std::ostream &, bool fragile);
+       /// A macro can be built from an existing template
+       MathMacro(std::string const & name, int numargs);
        ///
-       bool setArgumentIdx(int);
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       int getArgumentIdx() const;
+       void drawExpanded(PainterInfo & pi, int x, int y) const;
        ///
-       int getMaxArgumentIdx() const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       int GetColumns() const;
+       std::string name() const;
        ///
-       void GetXY(int &, int &) const;
+       void setExpansion(MathArray const & exp, MathArray const & args) const;
+
        ///
-       void SetFocus(int, int);
+       void validate(LaTeXFeatures &) const;
+
        ///
-       MathedArray * GetData();
+       void maple(MapleStream &) const;
        ///
-       MathedRowSt * getRowSt() const;
+       void mathmlize(MathMLStream &) const;
        ///
-       void setData(MathedArray *);
+       void octave(OctaveStream &) const;
        ///
-       MathedTextCodes getTCode() const;
+       void infoize(std::ostream &) const;
        ///
-       bool Permit(short) const;
+       void infoize2(std::ostream &) const;
+
 private:
+       virtual std::auto_ptr<InsetBase> doClone() const;
        ///
-       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_;
+       void updateExpansion() const;
        ///
-       int nargs_;
-       ///
-       MathedTextCodes tcode_;
+       void expand() const;
+
+       /// name of macro
+       std::string name_;
+       /// the unexpanded macro defintition
+       mutable MathArray tmpl_;
+       /// the matcro substituted with our args
+       mutable MathArray expanded_;
 };
+
+
 #endif