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 2ad11b39df7c60a731f24554eb4539426c2b64a2..47a44edde611ce56eea5fcf6ac226390efc40b3f 100644 (file)
--- a/src/mathed/math_exintinset.C
+++ b/src/mathed/math_exintinset.C
@@ -1,16 +1,26 @@
+#include <config.h>
+
 #include "math_exintinset.h"
 #include "math_support.h"
-#include "debug.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(MathScriptInset const & scripts,
-               MathArray const & core, MathArray const & diff)
-       : int_(new MathSymbolInset("int")),
-               scripts_(scripts), core_(core), diff_(diff)
+MathExIntInset::MathExIntInset(string const & name)
+       : MathNestInset(4), symbol_(name)
 {}
 
+// 0 - core
+// 1 - diff
+// 2 - lower
+// 3 - upper
+
 
 MathInset * MathExIntInset::clone() const
 {
@@ -18,37 +28,87 @@ MathInset * MathExIntInset::clone() const
 }
 
 
-void MathExIntInset::write(WriteStream & os) const
+void MathExIntInset::symbol(string const & symbol)
+{
+       symbol_ = symbol;
+}
+
+
+bool MathExIntInset::hasScripts() const
 {
-       scripts_.write(int_.nucleus(), os);
-       os << core_ << "d" << diff_;
+       // take empty upper bound as "no scripts"
+       return !cell(3).empty();
 }
 
 
+
 void MathExIntInset::normalize(NormalStream & os) const
 {
-       //os << "[int " << scripts_ << ' ' << core_ << ' ' << diff_ << ']'
+       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 << name_.c_str() << '(' << cell(0) << ')';
+       os << symbol_ << '(';
+       if (cell(0).size())
+               os << cell(0);
+       else
+               os << '1';
+       os << ',' << cell(1);
+       if (hasScripts())
+               os << '=' << cell(2) << ".." << cell(3);
+       os << ')';
+}
+
+void MathExIntInset::mathematicize(MathematicaStream & os) const
+{
+       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())
+               os << '{' << cell(1) << ',' << cell(2) << ',' << cell(3) << "}]";
+       else 
+               os << cell(1) << ']';
 }
 
+
 void MathExIntInset::mathmlize(MathMLStream & os) const
 {
-       //os << name_.c_str() << '(' << cell(0) << ')';
+       boost::scoped_ptr<MathSymbolInset> sym(new MathSymbolInset(symbol_));
+       //if (hasScripts())
+       //      mathmlize(sym, os);
+       //else
+               sym->mathmlize(os);
+       os << cell(0) << "<mo> &InvisibleTimes; </mo>"
+          << MTag("mrow") << "<mo> &DifferentialD; </mo>"
+          << cell(1) << ETag("mrow");
+}
+
+
+void MathExIntInset::write(WriteStream &) const
+{
+       lyxerr << "should not happen" << endl;
 }