bug + spped fixes + small stuff

[lyx.git] / src / mathed / math_scriptinset.C

diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C
index 26151a7c1f05af40cd3e9a976c899963f340ba49..6e6f75514109c6cfb71e642ab773f3c46b4f61aa 100644 (file)
--- a/src/mathed/math_scriptinset.C
+++ b/src/mathed/math_scriptinset.C
@@ -204,24 +204,24 @@ void MathScriptInset::metrics(MetricsInfo & mi, Dimension & dim) const
        ScriptChanger dummy(mi.base);
        cell(0).metrics(mi);
        cell(1).metrics(mi);
-       dim_.wid = 0;
+       dim.wid = 0;
        if (hasLimits()) {
-               dim_.wid = nwid();
+               dim.wid = nwid();
                if (hasUp())
-                       dim_.wid = max(dim_.wid, up().width());
+                       dim.wid = max(dim.wid, up().width());
                if (hasDown())
-                       dim_.wid = max(dim_.wid, down().width());
+                       dim.wid = max(dim.wid, down().width());
        } else {
                if (hasUp())
-                       dim_.wid = max(dim_.wid, up().width());
+                       dim.wid = max(dim.wid, up().width());
                if (hasDown())
-                       dim_.wid = max(dim_.wid, down().width());
-               dim_.wid += nwid();
+                       dim.wid = max(dim.wid, down().width());
+               dim.wid += nwid();
        }
-       dim_.asc = dy1() + (hasUp() ? up().ascent() : 0);
-       dim_.des = dy0() + (hasDown() ? down().descent() : 0);
-       metricsMarkers();
-       dim = dim_;
+       dim.asc = dy1() + (hasUp() ? up().ascent() : 0);
+       dim.des = dy0() + (hasDown() ? down().descent() : 0);
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
@@ -444,13 +444,14 @@ void MathScriptInset::mathematica(MathematicaStream & os) const
        if (u)
                os << "^(" << up() << ')';
 
-       if (nuc().size())
+       if (nuc().size()) {
                if (d)
                        os << ',' << down() << ']';
+       }
 }
 
 
-void MathScriptInset::mathmlize( MathMLStream & os) const
+void MathScriptInset::mathmlize(MathMLStream & os) const
 {
        bool d = hasDown() && down().size();
        bool u = hasUp() && up().size();
@@ -513,8 +514,10 @@ void MathScriptInset::notifyCursorLeaves(idx_type idx)
 
 
 DispatchResult
-MathScriptInset::priv_dispatch(LCursor & bv, FuncRequest const & cmd)
+MathScriptInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
 {
+       lyxerr << "MathScriptInset: request: " << cmd << std::endl;
+
        if (cmd.action == LFUN_MATH_LIMITS) {
                if (!cmd.argument.empty()) {
                        if (cmd.argument == "limits")
@@ -530,5 +533,5 @@ MathScriptInset::priv_dispatch(LCursor & bv, FuncRequest const & cmd)
                return DispatchResult(true, true);
        }
 
-       return MathNestInset::priv_dispatch(bv, cmd);
+       return MathNestInset::priv_dispatch(cur, cmd);
 }