Cmake export tests: Added sublabel handling also to revertedTests

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

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index 06ef4a52403c691a8cc7766ed03382ef273f64f3..9e3c91d003d2a89d86625e0d911bc380e1573246 100644 (file)
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -10,6 +10,8 @@
 
 #include <config.h>
 
+#include "support/lassert.h"
+
 #include "InsetMathXArrow.h"
 #include "MathData.h"
 #include "MathStream.h"
@@ -51,13 +53,12 @@ void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
 void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const
 {
        ScriptChanger dummy(pi.base);
-       Dimension const dim00 = dimension(*pi.base.bv);
-       Dimension const & dim01 = cell(0).dimension(*pi.base.bv);
+       Dimension const dim = dimension(*pi.base.bv);
+       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        // center the cells with the decoration
-       cell(0).draw(pi, x + dim00.width()/2 - dim01.width()/2, y - 10);
+       cell(0).draw(pi, x + dim.width()/2 - dim0.width()/2, y - 10);
        Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
-       cell(1).draw(pi, x + dim00.width()/2 - dim1.width()/2, y + dim1.height());
-       Dimension const dim = dimension(*pi.base.bv);
+       cell(1).draw(pi, x + dim.width()/2 - dim1.width()/2, y + dim1.height());
        mathed_draw_deco(pi, x + 1, y - 7, dim.wid - 2, 5, name_);
        drawMarkers(pi, x, y);
 }
@@ -81,8 +82,42 @@ void InsetMathXArrow::normalize(NormalStream & os) const
 
 void InsetMathXArrow::mathmlize(MathStream & ms) const
 {
-       char const * const arrow = name_ == "xleftarrow" 
-                       ? "&larr;" : "&rarr;";
+       char const * arrow;
+       
+       if (name_ == "xleftarrow")
+               arrow = "&larr;";
+       else if (name_ == "xrightarrow")
+               arrow = "&rarr;";
+       else if (name_ == "xhookleftarrow")
+               arrow = "&larrhk;";
+       else if (name_ == "xhookrightarrow")
+               arrow = "&rarrhk;";
+       else if (name_ == "xLeftarrow")
+               arrow = "&lArr;";
+       else if (name_ == "xRightarrow")
+               arrow = "&rArr;";
+       else if (name_ == "xleftrightarrow")
+               arrow = "&leftrightarrow;";
+       else if (name_ == "xLeftrightarrow")
+               arrow = "&Leftrightarrow;";
+       else if (name_ == "xleftharpoondown")
+               arrow = "&leftharpoondown;";
+       else if (name_ == "xleftharpoonup")
+               arrow = "&leftharpoonup;";
+       else if (name_ == "xleftrightharpoons")
+               arrow = "&leftrightharpoons;";
+       else if (name_ == "xrightharpoondown")
+               arrow = "&rightharpoondown;";
+       else if (name_ == "xrightharpoonup")
+               arrow = "&rightharpoonup;";
+       else if (name_ == "xrightleftharpoons")
+               arrow = "&rightleftharpoons;";
+       else if (name_ == "xmapsto")
+               arrow = "&mapsto;";
+       else {
+               lyxerr << "mathmlize conversion for '" << name_ << "' not implemented" << endl;
+               LASSERT(false, arrow = "&rarr;");
+       }
        ms << "<munderover accent='false' accentunder='false'>"
           << arrow << cell(1) << cell(0)
           << "</munderover>";
@@ -91,8 +126,42 @@ void InsetMathXArrow::mathmlize(MathStream & ms) const
 
 void InsetMathXArrow::htmlize(HtmlStream & os) const
 {
-       char const * const arrow = name_ == "xleftarrow" 
-                       ? "&larr;" : "&rarr;";
+       char const * arrow;
+
+       if (name_ == "xleftarrow")
+               arrow = "&larr;";
+       else if (name_ == "xrightarrow")
+               arrow = "&rarr;";
+       else if (name_ == "xhookleftarrow")
+               arrow = "&larrhk;";
+       else if (name_ == "xhookrightarrow")
+               arrow = "&rarrhk;";
+       else if (name_ == "xLeftarrow")
+               arrow = "&lArr;";
+       else if (name_ == "xRightarrow")
+               arrow = "&rArr;";
+       else if (name_ == "xleftrightarrow")
+               arrow = "&leftrightarrow;";
+       else if (name_ == "xLeftrightarrow")
+               arrow = "&Leftrightarrow;";
+       else if (name_ == "xleftharpoondown")
+               arrow = "&leftharpoondown;";
+       else if (name_ == "xleftharpoonup")
+               arrow = "&leftharpoonup;";
+       else if (name_ == "xleftrightharpoons")
+               arrow = "&leftrightharpoons;";
+       else if (name_ == "xrightharpoondown")
+               arrow = "&rightharpoondown;";
+       else if (name_ == "xrightharpoonup")
+               arrow = "&rightharpoonup;";
+       else if (name_ == "xrightleftharpoons")
+               arrow = "&rightleftharpoons;";
+       else if (name_ == "xmapsto")
+               arrow = "&mapsto;";
+       else {
+               lyxerr << "htmlize conversion for '" << name_ << "' not implemented" << endl;
+               LASSERT(false, arrow = "&rarr;");
+       }
        os << MTag("span", "class='xarrow'")
                 << MTag("span", "class='xatop'") << cell(0) << ETag("span")
                 << MTag("span", "class='xabottom'") << arrow << ETag("span")
@@ -102,7 +171,10 @@ void InsetMathXArrow::htmlize(HtmlStream & os) const
 
 void InsetMathXArrow::validate(LaTeXFeatures & features) const
 {
-       features.require("amsmath");
+       if (name_ == "xleftarrow" || name_ == "xrightarrow")
+               features.require("amsmath");
+       else
+               features.require("mathtools");
        if (features.runparams().math_flavor == OutputParams::MathAsHTML)
                // CSS adapted from eLyXer
                features.addCSSSnippet(