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

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

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index 54d73563817641a4580d5d899dfe06c99bd1c17a..eef5b4388c4546aff6f65ea5eb7d839801331760 100644 (file)
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -64,7 +64,7 @@ void InsetMathXArrow::write(WriteStream & os) const
 {
        MathEnsurer ensurer(os);
        os << '\\' << name_;
-       if (cell(1).size())
+       if (!cell(1).empty())
                os << '[' << cell(1) << ']';
        os << '{' << cell(0) << '}';
 }
@@ -86,9 +86,26 @@ void InsetMathXArrow::mathmlize(MathStream & ms) const
 }
 
 
+void InsetMathXArrow::htmlize(HtmlStream & os) const
+{
+       char const * const arrow = name_ == "xleftarrow" 
+                       ? "&larr;" : "&rarr;";
+       os << MTag("span", "class='xarrow'")
+                << MTag("span", "class='xatop'") << cell(0) << ETag("span")
+                << MTag("span", "class='xabottom'") << arrow << ETag("span")
+                << ETag("span");
+}
+
+
 void InsetMathXArrow::validate(LaTeXFeatures & features) const
 {
        features.require("amsmath");
+       if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               // CSS adapted from eLyXer
+               features.addCSSSnippet(
+                       "span.xarrow{display: inline-block; vertical-align: middle; text-align:center;}\n"
+                       "span.xatop{display: block;}\n"
+                       "span.xabottom{display: block;}");
        InsetMathNest::validate(features);
 }