Assure correct spacing of colored items in mathed

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

diff --git a/src/mathed/InsetMathRoot.cpp b/src/mathed/InsetMathRoot.cpp
index 565951114e06c138e9e1ba2811352af59a30fe6d..de4253e808d5f7f05b34bc5184a8089429f50ed6 100644 (file)
--- a/src/mathed/InsetMathRoot.cpp
+++ b/src/mathed/InsetMathRoot.cpp
@@ -47,7 +47,7 @@ void mathed_root_metrics(MetricsInfo & mi, MathData const & nucleus,
        Changer dummy = mi.base.changeEnsureMath();
        Dimension dimr;
        if (root) {
-               Changer script = mi.base.font.changeStyle(LM_ST_SCRIPTSCRIPT);
+               Changer script = mi.base.font.changeStyle(SCRIPTSCRIPT_STYLE);
                // make sure that the dim is high enough for any character
                root->metrics(mi, dimr, false);
        }
@@ -70,7 +70,7 @@ void mathed_root_metrics(MetricsInfo & mi, MathData const & nucleus,
         */
        int const t = mi.base.solidLineThickness();
        int const x_height = mathed_font_x_height(mi.base.font);
-       int const phi = (mi.base.font.style() == LM_ST_DISPLAY) ? x_height : t;
+       int const phi = (mi.base.font.style() == DISPLAY_STYLE) ? x_height : t;
        // first part is the spacing, second part is the line width
        // itself, and last one is the spacing above.
        int const space_above = (t + phi / 4) + t + t;
@@ -105,7 +105,7 @@ void mathed_draw_root(PainterInfo & pi, int x, int y, MathData const & nucleus,
        int const wl = dim.width() - dimn.width();
        // the "exponent"
        if (root) {
-               Changer script = pi.base.font.changeStyle(LM_ST_SCRIPTSCRIPT);
+               Changer script = pi.base.font.changeStyle(SCRIPTSCRIPT_STYLE);
                Dimension const dimr = root->dimension(*pi.base.bv);
                int const root_offset = wl - 3 * w / 8 - dimr.width();
                root->draw(pi, x + root_offset, y + (d - a)/2);
@@ -161,9 +161,9 @@ bool InsetMathRoot::idxForward(Cursor & cur) const
        // nucleus is 0 and is on the right
        if (cur.idx() == 0)
                return false;
-       else
-               cur.idx() = 0;
 
+       cur.idx() = 0;
+       cur.pos() = 0;
        return true;
 }
 
@@ -173,9 +173,27 @@ bool InsetMathRoot::idxBackward(Cursor & cur) const
        // nucleus is 0 and is on the right
        if (cur.idx() == 1)
                return false;
-       else
-               cur.idx() = 1;
 
+       cur.idx() = 1;
+       cur.pos() = cur.lastpos();
+       return true;
+}
+
+
+bool InsetMathRoot::idxFirst(Cursor & cur) const
+{
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 1;
+       cur.pos() = 0;
+       return true;
+}
+
+
+bool InsetMathRoot::idxLast(Cursor & cur) const
+{
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 0;
+       cur.pos() = cur.lastpos();
        return true;
 }
 
@@ -198,9 +216,9 @@ void InsetMathRoot::octave(OctaveStream & os) const
 }
 
 
-void InsetMathRoot::mathmlize(MathStream & os) const
+void InsetMathRoot::mathmlize(MathStream & ms) const
 {
-       os << MTag("mroot") << cell(0) << cell(1) << ETag("mroot");
+       ms << MTag("mroot") << cell(0) << cell(1) << ETag("mroot");
 }