Removed unused private variable

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

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 7363c885545aebd68a0271fe462265ac17e3e395..8c6416a8c658bd89c08456cc287c3fb80f72409e 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -72,22 +72,6 @@ InsetMathScript * InsetMathScript::asScriptInset()
 }
 
 
-bool InsetMathScript::idxFirst(Cursor & cur) const
-{
-       cur.idx() = 0;
-       cur.pos() = 0;
-       return true;
-}
-
-
-bool InsetMathScript::idxLast(Cursor & cur) const
-{
-       cur.idx() = 0;
-       cur.pos() = nuc().size();
-       return true;
-}
-
-
 MathData const & InsetMathScript::down() const
 {
        if (nargs() == 3)
@@ -226,7 +210,8 @@ int InsetMathScript::dx0(BufferView const & bv) const
 {
        LASSERT(hasDown(), return 0);
        Dimension const dim = dimension(bv);
-       return hasLimits() ? (dim.wid - down().dimension(bv).width()) / 2 : nwid(bv);
+       return hasLimits() ? (dim.wid - down().dimension(bv).width()) / 2
+               : nwid(bv) + min(nker(&bv), 0);
 }
 
 
@@ -234,7 +219,8 @@ int InsetMathScript::dx1(BufferView const & bv) const
 {
        LASSERT(hasUp(), return 0);
        Dimension const dim = dimension(bv);
-       return hasLimits() ? (dim.wid - up().dimension(bv).width()) / 2 : nwid(bv) + nker(&bv);
+       return hasLimits() ? (dim.wid - up().dimension(bv).width()) / 2
+               : nwid(bv) + max(nker(&bv), 0);
 }
 
 
@@ -265,10 +251,8 @@ int InsetMathScript::ndes(BufferView const & bv) const
 
 int InsetMathScript::nker(BufferView const * bv) const
 {
-       if (!nuc().empty()) {
-               int kerning = nuc().kerning(bv);
-               return kerning > 0 ? kerning : 0;
-       }
+       if (!nuc().empty())
+               return nuc().kerning(bv);
        return 0;
 }
 
@@ -276,18 +260,22 @@ int InsetMathScript::nker(BufferView const * bv) const
 MathClass InsetMathScript::mathClass() const
 {
        // FIXME: this is a hack, since the class will not be correct if
-       // the nucleus has several elements.
+       // the nucleus has several elements or if the last element is a math macro
+       // or a macro argument proxy.
        // The correct implementation would require to linearize the nucleus.
        if (nuc().empty())
                return MC_ORD;
-       else
+       else {
                // return the class of last element since this is the one that counts.
-               return nuc().back()->mathClass();
+               MathClass mc = nuc().back()->mathClass();
+               return (mc == MC_UNKNOWN) ? MC_ORD : mc;
+       }
 }
 
 
 void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       Changer dummy2 = mi.base.changeEnsureMath();
        Dimension dim0;
        Dimension dim1;
        Dimension dim2;
@@ -316,9 +304,9 @@ void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
                        dim.wid = max(dim.wid, dimdown.width());
        } else {
                if (hasUp())
-                       dim.wid = max(dim.wid, nker(mi.base.bv) + dimup.width());
+                       dim.wid = max(dim.wid, max(nker(mi.base.bv), 0) + dimup.width());
                if (hasDown())
-                       dim.wid = max(dim.wid, dimdown.width());
+                       dim.wid = max(dim.wid, min(nker(mi.base.bv), 0) + dimdown.width());
                dim.wid += nwid(bv);
        }
        int na = nasc(bv);
@@ -333,12 +321,12 @@ void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.des = max(nd, des);
        } else
                dim.des = nd;
-       metricsMarkers(mi, dim);
 }
 
 
 void InsetMathScript::draw(PainterInfo & pi, int x, int y) const
 {
+       Changer dummy2 = pi.base.changeEnsureMath();
        BufferView & bv = *pi.base.bv;
        if (!nuc().empty())
                nuc().draw(pi, x + dxx(bv), y);
@@ -352,7 +340,6 @@ void InsetMathScript::draw(PainterInfo & pi, int x, int y) const
                up().draw(pi, x + dx1(bv), y - dy1(bv));
        if (hasDown())
                down().draw(pi, x + dx0(bv), y + dy0(bv));
-       drawMarkers(pi, x, y);
 }
 
 
@@ -629,8 +616,8 @@ void InsetMathScript::mathmlize(MathStream & os) const
                os << "<mrow />";
 
        if (u && d)
-               os << MTag("mrow") << down() << ETag("mrow") 
-                  << MTag("mrow") << up() << ETag("mrow") 
+               os << MTag("mrow") << down() << ETag("mrow")
+                  << MTag("mrow") << up() << ETag("mrow")
                   << ETag(l ? "munderover" : "msubsup");
        else if (u)
                os << MTag("mrow") << up() << ETag("mrow") << ETag(l ? "mover" : "msup");
@@ -778,7 +765,7 @@ bool InsetMathScript::getStatus(Cursor & cur, FuncRequest const & cmd,
                                flag.setOnOff(limits_ == -1);
                        else
                                flag.setOnOff(limits_ == 0);
-               } 
+               }
                flag.setEnabled(true);
                return true;
        }