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 777b4f508c73455af40b622c6860894b04233550..2a3637578f4bf3f26b8b86ea8080d0de97065441 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -1,83 +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: 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 <vector>
-#include <iosfwd>
-
 #include "math_nestinset.h"
-#include "math_macroarg.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(MathMacroTemplate const &);
-       ///
-       MathMacro(MathMacro const &);
+       MathMacro(std::string const & name, int numargs);
        ///
-       void draw(Painter &, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       void metrics(MathStyles st) const;
+       void drawExpanded(PainterInfo & pi, int x, int y) const;
        ///
-       MathInset * clone() const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void write(std::ostream &, bool fragile) const;
+       std::string name() const;
        ///
-       void writeNormal(std::ostream &) const;
+       void setExpansion(MathArray const & exp, MathArray const & args) const;
+
        ///
-       void dump(std::ostream & os) const;
+       void validate(LaTeXFeatures &) const;
 
        ///
-       bool idxUp(int &, int &) const;
+       void maple(MapleStream &) const;
        ///
-       bool idxDown(int &, int &) const;
+       void mathmlize(MathMLStream &) const;
        ///
-       bool idxLeft(int &, int &) const;
+       void octave(OctaveStream &) const;
        ///
-       bool idxRight(int &, int &) const;
-
+       void infoize(std::ostream &) const;
        ///
-       void validate(LaTeXFeatures &) const;
+       void infoize2(std::ostream &) const;
 
 private:
+       virtual std::auto_ptr<InsetBase> doClone() const;
        ///
-       MathMacroTemplate const * const tmplate_;
+       void updateExpansion() const;
        ///
-       mutable MathXArray expanded_;
-       ///
-       void operator=(MathMacro const &);
+       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_;
 };
 
 
-inline std::ostream & operator<<(std::ostream & os, MathMacro const & m)
-{
-       m.dump(os);
-       return os;
-}
 #endif