Seems boost also includes all std headers. Not including boost therefore produces...

[lyx.git] / src / mathed / InsetMathBox.cpp

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index 3e101232da8cfde9294dc32c4a97f87a571eae4d..fa3f5653241eb6fd876fac3a456bf4ed20c6a950 100644 (file)
--- 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,20 @@ void InsetMathBox::normalize(NormalStream & os) const
 }
 
 
+void InsetMathBox::mathmlize(MathStream & ms) const
+{      
+       SetMode textmode(ms, true, "class='mathbox'");
+       ms << cell(0);
+}
+
+
+void InsetMathBox::htmlize(HtmlStream & ms) const
+{
+       SetHTMLMode textmode(ms, true);
+       ms << cell(0);
+}
+
+
 void InsetMathBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        FontSetChanger dummy(mi.base, "textnormal");
@@ -69,7 +83,7 @@ void InsetMathBox::draw(PainterInfo & pi, int x, int y) const
 
 
 void InsetMathBox::infoize(odocstream & os) const
-{
+{      
        os << "Box: " << name_;
 }
 
@@ -78,6 +92,7 @@ void InsetMathBox::validate(LaTeXFeatures & features) const
 {
        if (name_ == "tag" || name_ == "tag*")
                features.require("amsmath");
+
        cell(0).validate(features);
 }
 
@@ -90,8 +105,8 @@ void InsetMathBox::validate(LaTeXFeatures & features) const
 /////////////////////////////////////////////////////////////////////
 
 
-InsetMathFBox::InsetMathFBox()
-       : InsetMathNest(1)
+InsetMathFBox::InsetMathFBox(Buffer * buf)
+       : InsetMathNest(buf, 1)
 {}
 
 
@@ -127,12 +142,44 @@ void InsetMathFBox::normalize(NormalStream & os) const
 }
 
 
+void InsetMathFBox::mathmlize(MathStream & ms) const
+{      
+       SetMode textmode(ms, true, "class='fbox'");
+       ms << cell(0);
+}
+
+
+void InsetMathFBox::htmlize(HtmlStream & ms) const
+{
+       SetHTMLMode textmode(ms, true, "class='fbox'");
+       ms << cell(0);
+}
+
+
 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.addPreambleSnippet("<style type=\"text/css\">\n"
+                       "mtext.fbox { border: 1px solid black; }\n"
+                       "</style>");
+       else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               features.addPreambleSnippet("<style type=\"text/css\">\n"
+                       "span.fbox { border: 1px solid black; }\n"
+                       "</style>");
+       InsetMathNest::validate(features);
+}
+
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // InsetMathMakebox
@@ -140,8 +187,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)
 {}
 
 
@@ -239,14 +286,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, "class='" + cssclass + "'");
+       ms << cell(2);
+}
+
+
+void InsetMathMakebox::htmlize(HtmlStream & ms) const
+{
+       // FIXME We could do something with the other arguments.
+       std::string const cssclass = framebox_ ? "framebox" : "makebox";
+       SetHTMLMode textmode(ms, true, "class='" + cssclass + "'");
+       ms << cell(2);
+}
+
+
+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.addPreambleSnippet("<style type=\"text/css\">\n"
+                       "span.framebox { border: 1px solid black; }\n"
+                       "</style>");
+       else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               features.addPreambleSnippet("<style type=\"text/css\">\n"
+                       "span.framebox { border: 1px solid black; }\n"
+                       "</style>");
+       InsetMathNest::validate(features);
+}
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // InsetMathBoxed
 //
 /////////////////////////////////////////////////////////////////////
 
-InsetMathBoxed::InsetMathBoxed()
-       : InsetMathNest(1)
+InsetMathBoxed::InsetMathBoxed(Buffer * buf)
+       : InsetMathNest(buf, 1)
 {}
 
 
@@ -286,9 +368,37 @@ void InsetMathBoxed::infoize(odocstream & os) const
 }
 
 
+void InsetMathBoxed::mathmlize(MathStream & ms) const
+{
+       SetMode mathmode(ms, false, "class='boxed'");
+       ms << cell(0);
+}
+
+
+void InsetMathBoxed::htmlize(HtmlStream & ms) const
+{
+       SetHTMLMode mathmode(ms, false, "class='boxed'");
+       ms << cell(0);
+}
+
+
 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.addPreambleSnippet("<style type=\"text/css\">\n"
+                       "mstyle.boxed { border: 1px solid black; }\n"
+                       "</style>");
+       else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               features.addPreambleSnippet("<style type=\"text/css\">\n"
+                       "span.boxed { border: 1px solid black; }\n"
+                       "</style>");
+       
+       InsetMathNest::validate(features);
 }