X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathEnsureMath.cpp;h=8bd685c5a0c6181290d2261da91b7634439f5d81;hb=999831043e6da50b3095a2dfec7000d4209e586c;hp=8f738a8dae7b6e00c112c2436c63ec456312da81;hpb=d8053e2683ff99456071c8fa90fc4dab7816277c;p=lyx.git

diff --git a/src/mathed/InsetMathEnsureMath.cpp b/src/mathed/InsetMathEnsureMath.cpp
index 8f738a8dae..8bd685c5a0 100644
--- a/src/mathed/InsetMathEnsureMath.cpp
+++ b/src/mathed/InsetMathEnsureMath.cpp
@@ -13,8 +13,12 @@
 
 #include "InsetMathEnsureMath.h"
 
-#include "MathStream.h"
 #include "MathData.h"
+#include "MathStream.h"
+#include "MathSupport.h"
+
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include <ostream>
 
@@ -34,17 +38,15 @@ Inset * InsetMathEnsureMath::clone() const
 
 void InsetMathEnsureMath::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, "mathnormal");
+	Changer dummy = mi.base.changeEnsureMath();
 	cell(0).metrics(mi, dim);
-	metricsMarkers(dim);
 }
 
 
 void InsetMathEnsureMath::draw(PainterInfo & pi, int x, int y) const
 {
-	FontSetChanger dummy(pi.base, "mathnormal");
+	Changer dummy = pi.base.changeEnsureMath();
 	cell(0).draw(pi, x, y);
-	drawMarkers(pi, x, y);
 }
 
 
@@ -69,7 +71,19 @@ void InsetMathEnsureMath::write(WriteStream & os) const
 
 void InsetMathEnsureMath::mathmlize(MathStream & os) const
 {
-	os << cell(0);
+	SetMode mathmode(os, false);
+	os << MTag("mstyle", "class='math'")
+	   << cell(0)
+	   << ETag("mstyle");
+}
+
+
+void InsetMathEnsureMath::htmlize(HtmlStream & os) const
+{
+	SetHTMLMode mathmode(os, false);
+	os << MTag("span", "class='math'")
+	   << cell(0)
+	   << ETag("span");
 }
 
 
@@ -79,4 +93,17 @@ void InsetMathEnsureMath::infoize(odocstream & os) const
 }
 
 
+void InsetMathEnsureMath::validate(LaTeXFeatures & features) const
+{
+	// FIXME XHTML
+	// It'd be better to be able to get this from an InsetLayout, but at present
+	// InsetLayouts do not seem really to work for things that aren't InsetTexts.
+	if (features.runparams().math_flavor == OutputParams::MathAsMathML)
+		features.addCSSSnippet("mstyle.math { font-style: italic; }");
+	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addCSSSnippet("span.mathbox { font-style: italic; }");
+
+	InsetMathNest::validate(features);
+}
+
 } // namespace lyx