Improve the list of equations

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

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 7363c885545aebd68a0271fe462265ac17e3e395..a4ffd576b03bea104467d878bba6cfdc7543550a 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -276,18 +276,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;
@@ -339,6 +343,7 @@ void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
 
 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);