When cancelling saving of a children, cancel the whole process.

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

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index b91c4ce21dbc43d7bec686e75b54afa323326ed1..55f2665dad72dc7abc04a55f1f1fc0fedc66bc28 100644 (file)
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -10,13 +10,20 @@
 
 #include <config.h>
 
+#include "support/lassert.h"
+
 #include "InsetMathXArrow.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
+
+#include <algorithm>
 
 using namespace std;
 
@@ -36,7 +43,8 @@ Inset * InsetMathXArrow::clone() const
 
 void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       ScriptChanger dummy(mi.base);
+       Changer dummy2 = mi.base.changeEnsureMath();
+       Changer dummy = mi.base.changeScript();
        Dimension dim0;
        cell(0).metrics(mi, dim0);
        Dimension dim1;
@@ -44,21 +52,20 @@ void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.wid = max(dim0.width(), dim1.width()) + 10;
        dim.asc = dim0.height() + 10;
        dim.des = dim1.height();
-       metricsMarkers(dim);
 }
 
 
 void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const
 {
-       ScriptChanger dummy(pi.base);
+       Changer dummy2 = pi.base.changeEnsureMath();
+       Changer dummy = pi.base.changeScript();
        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 + dim.width()/2 - dim0.width()/2, y - 10);
        Dimension const & dim1 = cell(1).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);
+       mathed_draw_deco(pi, x, y - 7, dim.wid, 5, name_);
 }
 
 
@@ -81,7 +88,7 @@ void InsetMathXArrow::normalize(NormalStream & os) const
 void InsetMathXArrow::mathmlize(MathStream & ms) const
 {
        char const * arrow;
-       
+
        if (name_ == "xleftarrow")
                arrow = "&larr;";
        else if (name_ == "xrightarrow")
@@ -112,6 +119,10 @@ void InsetMathXArrow::mathmlize(MathStream & ms) const
                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>";
@@ -152,6 +163,10 @@ void InsetMathXArrow::htmlize(HtmlStream & os) const
                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")