Assure correct spacing of colored items in mathed

[lyx.git] / src / mathed / InsetMathExInt.cpp

diff --git a/src/mathed/InsetMathExInt.cpp b/src/mathed/InsetMathExInt.cpp
index 23372ba16d92dfbcc3e6ff6ed132074d6a9f1a7c..537870fd9112ea3ded43d259d5a45bcca9b33cb3 100644 (file)
--- a/src/mathed/InsetMathExInt.cpp
+++ b/src/mathed/InsetMathExInt.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,19 +11,21 @@
 #include <config.h>
 
 #include "InsetMathExInt.h"
+
+#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "InsetMathSymbol.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 
 
 namespace lyx {
 
-InsetMathExInt::InsetMathExInt(docstring const & name)
-       : InsetMathNest(4), symbol_(name)
+InsetMathExInt::InsetMathExInt(Buffer * buf, docstring const & name)
+       : InsetMathNest(buf, 4), symbol_(name)
 {}
 
 // 0 - core
@@ -74,7 +76,7 @@ void InsetMathExInt::draw(PainterInfo &, int, int) const
 void InsetMathExInt::maple(MapleStream & os) const
 {
        os << symbol_ << '(';
-       if (cell(0).size())
+       if (!cell(0).empty())
                os << cell(0);
        else
                os << '1';
@@ -92,7 +94,7 @@ void InsetMathExInt::maxima(MaximaStream & os) const
        else
                os << symbol_ << '(';
 
-       if (cell(0).size())
+       if (!cell(0).empty())
                os << cell(0) << ',';
        else
                os << '1' << ',';
@@ -111,7 +113,7 @@ void InsetMathExInt::mathematica(MathematicaStream & os) const
        else
                os << symbol_ << '[';
 
-       if (cell(0).size())
+       if (!cell(0).empty())
                os << cell(0) << ',';
        else
                os << '1' << ',';
@@ -122,16 +124,70 @@ void InsetMathExInt::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathExInt::mathmlize(MathStream & os) const
+void InsetMathExInt::mathmlize(MathStream & ms) const
 {
+       // At the moment, we are not extracting sums and the like for MathML.
+       // If we should decide to do so later, then we'll need to re-merge
+       // r32566 and r32568.
+       // So right now this only handles integrals.
        InsetMathSymbol sym(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");
+       bool const lower = !cell(2).empty();
+       bool const upper = !cell(3).empty();
+       if (lower && upper)
+               ms << MTag("msubsup");
+       else if (lower)
+               ms << MTag("msub");
+       else if (upper)
+               ms << MTag("msup");
+       ms << MTag("mrow");
+       sym.mathmlize(ms);
+       ms << ETag("mrow");
+       if (lower)
+               ms << MTag("mrow") << cell(2) << ETag("mrow");
+       if (upper)
+               ms << MTag("mrow") << cell(3) << ETag("mrow");
+       if (lower && upper)
+               ms << ETag("msubsup");
+       else if (lower)
+               ms << ETag("msub");
+       else if (upper)
+               ms << ETag("msup");
+       ms << cell(0)
+          << "<" << from_ascii(ms.namespacedTag("mo")) << "> "
+          << " &InvisibleTimes; "
+       << "</" << from_ascii(ms.namespacedTag("mo")) << ">"
+          << MTag("mrow")
+          << "<" << from_ascii(ms.namespacedTag("mo")) << "> "
+          << " &DifferentialD; "
+          << "</" << from_ascii(ms.namespacedTag("mo")) << ">"
+          << cell(1)
+          << ETag("mrow");
+}
+
+
+void InsetMathExInt::htmlize(HtmlStream & os) const
+{
+       // At the moment, we are not extracting sums and the like for HTML.
+       // So right now this only handles integrals.
+       InsetMathSymbol sym(symbol_);
+       bool const lower = !cell(2).empty();
+       bool const upper = !cell(3).empty();
+
+       os << MTag("span", "class='integral'")
+          << MTag("span", "class='intsym'");
+       sym.htmlize(os, false);
+       os << ETag("span");
+
+       if (lower && upper) {
+               os << MTag("span", "class='limits'")
+                  << MTag("span") << cell(2) << ETag("span")
+                        << MTag("span") << cell(3) << ETag("span")
+                        << ETag("span");
+       } else if (lower)
+               os << MTag("sub", "class='limit'") << cell(2) << ETag("sub");
+       else if (upper)
+               os << MTag("sup", "class='limit'") << cell(3) << ETag("sup");
+       os << cell(0) << "<b>d</b>" << cell(1) << ETag("span");
 }
 
 
@@ -140,5 +196,4 @@ void InsetMathExInt::write(WriteStream &) const
        LYXERR0("should not happen");
 }
 
-
 } // namespace lyx