}
-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)
{
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);
}
{
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);
}
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;
}
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;
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);
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);
up().draw(pi, x + dx1(bv), y - dy1(bv));
if (hasDown())
down().draw(pi, x + dx0(bv), y + dy0(bv));
- drawMarkers(pi, x, y);
}
}
+// FIXME: See InsetMathSymbol::takesLimits, which seems to attempt the
+// same in a hardcoded way. takeLimits use is currently commented out in
+// InsetMathScript::metrics. It seems that the mathop test is general
+// enough, but only time will tell.
+bool InsetMathScript::allowsLimits() const
+{
+ if (nuc().empty())
+ return false;
+ // Only makes sense for insets of mathop class
+ if (nuc().back()->mathClass() != MC_OP)
+ return false;
+ return true;
+}
+
bool InsetMathScript::hasLimits() const
{
return false;
// we can only display limits if the nucleus wants some
- if (nuc().empty())
+ if (!allowsLimits())
return false;
+ // FIXME: this is some hardcoding done in InsetMathSymbol::metrics.
if (!nuc().back()->isScriptable())
return false;
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");
//LYXERR("InsetMathScript: request: " << cmd);
if (cmd.action() == LFUN_MATH_LIMITS) {
+ // only when nucleus allows this
+ if (!allowsLimits())
+ return;
cur.recordUndoInset();
if (!cmd.argument().empty()) {
if (cmd.argument() == "limits")
FuncStatus & flag) const
{
if (cmd.action() == LFUN_MATH_LIMITS) {
- if (!cmd.argument().empty()) {
- if (cmd.argument() == "limits")
- flag.setOnOff(limits_ == 1);
- else if (cmd.argument() == "nolimits")
- flag.setOnOff(limits_ == -1);
- else
- flag.setOnOff(limits_ == 0);
- }
- flag.setEnabled(true);
+ // only when nucleus allows this
+ if (allowsLimits()) {
+ if (!cmd.argument().empty()) {
+ if (cmd.argument() == "limits")
+ flag.setOnOff(limits_ == 1);
+ else if (cmd.argument() == "nolimits")
+ flag.setOnOff(limits_ == -1);
+ else
+ flag.setOnOff(limits_ == 0);
+ }
+ flag.setEnabled(true);
+ } else
+ flag.setEnabled(false);
return true;
}