Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_exintinset.C b/src/mathed/math_exintinset.C
index 4fce6e180de03f38fab9f3bd7a28c2347fb0d3fd..bd4afb918a8c1c933056fbdd26419a6981656855 100644 (file)
--- a/src/mathed/math_exintinset.C
+++ b/src/mathed/math_exintinset.C
@@ -1,30 +1,43 @@
+/**
+ * \file math_exintinset.C
+ * 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.
+ */
+
+#include <config.h>
+
 #include "math_exintinset.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "math_symbolinset.h"
 #include "debug.h"
 
+#include <boost/scoped_ptr.hpp>
 
-MathExIntInset::MathExIntInset(string const & name)
-       : MathNestInset(2), symbol_(name)
-{}
 
+using std::string;
+using std::auto_ptr;
+using std::endl;
 
-MathInset * MathExIntInset::clone() const
-{
-       return new MathExIntInset(*this);
-}
 
+MathExIntInset::MathExIntInset(string const & name)
+       : MathNestInset(4), symbol_(name)
+{}
 
-void MathExIntInset::scripts(MathAtom const & at)
-{
-       scripts_ = at;
-}
+// 0 - core
+// 1 - diff
+// 2 - lower
+// 3 - upper
 
 
-MathAtom & MathExIntInset::scripts()
+auto_ptr<InsetBase> MathExIntInset::doClone() const
 {
-       return scripts_;
+       return auto_ptr<InsetBase>(new MathExIntInset(*this));
 }
 
 
@@ -36,56 +49,89 @@ 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() << ' ' << cell(0) << ' ' << cell(1);
-       if (hasScripts())
-               os << scripts_.nucleus();
-       os << ']';
+       os << '[' << symbol_ << ' ' << cell(0) << ' ' << cell(1) << ' '
+          << cell(2) << ' ' << cell(3) << ']';
 }
 
 
-void MathExIntInset::metrics(MathMetricsInfo const &) const
+void MathExIntInset::metrics(MetricsInfo &, Dimension &) 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(PainterInfo &, int, int) const
+{
+       lyxerr << "should not happen" << endl;
 }
 
 
-void MathExIntInset::maplize(MapleStream & os) const
+void MathExIntInset::maple(MapleStream & os) const
 {
-       os << symbol_.c_str() << '(';
+       os << symbol_ << '(';
        if (cell(0).size())
                os << cell(0);
-       else 
+       else
                os << '1';
        os << ',' << cell(1);
-       if (hasScripts()) {
-               MathScriptInset * p = scripts_->asScriptInset();
-               os << '=' << p->down().data_ << ".." << p->up().data_;
-       }
+       if (hasScripts())
+               os << '=' << cell(2) << ".." << cell(3);
        os << ')';
 }
 
 
-void MathExIntInset::mathmlize(MathMLStream & os) const
+void MathExIntInset::maxima(MaximaStream & os) const
 {
-       MathSymbolInset * sym = new MathSymbolInset(symbol_.c_str());
+       if ( symbol_ == "int" )
+               os << "integrate(";
+       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::mathematica(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())
-               scripts_->asScriptInset()->mathmlize(sym, os);
-       else 
+               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 << cell(0) << "<mo> &InvisibleTimes; </mo>"
           << MTag("mrow") << "<mo> &DifferentialD; </mo>"
           << cell(1) << ETag("mrow");
@@ -94,6 +140,5 @@ void MathExIntInset::mathmlize(MathMLStream & os) const
 
 void MathExIntInset::write(WriteStream &) const
 {
-       lyxerr << "should not happen\n";
+       lyxerr << "should not happen" << endl;
 }
-