#include "math_support.h"
#include "math_symbolinset.h"
#include "dispatchresult.h"
+#include "cursor.h"
#include "debug.h"
#include "funcrequest.h"
#include <boost/assert.hpp>
-
using std::string;
using std::max;
using std::auto_ptr;
using std::endl;
+
MathScriptInset::MathScriptInset()
: MathNestInset(3), limits_(0)
{
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;
}
nuc().draw(pi, x + dxx(), y);
else {
nuc().setXY(x + dxx(), y);
- if (editing())
+ if (editing(pi.base.bv))
drawStr(pi, pi.base.font, x + dxx(), y, ".");
}
ScriptChanger dummy(pi.base);
}
-bool MathScriptInset::idxUpDown(LCursor & cur, bool up, int) const
+bool MathScriptInset::idxUpDown(LCursor & cur, bool up) const
{
if (cur.idx() == 1) {
// if we are 'up' we can't go further up
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();
}
-DispatchResult
-MathScriptInset::priv_dispatch(BufferView & bv, FuncRequest const & cmd)
+void 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")
limits_ = hasLimits() ? -1 : 1;
else
limits_ = 0;
- return DispatchResult(true, true);
+ return;
}
- return MathNestInset::priv_dispatch(bv, cmd);
+ MathNestInset::priv_dispatch(cur, cmd);
}