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 55ad252ddb8e7a549b91b3d04b1ea27813ffa772..eef5b4388c4546aff6f65ea5eb7d839801331760 100644 (file)
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -18,12 +18,13 @@
 
 #include "LaTeXFeatures.h"
 
+using namespace std;
 
 namespace lyx {
 
 
-InsetMathXArrow::InsetMathXArrow(docstring const & name)
-       : InsetMathFracBase(), name_(name)
+InsetMathXArrow::InsetMathXArrow(Buffer * buf, docstring const & name)
+       : InsetMathFracBase(buf), name_(name)
 {}
 
 
@@ -36,13 +37,14 @@ Inset * InsetMathXArrow::clone() const
 void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        ScriptChanger dummy(mi.base);
-       cell(0).metrics(mi);
-       cell(1).metrics(mi);
-       dim.wid = std::max(cell(0).width(), cell(1).width()) + 10;
-       dim.asc = cell(0).height() + 10;
-       dim.des = cell(1).height();
+       Dimension dim0;
+       cell(0).metrics(mi, dim0);
+       Dimension dim1;
+       cell(1).metrics(mi, dim1);
+       dim.wid = max(dim0.width(), dim1.width()) + 10;
+       dim.asc = dim0.height() + 10;
+       dim.des = dim1.height();
        metricsMarkers(dim);
-       dim_ = dim;
 }
 
 
@@ -50,16 +52,19 @@ void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const
 {
        ScriptChanger dummy(pi.base);
        cell(0).draw(pi, x + 5, y - 10);
-       cell(1).draw(pi, x + 5, y + cell(1).height());
-       mathed_draw_deco(pi, x + 1, y - 7, dim_.wid - 2, 5, name_);
+       Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
+       cell(1).draw(pi, x + 5, y + dim1.height());
+       Dimension const dim = dimension(*pi.base.bv);
+       mathed_draw_deco(pi, x + 1, y - 7, dim.wid - 2, 5, name_);
        drawMarkers(pi, x, y);
 }
 
 
 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) << '}';
 }
@@ -71,9 +76,36 @@ void InsetMathXArrow::normalize(NormalStream & os) const
 }
 
 
+void InsetMathXArrow::mathmlize(MathStream & ms) const
+{
+       char const * const arrow = name_ == "xleftarrow" 
+                       ? "&larr;" : "&rarr;";
+       ms << "<munderover accent='false' accentunder='false'>"
+          << arrow << cell(1) << cell(0)
+          << "</munderover>";
+}
+
+
+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);
 }