#include "InsetMathScript.h"
#include "InsetMathBrace.h"
-#include "InsetMathSymbol.h"
#include "MathData.h"
#include "MathStream.h"
#include "MathSupport.h"
#include "BufferView.h"
#include "Cursor.h"
-#include "DispatchResult.h"
-#include "FuncRequest.h"
-#include "FuncStatus.h"
#include "LaTeXFeatures.h"
#include "MetricsInfo.h"
InsetMathScript::InsetMathScript(Buffer * buf)
- : InsetMathNest(buf, 1), cell_1_is_up_(false), limits_(0)
+ : InsetMathNest(buf, 1), cell_1_is_up_(false)
{}
InsetMathScript::InsetMathScript(Buffer * buf, bool up)
- : InsetMathNest(buf, 2), cell_1_is_up_(up), limits_(0)
+ : InsetMathNest(buf, 2), cell_1_is_up_(up)
{}
InsetMathScript::InsetMathScript(Buffer * buf, MathAtom const & at, bool up)
- : InsetMathNest(buf, 2), cell_1_is_up_(up), limits_(0)
+ : InsetMathNest(buf, 2), cell_1_is_up_(up)
{
LATTEST(nargs() >= 1);
cell(0).push_back(at);
}
-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)
if (!hasDown())
return nd;
int des = down().dimension(bv).ascent();
- if (hasLimits())
+ if (has_limits_)
des += nd + 2;
else {
int na = nasc(bv);
if (!hasUp())
return na;
int asc = up().dimension(bv).descent();
- if (hasLimits())
+ if (has_limits_)
asc += na + 2;
else {
int nd = ndes(bv);
{
LASSERT(hasDown(), return 0);
Dimension const dim = dimension(bv);
- return hasLimits() ? (dim.wid - down().dimension(bv).width()) / 2 : nwid(bv);
+ return has_limits_ ? (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 has_limits_ ? (dim.wid - up().dimension(bv).width()) / 2
+ : nwid(bv) + max(nker(&bv), 0);
}
int InsetMathScript::dxx(BufferView const & bv) const
{
Dimension const dim = dimension(bv);
- return hasLimits() ? (dim.wid - nwid(bv)) / 2 : 0;
+ return has_limits_ ? (dim.wid - nwid(bv)) / 2 : 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;
+ }
}
Dimension dim0;
Dimension dim1;
Dimension dim2;
- cell(0).metrics(mi, dim0);
- Changer dummy = mi.base.changeScript();
- if (nargs() > 1)
- cell(1).metrics(mi, dim1);
- if (nargs() > 2)
- cell(2).metrics(mi, dim2);
+ {
+ // Keeps the changers local
+ Changer dummy2 = mi.base.changeEnsureMath();
+ cell(0).metrics(mi, dim0);
+ Changer dummy = mi.base.changeScript();
+ if (nargs() > 1)
+ cell(1).metrics(mi, dim1, !has_limits_);
+ if (nargs() > 2)
+ cell(2).metrics(mi, dim2, !has_limits_);
+ }
+ // we store this, because it is much easier
+ has_limits_ = hasLimits(mi.base.font);
dim.wid = 0;
BufferView & bv = *mi.base.bv;
if (hasDown())
dimdown = down().dimension(bv);
- if (hasLimits()) {
+ if (has_limits_) {
dim.wid = nwid(bv);
if (hasUp())
dim.wid = max(dim.wid, dimup.width());
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);
}
}
-
-bool InsetMathScript::hasLimits() const
+bool InsetMathScript::hasLimits(FontInfo const & font) const
{
- // obvious cases
- if (limits_ == 1)
- return true;
- if (limits_ == -1)
+ if (font.style() != DISPLAY_STYLE)
return false;
-
- // we can only display limits if the nucleus wants some
if (nuc().empty())
return false;
- if (!nuc().back()->isScriptable())
- return false;
- if (nuc().back()->asSymbolInset()) {
- // \intop is an alias for \int\limits, \ointop == \oint\limits
- if (nuc().back()->asSymbolInset()->name().find(from_ascii("intop")) != string::npos)
- return true;
- // per default \int has limits beside the \int even in displayed formulas
- if (nuc().back()->asSymbolInset()->name().find(from_ascii("int")) != string::npos)
- return false;
- }
-
- // assume "real" limits for everything else
- return true;
+ Limits const lim = nuc().back()->limits() == AUTO_LIMITS
+ ? nuc().back()->defaultLimits() : nuc().back()->limits();
+ LASSERT(lim != AUTO_LIMITS, return false);
+ return lim == LIMITS;
}
return false;
// go up/down only if in the last position
// or in the first position of something with displayed limits
- if (cur.pos() == cur.lastpos() || (cur.pos() == 0 && hasLimits())) {
+ if (cur.pos() == cur.lastpos()
+ || (cur.pos() == 0 && has_limits_)) {
cur.idx() = idxOfScript(up);
cur.pos() = 0;
return true;
{
MathEnsurer ensurer(os);
- if (!nuc().empty()) {
+ if (!nuc().empty())
os << nuc();
- //if (nuc().back()->takesLimits()) {
- if (limits_ == -1)
- os << "\\nolimits ";
- if (limits_ == 1)
- os << "\\limits ";
- //}
- } else {
- if (os.firstitem())
- LYXERR(Debug::MATHED, "suppressing {} when writing");
- else
- os << "{}";
- }
+ else if (os.firstitem())
+ LYXERR(Debug::MATHED, "suppressing {} when writing");
+ else
+ os << "{}";
if (hasDown() /*&& !down().empty()*/)
os << "_{" << down() << '}';
}
-void InsetMathScript::mathmlize(MathStream & os) const
+void InsetMathScript::mathmlize(MathStream & ms) const
{
bool d = hasDown() && !down().empty();
bool u = hasUp() && !up().empty();
- bool l = hasLimits();
+ // FIXME: the MathStream should be able to give us this information
+ bool l = has_limits_;
if (u && d)
- os << MTag(l ? "munderover" : "msubsup");
+ ms << MTag(l ? "munderover" : "msubsup");
else if (u)
- os << MTag(l ? "mover" : "msup");
+ ms << MTag(l ? "mover" : "msup");
else if (d)
- os << MTag(l ? "munder" : "msub");
+ ms << MTag(l ? "munder" : "msub");
if (!nuc().empty())
- os << MTag("mrow") << nuc() << ETag("mrow");
+ ms << MTag("mrow") << nuc() << ETag("mrow");
else
- os << "<mrow />";
+ ms << "<" << from_ascii(ms.namespacedTag("mrow")) << " />";
if (u && d)
- os << MTag("mrow") << down() << ETag("mrow")
- << MTag("mrow") << up() << ETag("mrow")
+ ms << 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");
+ ms << MTag("mrow") << up() << ETag("mrow") << ETag(l ? "mover" : "msup");
else if (d)
- os << MTag("mrow") << down() << ETag("mrow") << ETag(l ? "munder" : "msub");
+ ms << MTag("mrow") << down() << ETag("mrow") << ETag(l ? "munder" : "msub");
}
void InsetMathScript::infoize2(odocstream & os) const
{
- if (limits_)
- os << from_ascii(limits_ == 1 ? ", Displayed limits" : ", Inlined limits");
+ os << from_ascii(has_limits_ == 1 ? ", Displayed limits" : ", Inlined limits");
}
}
-void InsetMathScript::doDispatch(Cursor & cur, FuncRequest & cmd)
-{
- //LYXERR("InsetMathScript: request: " << cmd);
-
- if (cmd.action() == LFUN_MATH_LIMITS) {
- cur.recordUndoInset();
- if (!cmd.argument().empty()) {
- if (cmd.argument() == "limits")
- limits_ = 1;
- else if (cmd.argument() == "nolimits")
- limits_ = -1;
- else
- limits_ = 0;
- } else if (limits_ == 0)
- limits_ = hasLimits() ? -1 : 1;
- else
- limits_ = 0;
- return;
- }
-
- InsetMathNest::doDispatch(cur, cmd);
-}
-
-
-bool InsetMathScript::getStatus(Cursor & cur, FuncRequest const & cmd,
- 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);
- return true;
- }
-
- return InsetMathNest::getStatus(cur, cmd, flag);
-}
-
-
// the idea for dual scripts came from the eLyXer code
void InsetMathScript::validate(LaTeXFeatures & features) const
{
projects / lyx.git / blobdiff