X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathEnsureMath.cpp;h=8bd685c5a0c6181290d2261da91b7634439f5d81;hb=cdc847fd304019a19425a0d5d9d42a556a937097;hp=70f3e9c188848146d00c36501908c43e190606d1;hpb=844296cd47bda804aae537ef8ca8aca1491d092f;p=lyx.git

diff --git a/src/mathed/InsetMathEnsureMath.cpp b/src/mathed/InsetMathEnsureMath.cpp
index 70f3e9c188..8bd685c5a0 100644
--- a/src/mathed/InsetMathEnsureMath.cpp
+++ b/src/mathed/InsetMathEnsureMath.cpp
@@ -17,6 +17,9 @@
 #include "MathStream.h"
 #include "MathSupport.h"
 
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include <ostream>
 
 
@@ -35,19 +38,15 @@ Inset * InsetMathEnsureMath::clone() const
 
 void InsetMathEnsureMath::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	bool really_change_font = isTextFont(from_ascii(mi.base.fontname));
-	FontSetChanger dummy(mi.base, "mathnormal", really_change_font);
+	Changer dummy = mi.base.changeEnsureMath();
 	cell(0).metrics(mi, dim);
-	metricsMarkers(dim);
 }
 
 
 void InsetMathEnsureMath::draw(PainterInfo & pi, int x, int y) const
 {
-	bool really_change_font = isTextFont(from_ascii(pi.base.fontname));
-	FontSetChanger dummy(pi.base, "mathnormal", really_change_font);
+	Changer dummy = pi.base.changeEnsureMath();
 	cell(0).draw(pi, x, y);
-	drawMarkers(pi, x, y);
 }
 
 
@@ -73,16 +72,18 @@ void InsetMathEnsureMath::write(WriteStream & os) const
 void InsetMathEnsureMath::mathmlize(MathStream & os) const
 {
 	SetMode mathmode(os, false);
-	os << cell(0);
+	os << MTag("mstyle", "class='math'")
+	   << cell(0)
+	   << ETag("mstyle");
 }
 
 
 void InsetMathEnsureMath::htmlize(HtmlStream & os) const
 {
-	os << "[EM]";
 	SetHTMLMode mathmode(os, false);
-	os << cell(0);
-	os << "[/EM]";
+	os << MTag("span", "class='math'")
+	   << cell(0)
+	   << ETag("span");
 }
 
 
@@ -92,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