Revert "XHTML: remove DOCTYPE, as the document is then understood as HTML4/XHTML1...

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

diff --git a/src/mathed/InsetMathExInt.cpp b/src/mathed/InsetMathExInt.cpp
index 64f49cd996778bbd80637c8ec9b7533622c12a36..537870fd9112ea3ded43d259d5a45bcca9b33cb3 100644 (file)
--- a/src/mathed/InsetMathExInt.cpp
+++ b/src/mathed/InsetMathExInt.cpp
@@ -124,7 +124,7 @@ 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
@@ -134,27 +134,34 @@ void InsetMathExInt::mathmlize(MathStream & os) const
        bool const lower = !cell(2).empty();
        bool const upper = !cell(3).empty();
        if (lower && upper)
-               os << MTag("msubsup");
+               ms << MTag("msubsup");
        else if (lower)
-               os << MTag("msub");
+               ms << MTag("msub");
        else if (upper)
-               os << MTag("msup");
-       os << MTag("mrow");
-       sym.mathmlize(os);
-       os << ETag("mrow");
+               ms << MTag("msup");
+       ms << MTag("mrow");
+       sym.mathmlize(ms);
+       ms << ETag("mrow");
        if (lower)
-               os << MTag("mrow") << cell(2) << ETag("mrow");
+               ms << MTag("mrow") << cell(2) << ETag("mrow");
        if (upper)
-               os << MTag("mrow") << cell(3) << ETag("mrow");
+               ms << MTag("mrow") << cell(3) << ETag("mrow");
        if (lower && upper)
-               os << ETag("msubsup");
+               ms << ETag("msubsup");
        else if (lower)
-               os << ETag("msub");
+               ms << ETag("msub");
        else if (upper)
-               os << ETag("msup");
-       os << cell(0) << "<mo> &InvisibleTimes; </mo>"
-          << MTag("mrow") << "<mo> &DifferentialD; </mo>"
-          << cell(1) << ETag("mrow");
+               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");
 }
 
 
@@ -165,12 +172,12 @@ void InsetMathExInt::htmlize(HtmlStream & os) const
        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")