Do not allow pasting backslashes in macro names

[features.git] / src / mathed / InsetMathCancelto.cpp

diff --git a/src/mathed/InsetMathCancelto.cpp b/src/mathed/InsetMathCancelto.cpp
index 6170cbd6fa0c0172a66f1f72140f893b7578f33a..1a7d38c78ffb2f2b3bf2907237e288ec66e7accb 100644 (file)
--- a/src/mathed/InsetMathCancelto.cpp
+++ b/src/mathed/InsetMathCancelto.cpp
@@ -41,27 +41,28 @@ Inset * InsetMathCancelto::clone() const
 
 void InsetMathCancelto::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       InsetMathNest::metrics(mi);
+       Changer dummy = mi.base.changeEnsureMath();
+       cellsMetrics(mi);
        Dimension const & dim0 = cell(0).dimension(*mi.base.bv);
        Dimension const & dim1 = cell(1).dimension(*mi.base.bv);
        dim.asc = max(dim0.ascent() + 2, dim0.ascent() + dim1.ascent()) + 2 + 8;
        dim.des = max(dim0.descent() - 2, dim1.descent()) + 2;
        dim.wid = dim0.width() + dim1.width() + 10;
-       metricsMarkers(mi, dim);
 }
 
 
 void InsetMathCancelto::draw(PainterInfo & pi, int x, int y) const
 {
+       Changer dummy = pi.base.changeEnsureMath();
        ColorCode const origcol = pi.base.font.color();
 
        // We first draw the text and then an arrow
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
-       cell(0).draw(pi, x + 1, y);
-       cell(1).draw(pi, x + dim0.wid + 2 + 8, y - dim0.asc - 8);
-               
+       cell(0).draw(pi, x, y);
+       cell(1).draw(pi, x + dim0.wid + 1 + 8, y - dim0.asc - 8);
+
        //Dimension const dim = dimension(*pi.base.bv);
-       
+
        // y3____ ___
        //          /|
        // y2_     / |
@@ -84,12 +85,10 @@ void InsetMathCancelto::draw(PainterInfo & pi, int x, int y) const
        // the arrow bars
        pi.pain.line(x3, y3, x2 + 2, y3, origcol);
        pi.pain.line(x3, y3, x3 - 2, y2 - 2, origcol);
-
-       drawMarkers(pi, x, y);
 }
 
 
-void InsetMathCancelto::write(WriteStream & os) const
+void InsetMathCancelto::write(TeXMathStream & os) const
 {
        MathEnsurer ensurer(os);
        os << "\\cancelto{" << cell(1) << "}{" << cell(0) << '}';
@@ -103,7 +102,7 @@ void InsetMathCancelto::normalize(NormalStream & os) const
 
 bool InsetMathCancelto::idxUpDown(Cursor & cur, bool up) const
 {
-       Cursor::idx_type const target = up ? 1 : 0;
+       idx_type const target = up ? 1 : 0;
        if (cur.idx() == target)
                return false;
        cur.idx() = target;