X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.cpp;h=8b3cb2b427b1c1938cf980bae60959072eebe8a9;hb=6de3c19fd63f810eed90ef3bc4469faf28e949c2;hp=b3cc30abcb06661182d79b7fa32451ce18a427e9;hpb=27add8d945ba8e1395dd643f5b5f5cfc985a816e;p=lyx.git

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index b3cc30abcb..8b3cb2b427 100644
--- a/src/mathed/InsetMathBox.cpp
+++ b/src/mathed/InsetMathBox.cpp
@@ -53,16 +53,24 @@ void InsetMathBox::normalize(NormalStream & os) const
 
 
 void InsetMathBox::mathmlize(MathStream & ms) const
-{	
-	SetMode textmode(ms, true, from_ascii("class='mathbox'"));
-	ms << cell(0);
+{
+	// FIXME XHTML
+	// Need to do something special for tags here.
+	// Probably will have to involve deferring them, which
+	// means returning something from this routine.
+	SetMode textmode(ms, true);
+	ms << MTag("mstyle", "class='mathbox'")
+	   << cell(0)
+	   << ETag("mstyle");
 }
 
 
 void InsetMathBox::htmlize(HtmlStream & ms) const
 {
 	SetHTMLMode textmode(ms, true);
-	ms << cell(0);
+	ms << MTag("span", "class='mathbox'")
+	   << cell(0)
+	   << ETag("span");
 }
 
 
@@ -90,10 +98,18 @@ void InsetMathBox::infoize(odocstream & os) const
 
 void InsetMathBox::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.mathbox { font-style: normal; }");
+	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addCSSSnippet("span.mathbox { font-style: normal; }");
+
 	if (name_ == "tag" || name_ == "tag*")
 		features.require("amsmath");
 
-	cell(0).validate(features);
+	InsetMathNest::validate(features);
 }
 
 
@@ -144,15 +160,19 @@ void InsetMathFBox::normalize(NormalStream & os) const
 
 void InsetMathFBox::mathmlize(MathStream & ms) const
 {	
-	SetMode textmode(ms, true, from_ascii("class='fbox'"));
-	ms << cell(0);
+	SetMode textmode(ms, true);
+	ms << MTag("mstyle", "class='fbox'")
+	   << cell(0)
+	   << ETag("mstyle");
 }
 
 
 void InsetMathFBox::htmlize(HtmlStream & ms) const
 {
-	SetHTMLMode textmode(ms, true, "class='fbox'");
-	ms << cell(0);
+	SetHTMLMode textmode(ms, true);
+	ms << MTag("span", "class='fbox'")
+	   << cell(0)
+	   << ETag("span");
 }
 
 
@@ -167,11 +187,15 @@ void InsetMathFBox::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().flavor == OutputParams::HTML)
-		features.addPreambleSnippet("<style type=\"text/css\">\n"
-			"mtext.fbox { border: 1px solid black; }\n"
-			"span.fbox { border: 1px solid black; }\n"
-			"</style>");
+	if (features.runparams().math_flavor == OutputParams::MathAsMathML)
+		features.addCSSSnippet(
+			"mstyle.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }");
+	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addCSSSnippet(
+			"span.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }");
+
+	cell(0).validate(features);
+	InsetMathNest::validate(features);
 }
 
 
@@ -194,7 +218,7 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
 	
 	Dimension wdim;
 	static docstring bracket = from_ascii("[");
-	mathed_string_dim(mi.base.font, bracket, wdim);
+	metricsStrRedBlack(mi, wdim, bracket);
 	int w = wdim.wid;
 	
 	Dimension dim0;
@@ -258,9 +282,9 @@ void InsetMathMakebox::write(WriteStream & os) const
 {
 	ModeSpecifier specifier(os, TEXT_MODE);
 	os << (framebox_ ? "\\framebox" : "\\makebox");
-	if (cell(0).size() || !os.latex()) {
+	if (!cell(0).empty() || !os.latex()) {
 		os << '[' << cell(0) << ']';
-		if (cell(1).size() || !os.latex())
+		if (!cell(1).empty() || !os.latex())
 			os << '[' << cell(1) << ']';
 	}
 	os << '{' << cell(2) << '}';
@@ -286,17 +310,21 @@ void InsetMathMakebox::mathmlize(MathStream & ms) const
 {
 	// FIXME We could do something with the other arguments.
 	std::string const cssclass = framebox_ ? "framebox" : "makebox";
-	SetMode textmode(ms, true, from_ascii("class='" + cssclass + "'"));
-	ms << cell(2);
+	SetMode textmode(ms, true);
+	ms << MTag("mstyle", "class='" + cssclass + "'")
+	   << cell(2)
+	   << ETag("mstyle");
 }
 
 
 void InsetMathMakebox::htmlize(HtmlStream & ms) const
 {
 	// FIXME We could do something with the other arguments.
+	SetHTMLMode textmode(ms, true);
 	std::string const cssclass = framebox_ ? "framebox" : "makebox";
-	SetHTMLMode textmode(ms, true, "class='" + cssclass + "'");
-	ms << cell(2);
+	ms << MTag("span", "class='" + cssclass + "'")
+	   << cell(2)
+	   << ETag("span");
 }
 
 
@@ -305,15 +333,14 @@ void InsetMathMakebox::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().flavor == OutputParams::HTML)
-		features.addPreambleSnippet("<style type=\"text/css\">\n"
-			"mtext.framebox { border: 1px solid black; }\n"
-			"span.framebox { border: 1px solid black; }\n"
-			"</style>");
+	if (features.runparams().math_flavor == OutputParams::MathAsMathML)
+		features.addCSSSnippet("mstyle.framebox { border: 1px solid black; }");
+	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addCSSSnippet("span.framebox { border: 1px solid black; }");
+	InsetMathNest::validate(features);
 }
 
 
-
 /////////////////////////////////////////////////////////////////////
 //
 // InsetMathBoxed
@@ -363,29 +390,32 @@ void InsetMathBoxed::infoize(odocstream & os) const
 
 void InsetMathBoxed::mathmlize(MathStream & ms) const
 {
-	SetMode mathmode(ms, false, from_ascii("class='boxed'"));
-	ms << cell(0);
+	ms << MTag("mstyle", "class='boxed'")
+	   << cell(0)
+	   << ETag("mstyle");
 }
 
 
 void InsetMathBoxed::htmlize(HtmlStream & ms) const
 {
-	SetHTMLMode mathmode(ms, false, "class='boxed'");
-	ms << cell(0);
+	ms << MTag("span", "class='boxed'")
+	   << cell(0)
+		 << ETag("span");
 }
 
 
 void InsetMathBoxed::validate(LaTeXFeatures & features) const
 {
 	features.require("amsmath");
+
 	// 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().flavor == OutputParams::HTML)
-		features.addPreambleSnippet("<style type=\"text/css\">\n"
-			"mstyle.boxed { border: 1px solid black; }\n"
-			"span.boxed { border: 1px solid black; }\n"
-			"</style>");
+	if (features.runparams().math_flavor == OutputParams::MathAsMathML)
+		features.addCSSSnippet("mstyle.boxed { border: 1px solid black; }");
+	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addCSSSnippet("span.boxed { border: 1px solid black; }");
+	
 	InsetMathNest::validate(features);
 }