From: Richard Heck <rgheck@comcast.net>
Date: Wed, 16 Dec 2009 14:53:23 +0000 (+0000)
Subject: Fix a few MathML things: the default output and the output of limits.
X-Git-Tag: 2.0.0~4805
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9e149b89197efd23a9087ec7e3af2319847380d2;p=features.git

Fix a few MathML things: the default output and the output of limits.


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

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index 51b4deee70..0a9772c676 100644
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -122,8 +122,10 @@ void InsetMath::mathematica(MathematicaStream & os) const
 
 void InsetMath::mathmlize(MathStream & os) const
 {
+	os << MTag("mi");
 	NormalStream ns(os.os());
 	normalize(ns);
+	os << ETag("mi");
 }
 
 
diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 02f9bfeedb..588e218f7c 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -1768,9 +1768,10 @@ int InsetMathHull::docbook(odocstream & os, OutputParams const & runparams) cons
 docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
 	if (getType() == hullSimple)
-		xs << StartTag("math", "xmlns=\"http://www.w3.org/1998/Math/MathML\"");
+		xs << StartTag("math", "xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
 	else 
-		xs << StartTag("math", "display=\"block\" xmlns=\"http://www.w3.org/1998/Math/MathML\"");
+		xs << StartTag("math", 
+		        "display=\"block\" xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
 	MathStream ms(xs.os());
 	InsetMathGrid::mathmlize(ms);
 	xs << EndTag("math");
diff --git a/src/mathed/InsetMathLim.cpp b/src/mathed/InsetMathLim.cpp
index 892cded83d..718d923b19 100644
--- a/src/mathed/InsetMathLim.cpp
+++ b/src/mathed/InsetMathLim.cpp
@@ -73,7 +73,11 @@ void InsetMathLim::mathematica(MathematicaStream & os) const
 
 void InsetMathLim::mathmlize(MathStream & os) const
 {
-	os << "lim(" << cell(0) << ',' << cell(1) << ',' << cell(2) << ')';
+	// FIXME XHTML We need a form of MTag that takes attributes.
+	os << "<munder>"
+	   << "<mo form='prefix'>" << "lim" << "</mo>"
+	   << "<mrow>" << cell(1) << "<mo>&rarr;</mo>" << cell(2) << "</mrow></munder>"
+	   << "<mfenced open='(' close=')'>" << cell(0) << "</mfenced>"; 
 }