move around stuff, remove unneeded declarations etc

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

diff --git a/src/mathed/math_exintinset.h b/src/mathed/math_exintinset.h
index 0d1214e9855b54f756b5c4ed43c56cb5b02d9b8a..b1e11d8814fd0c9fe85b5f8d2e2104f0ddc20be5 100644 (file)
--- a/src/mathed/math_exintinset.h
+++ b/src/mathed/math_exintinset.h
@@ -1,38 +1,58 @@
 // -*- C++ -*-
+/**
+ * \file math_exintinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_EXINTINSET_H
 #define MATH_EXINTINSET_H
 
-// /\int_l^u f(x) dxin one block (as opposed to 'f','(','x',')' or 'f','x')
-// for interfacing external programs
 
-#include "math_scriptinset.h"
+// \int_l^u f(x) dx in one block (as opposed to 'f','(','x',')' or 'f','x')
+// or \sum, \prod...  for interfacing external programs
+
+#include "math_nestinset.h"
+
+#include <string>
 
-class MathExIntInset : public MathInset {
+
+// cell(0) is stuff before the 'd', cell(1) the stuff after
+class MathExIntInset : public MathNestInset {
 public:
        ///
-       MathExIntInset(MathScriptInset const &, MathArray const &, MathArray const &);
+       explicit MathExIntInset(std::string const & name_);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       void metrics(MathMetricsInfo const & st) const;
+       void symbol(std::string const &);
        ///
-       void draw(Painter &, int x, int y) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void write(MathWriteInfo & os) const;
+       void draw(PainterInfo &, int x, int y) const;
+
        ///
-       void writeNormal(NormalStream &) const;
+       void normalize(NormalStream &) const;
        ///
-       void maplize(MapleStream &) const;
+       void maxima(MaximaStream &) const;
        ///
-       void mathmlize(MathMLStream &) const;
-private:
+       void maple(MapleStream &) const;
+       ///
+       void mathematica(MathematicaStream &) const;
        ///
-       MathAtom int_;
+       void mathmlize(MathMLStream &) const;
        ///
-       MathScriptInset scripts_;
+       void write(WriteStream & os) const;
+private:
        ///
-       MathArray core_;
+       bool hasScripts() const;
+
        ///
-       MathArray diff_;
+       std::string symbol_;
 };
+
 #endif