* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#include "BufferView.h"
-#include "Cursor.h"
-#include "DispatchResult.h"
-#include "FuncRequest.h"
-#include "InsetMathFont.h"
#include "InsetMathScript.h"
+
+#include "InsetMathBrace.h"
#include "InsetMathSymbol.h"
#include "MathData.h"
#include "MathStream.h"
#include "MathSupport.h"
-#include "support/debug.h"
+#include "BufferView.h"
+#include "Cursor.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+#include "support/debug.h"
+#include "support/gettext.h"
#include "support/lassert.h"
-#include <ostream>
using namespace std;
namespace lyx {
-InsetMathScript::InsetMathScript()
- : InsetMathNest(1), cell_1_is_up_(false), limits_(0)
+InsetMathScript::InsetMathScript(Buffer * buf)
+ : InsetMathNest(buf, 1), cell_1_is_up_(false), limits_(0)
{}
-InsetMathScript::InsetMathScript(bool up)
- : InsetMathNest(2), cell_1_is_up_(up), limits_(0)
+InsetMathScript::InsetMathScript(Buffer * buf, bool up)
+ : InsetMathNest(buf, 2), cell_1_is_up_(up), limits_(0)
{}
-InsetMathScript::InsetMathScript(MathAtom const & at, bool up)
- : InsetMathNest(2), cell_1_is_up_(up), limits_(0)
+InsetMathScript::InsetMathScript(Buffer * buf, MathAtom const & at, bool up)
+ : InsetMathNest(buf, 2), cell_1_is_up_(up), limits_(0)
{
- LASSERT(nargs() >= 1, /**/);
+ LATTEST(nargs() >= 1);
cell(0).push_back(at);
}
{
if (nargs() == 3)
return cell(2);
- LASSERT(nargs() > 1, /**/);
+ LBUFERR(nargs() > 1);
return cell(1);
}
{
if (nargs() == 3)
return cell(2);
- LASSERT(nargs() > 1, /**/);
+ LBUFERR(nargs() > 1);
return cell(1);
}
MathData const & InsetMathScript::up() const
{
- LASSERT(nargs() > 1, /**/);
+ LBUFERR(nargs() > 1);
return cell(1);
}
MathData & InsetMathScript::up()
{
- LASSERT(nargs() > 1, /**/);
+ LBUFERR(nargs() > 1);
return cell(1);
}
}
-namespace {
-
-bool isAlphaSymbol(MathAtom const & at)
-{
- if (at->asCharInset() ||
- (at->asSymbolInset() &&
- at->asSymbolInset()->isOrdAlpha()))
- return true;
-
- if (at->asFontInset()) {
- MathData const & ar = at->asFontInset()->cell(0);
- for (size_t i = 0; i < ar.size(); ++i) {
- if (!(ar[i]->asCharInset() ||
- (ar[i]->asSymbolInset() &&
- ar[i]->asSymbolInset()->isOrdAlpha())))
- return false;
- }
- return true;
- }
- return false;
-}
-
-} // namespace anon
-
-
int InsetMathScript::dy01(BufferView const & bv, int asc, int des, int what) const
{
int dasc = 0;
int slevel = 0;
- bool isCharBox = nuc().size() ? isAlphaSymbol(nuc().back()) : false;
+ bool isCharBox = !nuc().empty() ? isAlphaSymbol(nuc().back()) : false;
if (hasDown()) {
Dimension const & dimdown = down().dimension(bv);
dasc = dimdown.ascent();
int InsetMathScript::dx0(BufferView const & bv) const
{
- LASSERT(hasDown(), /**/);
+ 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);
}
int InsetMathScript::dx1(BufferView const & bv) const
{
- LASSERT(hasUp(), /**/);
+ 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::nwid(BufferView const & bv) const
{
- return nuc().size() ? nuc().dimension(bv).width() : 2;
+ return !nuc().empty() ? nuc().dimension(bv).width() : 2;
}
int InsetMathScript::nasc(BufferView const & bv) const
{
- return nuc().size() ? nuc().dimension(bv).ascent() : 5;
+ return !nuc().empty() ? nuc().dimension(bv).ascent() : 5;
}
int InsetMathScript::ndes(BufferView const & bv) const
{
- return nuc().size() ? nuc().dimension(bv).descent() : 0;
+ return !nuc().empty() ? nuc().dimension(bv).descent() : 0;
}
int InsetMathScript::nker(BufferView const * bv) const
{
- if (nuc().size()) {
- 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 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 {
+ // return the class of last element since this is the one that counts.
+ 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;
cell(0).metrics(mi, dim0);
- ScriptChanger dummy(mi.base);
+ Changer dummy = mi.base.changeScript();
if (nargs() > 1)
cell(1).metrics(mi, dim1);
if (nargs() > 2)
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(dim);
}
void InsetMathScript::draw(PainterInfo & pi, int x, int y) const
{
+ Changer dummy2 = pi.base.changeEnsureMath();
BufferView & bv = *pi.base.bv;
- if (nuc().size())
+ if (!nuc().empty())
nuc().draw(pi, x + dxx(bv), y);
else {
nuc().setXY(bv, x + dxx(bv), y);
if (editing(&bv))
pi.draw(x + dxx(bv), y, char_type('.'));
}
- ScriptChanger dummy(pi.base);
+ Changer dummy = pi.base.changeScript();
if (hasUp())
up().draw(pi, x + dx1(bv), y - dy1(bv));
if (hasDown())
down().draw(pi, x + dx0(bv), y + dy0(bv));
- drawMarkers(pi, x, y);
}
void InsetMathScript::drawT(TextPainter & pain, int x, int y) const
{
// FIXME: BROKEN
- if (nuc().size())
+ if (!nuc().empty())
nuc().drawT(pain, x + 1, y);
if (hasUp())
up().drawT(pain, x + 1, y - 1 /*dy1()*/);
return false;
// we can only display limits if the nucleus wants some
- if (!nuc().size())
+ if (nuc().empty())
return false;
if (!nuc().back()->isScriptable())
return false;
return (cell_1_is_up_ == up) ? 1 : 0;
if (nargs() == 3)
return up ? 1 : 2;
- LASSERT(false, /**/);
- // Silence compiler
- return 0;
+ LASSERT(false, return 0);
}
{
MathEnsurer ensurer(os);
- if (nuc().size()) {
+ if (!nuc().empty()) {
os << nuc();
//if (nuc().back()->takesLimits()) {
if (limits_ == -1)
os << "{}";
}
- if (hasDown() /*&& down().size()*/)
+ if (hasDown() /*&& !down().empty()*/)
os << "_{" << down() << '}';
- if (hasUp() /*&& up().size()*/)
- os << "^{" << up() << '}';
+ if (hasUp() /*&& !up().empty()*/) {
+ // insert space if up() is empty or an empty brace inset
+ // (see bug 8305)
+ if (os.latex() && (up().empty() ||
+ (up().size() == 1 && up().back()->asBraceInset() &&
+ up().back()->asBraceInset()->cell(0).empty())))
+ os << "^ {}";
+ else
+ os << "^{" << up() << '}';
+ }
if (lock_ && !os.latex())
os << "\\lyxlock ";
void InsetMathScript::normalize(NormalStream & os) const
{
- bool d = hasDown() && down().size();
- bool u = hasUp() && up().size();
+ bool d = hasDown() && !down().empty();
+ bool u = hasUp() && !up().empty();
if (u && d)
os << "[subsup ";
else if (d)
os << "[sub ";
- if (nuc().size())
+ if (!nuc().empty())
os << nuc() << ' ';
else
os << "[par]";
void InsetMathScript::maple(MapleStream & os) const
{
- if (nuc().size())
+ if (!nuc().empty())
os << nuc();
- if (hasDown() && down().size())
+ if (hasDown() && !down().empty())
os << '[' << down() << ']';
- if (hasUp() && up().size())
+ if (hasUp() && !up().empty())
os << "^(" << up() << ')';
}
void InsetMathScript::mathematica(MathematicaStream & os) const
{
- bool d = hasDown() && down().size();
- bool u = hasUp() && up().size();
+ bool d = hasDown() && !down().empty();
+ bool u = hasUp() && !up().empty();
- if (nuc().size()) {
+ if (!nuc().empty()) {
if (d)
os << "Subscript[" << nuc();
else
if (u)
os << "^(" << up() << ')';
- if (nuc().size()) {
+ if (!nuc().empty()) {
if (d)
os << ',' << down() << ']';
}
void InsetMathScript::mathmlize(MathStream & os) const
{
- bool d = hasDown() && down().size();
- bool u = hasUp() && up().size();
+ bool d = hasDown() && !down().empty();
+ bool u = hasUp() && !up().empty();
+ bool l = hasLimits();
if (u && d)
- os << MTag("msubsup");
+ os << MTag(l ? "munderover" : "msubsup");
else if (u)
- os << MTag("msup");
+ os << MTag(l ? "mover" : "msup");
else if (d)
- os << MTag("msub");
+ os << MTag(l ? "munder" : "msub");
- if (nuc().size())
- os << nuc();
+ if (!nuc().empty())
+ os << MTag("mrow") << nuc() << ETag("mrow");
else
- os << "<mrow/>";
+ os << "<mrow />";
+
+ if (u && d)
+ 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");
+ else if (d)
+ os << MTag("mrow") << down() << ETag("mrow") << ETag(l ? "munder" : "msub");
+}
+
+
+void InsetMathScript::htmlize(HtmlStream & os) const
+{
+ bool d = hasDown() && !down().empty();
+ bool u = hasUp() && !up().empty();
+
+ if (!nuc().empty())
+ os << nuc();
if (u && d)
- os << down() << up() << ETag("msubsup");
+ os << MTag("span", "class='scripts'")
+ << MTag("span") << up() << ETag("span")
+ << MTag("span") << down() << ETag("span")
+ << ETag("span");
else if (u)
- os << up() << ETag("msup");
+ os << MTag("sup", "class='math'") << up() << ETag("sup");
else if (d)
- os << down() << ETag("msub");
+ os << MTag("sub", "class='math'") << down() << ETag("sub");
}
void InsetMathScript::octave(OctaveStream & os) const
{
- if (nuc().size())
+ if (!nuc().empty())
os << nuc();
- if (hasDown() && down().size())
+ if (hasDown() && !down().empty())
os << '[' << down() << ']';
- if (hasUp() && up().size())
+ if (hasUp() && !up().empty())
os << "^(" << up() << ')';
}
if (nargs() > 2 && (!cell(1).empty() || !cell(2).empty())) {
if (cell(2).empty()) {
// must be a subscript...
+ old.recordUndoInset();
removeScript(false);
- cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+ cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
return true;
} else if (cell(1).empty()) {
// must be a superscript...
+ old.recordUndoInset();
removeScript(true);
- cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+ cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
return true;
}
}
insetCur.cell().insert(insetCur.pos(), ar);
// redraw
- cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+ cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
return true;
}
{
//LYXERR("InsetMathScript: request: " << cmd);
- if (cmd.action == LFUN_MATH_LIMITS) {
+ if (cmd.action() == LFUN_MATH_LIMITS) {
+ cur.recordUndoInset();
if (!cmd.argument().empty()) {
if (cmd.argument() == "limits")
limits_ = 1;
}
+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
+{
+ if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+ features.addCSSSnippet(
+ "span.scripts{display: inline-block; vertical-align: middle; text-align:center; font-size: 75%;}\n"
+ "span.scripts span {display: block;}\n"
+ "sub.math{font-size: 75%;}\n"
+ "sup.math{font-size: 75%;}");
+ InsetMathNest::validate(features);
+}
+
} // namespace lyx
projects / lyx.git / blobdiff