remove unneeded member

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

diff --git a/src/mathed/math_exintinset.C b/src/mathed/math_exintinset.C
index b49f2246c585f20328e122b33cf450ea3c04c22d..47a44edde611ce56eea5fcf6ac226390efc40b3f 100644 (file)
--- a/src/mathed/math_exintinset.C
+++ b/src/mathed/math_exintinset.C
@@ -1,14 +1,26 @@
+#include <config.h>
+
 #include "math_exintinset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "math_symbolinset.h"
 #include "debug.h"
 
+#include <boost/scoped_ptr.hpp>
+
+using std::endl;
+
 
 MathExIntInset::MathExIntInset(string const & name)
-       : symbol_(name)
+       : MathNestInset(4), symbol_(name)
 {}
 
+// 0 - core
+// 1 - diff
+// 2 - lower
+// 3 - upper
+
 
 MathInset * MathExIntInset::clone() const
 {
@@ -16,30 +28,6 @@ MathInset * MathExIntInset::clone() const
 }
 
 
-void MathExIntInset::index(MathArray const & ar)
-{
-       index_ = ar;
-}
-
-
-void MathExIntInset::core(MathArray const & ar)
-{
-       core_ = ar;
-}
-
-
-void MathExIntInset::scripts(MathAtom const & at)
-{
-       scripts_ = at;
-}
-
-
-MathAtom & MathExIntInset::scripts()
-{
-       return scripts_;
-}
-
-
 void MathExIntInset::symbol(string const & symbol)
 {
        symbol_ = symbol;
@@ -48,66 +36,79 @@ void MathExIntInset::symbol(string const & symbol)
 
 bool MathExIntInset::hasScripts() const
 {
-       return scripts_.hasNucleus();
+       // take empty upper bound as "no scripts"
+       return !cell(3).empty();
 }
 
 
 
 void MathExIntInset::normalize(NormalStream & os) const
 {
-       os << '[' << symbol_.c_str() << ' ';
-       if (hasScripts())
-               os << scripts_.nucleus();
-       else 
-               os << "{}";
-       os << ' ' << core_ << ' ' << index_ << ']';
+       os << '[' << symbol_ << ' ' << cell(0) << ' ' << cell(1) << ' '
+          << cell(2) << ' ' << cell(3) << ']';
 }
 
 
-void MathExIntInset::metrics(MathMetricsInfo const &) const
+void MathExIntInset::metrics(MathMetricsInfo &) const
 {
-       lyxerr << "should not happen\n";
+       lyxerr << "should not happen" << endl;
 }
 
 
-void MathExIntInset::draw(Painter &, int, int) const
-{  
-       lyxerr << "should not happen\n";
+void MathExIntInset::draw(MathPainterInfo &, int, int) const
+{
+       lyxerr << "should not happen" << endl;
 }
 
 
 void MathExIntInset::maplize(MapleStream & os) const
 {
-       os << symbol_.c_str() << '(';
-       if (core_.size())
-               os << core_;
-       else 
+       os << symbol_ << '(';
+       if (cell(0).size())
+               os << cell(0);
+       else
                os << '1';
-       os << ',' << index_;
-       if (hasScripts()) {
-               MathScriptInset * p = scripts_->asScriptInset();
-               os << '=' << p->down().data_ << ".." << p->up().data_;
-       }
+       os << ',' << cell(1);
+       if (hasScripts())
+               os << '=' << cell(2) << ".." << cell(3);
        os << ')';
 }
 
-
-void MathExIntInset::mathmlize(MathMLStream & os) const
+void MathExIntInset::mathematicize(MathematicaStream & os) const
 {
-       MathSymbolInset * sym = new MathSymbolInset(symbol_.c_str());
+       if ( symbol_ == "int" ) 
+               os << "Integrate[";
+       else 
+               if (symbol_ == "sum") 
+                       os << "Sum[";
+               else 
+                       os << symbol_ << '[';
+       
+       if (cell(0).size())
+               os << cell(0) << ',';
+       else
+               os << '1' << ',';
        if (hasScripts())
-               scripts_->asScriptInset()->mathmlize(sym, os);
+               os << '{' << cell(1) << ',' << cell(2) << ',' << cell(3) << "}]";
        else 
+               os << cell(1) << ']';
+}
+
+
+void MathExIntInset::mathmlize(MathMLStream & os) const
+{
+       boost::scoped_ptr<MathSymbolInset> sym(new MathSymbolInset(symbol_));
+       //if (hasScripts())
+       //      mathmlize(sym, os);
+       //else
                sym->mathmlize(os);
-       delete sym;
-       os << core_ << "<mo> &InvisibleTimes; </mo>"
+       os << cell(0) << "<mo> &InvisibleTimes; </mo>"
           << MTag("mrow") << "<mo> &DifferentialD; </mo>"
-          << index_ << ETag("mrow");
+          << cell(1) << ETag("mrow");
 }
 
 
 void MathExIntInset::write(WriteStream &) const
 {
-       lyxerr << "should not happen\n";
+       lyxerr << "should not happen" << endl;
 }
-