]> git.lyx.org Git - features.git/commitdiff
Last commit didn't complete reversion, as I forgot to resolve the
authorRichard Heck <rgheck@comcast.net>
Thu, 17 Dec 2009 17:50:46 +0000 (17:50 +0000)
committerRichard Heck <rgheck@comcast.net>
Thu, 17 Dec 2009 17:50:46 +0000 (17:50 +0000)
conflicted state of this file.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32571 a592a061-630c-0410-9148-cb99ea01b6c8

src/mathed/InsetMathExInt.cpp

index ae687bb678ef97b7bf70bb1b8c5785a37f64593e..052a13f78ba3f7829d989a480dde25fbee95dc3a 100644 (file)
@@ -71,16 +71,8 @@ void InsetMathExInt::draw(PainterInfo &, int, int) const
 }
 
 
-bool InsetMathExInt::isExIntOperator(docstring const & name)
-{
-       std::string const & sname = to_utf8(name);
-       return sname == "sum" || sname == "prod";
-}
-
-
 void InsetMathExInt::maple(MapleStream & os) const
 {
-       // FIXME Products and the like may need special treatment.
        os << symbol_ << '(';
        if (cell(0).size())
                os << cell(0);
@@ -95,7 +87,6 @@ void InsetMathExInt::maple(MapleStream & os) const
 
 void InsetMathExInt::maxima(MaximaStream & os) const
 {
-       // FIXME Products and the like may need special treatment.
        if (symbol_ == "int")
                os << "integrate(";
        else
@@ -111,10 +102,8 @@ void InsetMathExInt::maxima(MaximaStream & os) const
                os << cell(1) << ')';
 }
 
-
 void InsetMathExInt::mathematica(MathematicaStream & os) const
 {
-       // FIXME Products and the like may need special treatment.
        if (symbol_ == "int")
                os << "Integrate[";
        else if (symbol_ == "sum")
@@ -136,38 +125,6 @@ void InsetMathExInt::mathematica(MathematicaStream & os) const
 void InsetMathExInt::mathmlize(MathStream & os) const
 {
        InsetMathSymbol sym(symbol_);
-       if (isExIntOperator(symbol_)) {
-               bool const lower = !cell(1).empty();
-               bool const upper = !cell(3).empty();
-               if (lower && upper)
-                       os << MTag("msubsup");
-               else if (lower)
-                       os << MTag("msub");
-               else if (upper)
-                       os << MTag("msup");
-               os << MTag("mrow");
-               sym.mathmlize(os);
-               os << ETag("mrow");
-               if (lower) {
-                       os << MTag("mrow");
-                       os << cell(1);
-                       if (!cell(2).empty())
-                               os << MTag("mo") << "=" << ETag("mo") 
-                                  << cell(2);
-                       os << ETag("mrow");
-               }
-               if (upper)
-                       os << MTag("mrow") << cell(3) << ETag("mrow");
-               if (lower && upper)
-                       os << ETag("msubsup");
-               else if (lower)
-                       os << ETag("msub");
-               else if (upper)
-                       os << ETag("msup");
-               os << cell(0);
-               return;
-       }
-       // some kind of integral
        bool const lower = !cell(2).empty();
        bool const upper = !cell(3).empty();
        if (lower && upper)
@@ -200,4 +157,5 @@ void InsetMathExInt::write(WriteStream &) const
        LYXERR0("should not happen");
 }
 
+
 } // namespace lyx