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 9a944f5fc524cbd824473e6bc7412d0bf594958a..2a3637578f4bf3f26b8b86ea8080d0de97065441 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -1,94 +1,67 @@
 // -*- 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 "math_macroarg.h"
-#include "LString.h"
-
-class MathMacroTemplate;
+#include "math_data.h"
+#include "math_nestinset.h"
+#include "math_macrotable.h"
 
 
-/** 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
-       explicit MathMacro(string const &);
-       ///
-       MathMacro(MathMacro const &);
+       MathMacro(std::string const & name, int numargs);
        ///
-       void draw(MathPainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       void metrics(MathMetricsInfo & mi) const;
-       ///
-       MathInset * clone() const;
-       ///
-       void dump() const;
-
+       void drawExpanded(PainterInfo & pi, int x, int y) const;
        ///
-       bool idxUpDown(idx_type & idx, pos_type & pos, bool up, int targetx) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       bool idxLeft(idx_type & idx, pos_type & pos) const;
+       std::string name() const;
        ///
-       bool idxRight(idx_type & idx, pos_type & pos) const;
+       void setExpansion(MathArray const & exp, MathArray const & args) const;
 
        ///
        void validate(LaTeXFeatures &) const;
-       ///
-       bool isMacro() const { return true; }
-       ///
-       bool match(MathInset *) const { return false; }
 
        ///
-       void maplize(MapleStream &) const;
+       void maple(MapleStream &) const;
        ///
        void mathmlize(MathMLStream &) const;
        ///
-       void octavize(OctaveStream &) const;
-
-private:
-       ///
-       void operator=(MathMacro const &);
+       void octave(OctaveStream &) const;
        ///
-       string name() const;
+       void infoize(std::ostream &) const;
        ///
-       bool defining() const;
+       void infoize2(std::ostream &) const;
+
+private:
+       virtual std::auto_ptr<InsetBase> doClone() const;
        ///
        void updateExpansion() const;
        ///
        void expand() const;
 
-       ///
-       MathAtom & tmplate_;
-       ///
+       /// name of macro
+       std::string name_;
+       /// the unexpanded macro defintition
+       mutable MathArray tmpl_;
+       /// the matcro substituted with our args
        mutable MathArray expanded_;
-       ///
-       mutable MathMetricsInfo mi_;
-       ///
-       mutable LyXFont font_;
 };