Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index abd6890788b5e8d502286a80d6ff18a1bd79ebf4..1958471558cf6dea735124fd3aca59f694dd6fd6 100644 (file)
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@@ -74,6 +74,8 @@ bool InsetMathOverset::idxLast(Cursor & cur) const
 void InsetMathOverset::write(WriteStream & os) const
 {
        MathEnsurer ensurer(os);
+       if (os.fragile())
+               os << "\\protect";
        os << "\\overset{" << cell(0) << "}{" << cell(1) << '}';
 }
 
@@ -86,13 +88,29 @@ void InsetMathOverset::normalize(NormalStream & os) const
 
 void InsetMathOverset::mathmlize(MathStream & ms) const
 {
-       ms << "<mover accent='false'>" << cell(0) << cell(1) << "</mover>";
+       ms << "<mover accent='false'>" << cell(1) << cell(0) << "</mover>";
+}
+
+
+void InsetMathOverset::htmlize(HtmlStream & os) const
+{
+       os << MTag("span", "class='overset'")
+                << MTag("span", "class='top'") << cell(0) << ETag("span")
+                << MTag("span") << cell(1) << ETag("span")
+                << ETag("span");
 }
 
 
 void InsetMathOverset::validate(LaTeXFeatures & features) const
 {
-       features.require("amsmath");
+       if (features.runparams().isLaTeX())
+               features.require("amsmath");
+       else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               features.addCSSSnippet(
+                       "span.overset{display: inline-block; vertical-align: bottom; text-align:center;}\n"
+                       "span.overset span {display: block;}\n"
+                       "span.top{font-size: 66%;}");
+
        InsetMathNest::validate(features);
 }