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

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index 3e101232da..8b3cb2b427 100644
--- a/src/mathed/InsetMathBox.cpp
+++ b/src/mathed/InsetMathBox.cpp
@@ -32,8 +32,8 @@ namespace lyx {
 //
 /////////////////////////////////////////////////////////////////////
 
-InsetMathBox::InsetMathBox(docstring const & name)
-	: InsetMathNest(1), name_(name)
+InsetMathBox::InsetMathBox(Buffer * buf, docstring const & name)
+	: InsetMathNest(buf, 1), name_(name)
 {}
 
 
@@ -52,6 +52,28 @@ void InsetMathBox::normalize(NormalStream & os) const
 }
 
 
+void InsetMathBox::mathmlize(MathStream & ms) const
+{
+	// 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 << MTag("span", "class='mathbox'")
+	   << cell(0)
+	   << ETag("span");
+}
+
+
 void InsetMathBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	FontSetChanger dummy(mi.base, "textnormal");
@@ -69,16 +91,25 @@ void InsetMathBox::draw(PainterInfo & pi, int x, int y) const
 
 
 void InsetMathBox::infoize(odocstream & os) const
-{
+{	
 	os << "Box: " << 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);
 }
 
 
@@ -90,8 +121,8 @@ void InsetMathBox::validate(LaTeXFeatures & features) const
 /////////////////////////////////////////////////////////////////////
 
 
-InsetMathFBox::InsetMathFBox()
-	: InsetMathNest(1)
+InsetMathFBox::InsetMathFBox(Buffer * buf)
+	: InsetMathNest(buf, 1)
 {}
 
 
@@ -127,12 +158,48 @@ void InsetMathFBox::normalize(NormalStream & os) const
 }
 
 
+void InsetMathFBox::mathmlize(MathStream & ms) const
+{	
+	SetMode textmode(ms, true);
+	ms << MTag("mstyle", "class='fbox'")
+	   << cell(0)
+	   << ETag("mstyle");
+}
+
+
+void InsetMathFBox::htmlize(HtmlStream & ms) const
+{
+	SetHTMLMode textmode(ms, true);
+	ms << MTag("span", "class='fbox'")
+	   << cell(0)
+	   << ETag("span");
+}
+
+
 void InsetMathFBox::infoize(odocstream & os) const
 {
 	os << "FBox: ";
 }
 
 
+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().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);
+}
+
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // InsetMathMakebox
@@ -140,8 +207,8 @@ void InsetMathFBox::infoize(odocstream & os) const
 /////////////////////////////////////////////////////////////////////
 
 
-InsetMathMakebox::InsetMathMakebox(bool framebox)
-	: InsetMathNest(3), framebox_(framebox)
+InsetMathMakebox::InsetMathMakebox(Buffer * buf, bool framebox)
+	: InsetMathNest(buf, 3), framebox_(framebox)
 {}
 
 
@@ -151,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;
@@ -215,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) << '}';
@@ -239,14 +306,49 @@ void InsetMathMakebox::infoize(odocstream & os) const
 }
 
 
+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);
+	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";
+	ms << MTag("span", "class='" + cssclass + "'")
+	   << cell(2)
+	   << ETag("span");
+}
+
+
+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().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
 //
 /////////////////////////////////////////////////////////////////////
 
-InsetMathBoxed::InsetMathBoxed()
-	: InsetMathNest(1)
+InsetMathBoxed::InsetMathBoxed(Buffer * buf)
+	: InsetMathNest(buf, 1)
 {}
 
 
@@ -286,9 +388,35 @@ void InsetMathBoxed::infoize(odocstream & os) const
 }
 
 
+void InsetMathBoxed::mathmlize(MathStream & ms) const
+{
+	ms << MTag("mstyle", "class='boxed'")
+	   << cell(0)
+	   << ETag("mstyle");
+}
+
+
+void InsetMathBoxed::htmlize(HtmlStream & ms) const
+{
+	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().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);
 }