X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.cpp;h=aff3fb6c634847b94e20b86f315c50985547b381;hb=02e82157ec583c3900e359de86be79fac6512387;hp=2f42ee819cc259d07a4eeabf98c84daa7593f223;hpb=a0043da05f5d32653917d8c551ee50138e639b00;p=lyx.git

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index 2f42ee819c..aff3fb6c63 100644
--- a/src/mathed/InsetMathBox.cpp
+++ b/src/mathed/InsetMathBox.cpp
@@ -19,10 +19,15 @@
 #include "MathSupport.h"
 #include "MetricsInfo.h"
 
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
 #include "frontends/Painter.h"
 
+#include <algorithm>
 #include <ostream>
 
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -53,30 +58,38 @@ 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");
 }
 
 
 void InsetMathBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, "textnormal");
+	Changer dummy = mi.base.changeFontSet("textnormal");
 	cell(0).metrics(mi, dim);
-	metricsMarkers(dim);
+	metricsMarkers(mi, dim);
 }
 
 
 void InsetMathBox::draw(PainterInfo & pi, int x, int y) const
 {
-	FontSetChanger dummy(pi.base, "textnormal");
+	Changer dummy = pi.base.changeFontSet("textnormal");
 	cell(0).draw(pi, x, y);
 	drawMarkers(pi, x, y);
 }
@@ -84,16 +97,24 @@ void InsetMathBox::draw(PainterInfo & pi, int x, int y) const
 
 void InsetMathBox::infoize(odocstream & os) const
 {	
-	os << "Box: " << name_;
+	os << bformat(_("Box: %1$s"), name_);
 }
 
 
 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);
 }
 
 
@@ -112,9 +133,9 @@ InsetMathFBox::InsetMathFBox(Buffer * buf)
 
 void InsetMathFBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, "textnormal");
+	Changer dummy = mi.base.changeFontSet("textnormal");
 	cell(0).metrics(mi, dim);
-	metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space
+	metricsMarkers2(mi, dim, 3); // 1 pixel space, 1 frame, 1 space
 }
 
 
@@ -123,9 +144,8 @@ void InsetMathFBox::draw(PainterInfo & pi, int x, int y) const
 	Dimension const dim = dimension(*pi.base.bv);
 	pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
 		dim.width() - 2, dim.height() - 2, Color_foreground);
-	FontSetChanger dummy(pi.base, "textnormal");
+	Changer dummy = pi.base.changeFontSet("textnormal");
 	cell(0).draw(pi, x + 3, y);
-	setPosCache(pi, x, y);
 }
 
 
@@ -144,15 +164,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");
 }
 
 
@@ -168,13 +192,13 @@ void InsetMathFBox::validate(LaTeXFeatures & features) const
 	// 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.addPreambleSnippet("<style type=\"text/css\">\n"
-			"mtext.fbox { border: 1px solid black; }\n"
-			"</style>");
+		features.addCSSSnippet(
+			"mstyle.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }");
 	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-		features.addPreambleSnippet("<style type=\"text/css\">\n"
-			"span.fbox { border: 1px solid black; }\n"
-			"</style>");
+		features.addCSSSnippet(
+			"span.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }");
+
+	cell(0).validate(features);
 	InsetMathNest::validate(features);
 }
 
@@ -194,11 +218,11 @@ InsetMathMakebox::InsetMathMakebox(Buffer * buf, bool framebox)
 
 void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, "textnormal");
+	Changer dummy = mi.base.changeFontSet("textnormal");
 	
 	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;
@@ -221,7 +245,7 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
 		dim.des += 1;
 	}
 	
-	metricsMarkers(dim);
+	metricsMarkers(mi, dim);
 }
 
 
@@ -229,7 +253,7 @@ void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const
 {
 	drawMarkers(pi, x, y);
 	
-	FontSetChanger dummy(pi.base, "textnormal");
+	Changer dummy = pi.base.changeFontSet("textnormal");
 	BufferView const & bv = *pi.base.bv;
 	int w = mathed_char_width(pi.base.font, '[');
 	
@@ -262,9 +286,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) << '}';
@@ -290,17 +314,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");
 }
 
 
@@ -310,13 +338,9 @@ void InsetMathMakebox::validate(LaTeXFeatures & features) const
 	// 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.addPreambleSnippet("<style type=\"text/css\">\n"
-			"span.framebox { border: 1px solid black; }\n"
-			"</style>");
+		features.addCSSSnippet("mstyle.framebox { border: 1px solid black; }");
 	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-		features.addPreambleSnippet("<style type=\"text/css\">\n"
-			"span.framebox { border: 1px solid black; }\n"
-			"</style>");
+		features.addCSSSnippet("span.framebox { border: 1px solid black; }");
 	InsetMathNest::validate(features);
 }
 
@@ -335,7 +359,7 @@ InsetMathBoxed::InsetMathBoxed(Buffer * buf)
 void InsetMathBoxed::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	cell(0).metrics(mi, dim);
-	metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space
+	metricsMarkers2(mi, dim, 3); // 1 pixel space, 1 frame, 1 space
 }
 
 
@@ -345,7 +369,6 @@ void InsetMathBoxed::draw(PainterInfo & pi, int x, int y) const
 	pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
 		dim.width() - 2, dim.height() - 2, Color_foreground);
 	cell(0).draw(pi, x + 3, y);
-	setPosCache(pi, x, y);
 }
 
 
@@ -370,15 +393,17 @@ 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");
 }
 
 
@@ -390,13 +415,9 @@ void InsetMathBoxed::validate(LaTeXFeatures & features) const
 	// 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.addPreambleSnippet("<style type=\"text/css\">\n"
-			"mstyle.boxed { border: 1px solid black; }\n"
-			"</style>");
+		features.addCSSSnippet("mstyle.boxed { border: 1px solid black; }");
 	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-		features.addPreambleSnippet("<style type=\"text/css\">\n"
-			"span.boxed { border: 1px solid black; }\n"
-			"</style>");
+		features.addCSSSnippet("span.boxed { border: 1px solid black; }");
 	
 	InsetMathNest::validate(features);
 }