#include <config.h>
+#include "BufferView.h"
+#include "Cursor.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
+#include "InsetMathFont.h"
#include "InsetMathScript.h"
+#include "InsetMathSymbol.h"
#include "MathData.h"
#include "MathStream.h"
#include "MathSupport.h"
-#include "InsetMathSymbol.h"
-#include "InsetMathFont.h"
-#include "DispatchResult.h"
-#include "Cursor.h"
-#include "debug.h"
-#include "FuncRequest.h"
-#include "Undo.h"
-#include <boost/assert.hpp>
+#include "support/debug.h"
+#include <boost/assert.hpp>
-namespace lyx {
+#include <ostream>
-using std::string;
-using std::max;
-using std::auto_ptr;
-using std::endl;
+using namespace std;
+namespace lyx {
InsetMathScript::InsetMathScript()
}
-auto_ptr<Inset> InsetMathScript::doClone() const
+Inset * InsetMathScript::clone() const
{
- return auto_ptr<Inset>(new InsetMathScript(*this));
+ return new InsetMathScript(*this);
}
} // namespace anon
-int InsetMathScript::dy01(int asc, int des, int what) const
+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;
if (hasDown()) {
- dasc = down().ascent();
+ Dimension const & dimdown = down().dimension(bv);
+ dasc = dimdown.ascent();
slevel = nuc().slevel();
int ascdrop = dasc - slevel;
int desdrop = isCharBox ? 0 : des + nuc().sshift();
des = max(mindes, des);
}
if (hasUp()) {
+ Dimension const & dimup = up().dimension(bv);
int minasc = nuc().minasc();
int ascdrop = isCharBox ? 0 : asc - up().mindes();
- int udes = up().descent();
+ int udes = dimup.descent();
asc = udes + nuc().sshift();
asc = max(ascdrop, asc);
asc = max(minasc, asc);
}
-int InsetMathScript::dy0() const
+int InsetMathScript::dy0(BufferView const & bv) const
{
- int nd = ndes();
+ int nd = ndes(bv);
if (!hasDown())
return nd;
- int des = down().ascent();
+ int des = down().dimension(bv).ascent();
if (hasLimits())
des += nd + 2;
else {
- int na = nasc();
- des = dy01(na, nd, 0);
+ int na = nasc(bv);
+ des = dy01(bv, na, nd, 0);
}
return des;
}
-int InsetMathScript::dy1() const
+int InsetMathScript::dy1(BufferView const & bv) const
{
- int na = nasc();
+ int na = nasc(bv);
if (!hasUp())
return na;
- int asc = up().descent();
+ int asc = up().dimension(bv).descent();
if (hasLimits())
asc += na + 2;
else {
- int nd = ndes();
- asc = dy01(na, nd, 1);
+ int nd = ndes(bv);
+ asc = dy01(bv, na, nd, 1);
}
asc = max(asc, 5);
return asc;
}
-int InsetMathScript::dx0() const
+int InsetMathScript::dx0(BufferView const & bv) const
{
BOOST_ASSERT(hasDown());
- return hasLimits() ? (dim_.wid - down().width()) / 2 : nwid();
+ Dimension const dim = dimension(bv);
+ return hasLimits() ? (dim.wid - down().dimension(bv).width()) / 2 : nwid(bv);
}
-int InsetMathScript::dx1() const
+int InsetMathScript::dx1(BufferView const & bv) const
{
BOOST_ASSERT(hasUp());
- return hasLimits() ? (dim_.wid - up().width()) / 2 : nwid() + nker();
+ Dimension const dim = dimension(bv);
+ return hasLimits() ? (dim.wid - up().dimension(bv).width()) / 2 : nwid(bv) + nker(&bv);
}
-int InsetMathScript::dxx() const
+int InsetMathScript::dxx(BufferView const & bv) const
{
- return hasLimits() ? (dim_.wid - nwid()) / 2 : 0;
+ Dimension const dim = dimension(bv);
+ return hasLimits() ? (dim.wid - nwid(bv)) / 2 : 0;
}
-int InsetMathScript::nwid() const
+int InsetMathScript::nwid(BufferView const & bv) const
{
- return nuc().size() ? nuc().width() : 2;
+ return nuc().size() ? nuc().dimension(bv).width() : 2;
}
-int InsetMathScript::nasc() const
+int InsetMathScript::nasc(BufferView const & bv) const
{
- return nuc().size() ? nuc().ascent() : 5;
+ return nuc().size() ? nuc().dimension(bv).ascent() : 5;
}
-int InsetMathScript::ndes() const
+int InsetMathScript::ndes(BufferView const & bv) const
{
- return nuc().size() ? nuc().descent() : 0;
+ return nuc().size() ? nuc().dimension(bv).descent() : 0;
}
-int InsetMathScript::nker() const
+int InsetMathScript::nker(BufferView const * bv) const
{
if (nuc().size()) {
- int kerning = nuc().kerning();
+ int kerning = nuc().kerning(bv);
return kerning > 0 ? kerning : 0;
}
return 0;
}
-bool InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
{
- cell(0).metrics(mi);
+ Dimension dim0;
+ Dimension dim1;
+ Dimension dim2;
+ cell(0).metrics(mi, dim0);
ScriptChanger dummy(mi.base);
if (nargs() > 1)
- cell(1).metrics(mi);
+ cell(1).metrics(mi, dim1);
if (nargs() > 2)
- cell(2).metrics(mi);
+ cell(2).metrics(mi, dim2);
+
dim.wid = 0;
+ BufferView & bv = *mi.base.bv;
+ // FIXME: data copying... not very efficient.
+ Dimension dimup;
+ Dimension dimdown;
+ if (hasUp())
+ dimup = up().dimension(bv);
+ if (hasDown())
+ dimdown = down().dimension(bv);
+
if (hasLimits()) {
- dim.wid = nwid();
+ dim.wid = nwid(bv);
if (hasUp())
- dim.wid = max(dim.wid, up().width());
+ dim.wid = max(dim.wid, dimup.width());
if (hasDown())
- dim.wid = max(dim.wid, down().width());
+ dim.wid = max(dim.wid, dimdown.width());
} else {
if (hasUp())
- dim.wid = max(dim.wid, nker() + up().width());
+ dim.wid = max(dim.wid, nker(mi.base.bv) + dimup.width());
if (hasDown())
- dim.wid = max(dim.wid, down().width());
- dim.wid += nwid();
+ dim.wid = max(dim.wid, dimdown.width());
+ dim.wid += nwid(bv);
}
- int na = nasc();
+ int na = nasc(bv);
if (hasUp()) {
- int asc = dy1() + up().ascent();
+ int asc = dy1(bv) + dimup.ascent();
dim.asc = max(na, asc);
} else
dim.asc = na;
- int nd = ndes();
+ int nd = ndes(bv);
if (hasDown()) {
- int des = dy0() + down().descent();
+ int des = dy0(bv) + dimdown.descent();
dim.des = max(nd, des);
} else
dim.des = nd;
metricsMarkers(dim);
- if (dim_ == dim)
- return false;
- dim_ = dim;
- return true;
}
void InsetMathScript::draw(PainterInfo & pi, int x, int y) const
{
+ BufferView & bv = *pi.base.bv;
if (nuc().size())
- nuc().draw(pi, x + dxx(), y);
+ nuc().draw(pi, x + dxx(bv), y);
else {
- nuc().setXY(*pi.base.bv, x + dxx(), y);
- if (editing(pi.base.bv))
- pi.draw(x + dxx(), y, char_type('.'));
+ nuc().setXY(bv, x + dxx(bv), y);
+ if (editing(&bv))
+ pi.draw(x + dxx(bv), y, char_type('.'));
}
ScriptChanger dummy(pi.base);
if (hasUp())
- up().draw(pi, x + dx1(), y - dy1());
+ up().draw(pi, x + dx1(bv), y - dy1(bv));
if (hasDown())
- down().draw(pi, x + dx0(), y + dy0());
+ 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())
- nuc().drawT(pain, x + dxx(), y);
+ nuc().drawT(pain, x + 1, y);
if (hasUp())
- up().drawT(pain, x + dx1(), y - dy1());
+ up().drawT(pain, x + 1, y - 1 /*dy1()*/);
if (hasDown())
- down().drawT(pain, x + dx0(), y + dy0());
+ down().drawT(pain, x + 1, y + 1 /*dy0()*/);
}
bool InsetMathScript::hasUp() const
{
- //lyxerr << "1up: " << bool(cell_1_is_up_) << endl;
- //lyxerr << "hasUp: " << bool(idxOfScript(true)) << endl;
+ //lyxerr << "1up: " << bool(cell_1_is_up_));
+ //lyxerr << "hasUp: " << bool(idxOfScript(true)));
return idxOfScript(true);
}
bool InsetMathScript::hasDown() const
{
- //lyxerr << "1up: " << bool(cell_1_is_up_) << endl;
- //lyxerr << "hasDown: " << bool(idxOfScript(false)) << endl;
+ //LYXERR0("1up: " << bool(cell_1_is_up_));
+ //LYXERR0("hasDown: " << bool(idxOfScript(false)));
return idxOfScript(false);
}
}
-bool InsetMathScript::idxRight(Cursor &) const
+bool InsetMathScript::idxForward(Cursor &) const
{
return false;
}
-bool InsetMathScript::idxLeft(Cursor &) const
+bool InsetMathScript::idxBackward(Cursor &) const
{
return false;
}
}
// Are we 'up'?
- if (has(up) && cur.idx() == idxOfScript(true)) {
+ if (cur.idx() == idxOfScript(true)) {
// can't go further up
if (up)
return false;
}
// Are we 'down'?
- if (has(up) && cur.idx() == idxOfScript(false)) {
+ if (cur.idx() == idxOfScript(false)) {
// can't go further down
if (!up)
return false;
//}
} else {
if (os.firstitem())
- LYXERR(Debug::MATHED) << "suppressing {} when writing"
- << endl;
+ LYXERR(Debug::MATHED, "suppressing {} when writing");
else
os << "{}";
}
void InsetMathScript::infoize2(odocstream & os) const
{
if (limits_)
- os << (limits_ == 1 ? ", Displayed limits" : ", Inlined limits");
+ os << from_ascii(limits_ == 1 ? ", Displayed limits" : ", Inlined limits");
}
{
InsetMathNest::notifyCursorLeaves(cur);
- //lyxerr << "InsetMathScript::notifyCursorLeaves: 1 " << cur << endl;
+ //LYXERR0("InsetMathScript::notifyCursorLeaves: 1 " << cur);
+
+ // Remove empty scripts if possible:
- // remove empty scripts if possible
- if (nargs() > 2) {
- // Case of two scripts. In this case, 1 = super, 2 = sub
- if (cur.idx() == 2 && cell(2).empty()) {
+ // The case of two scripts, but only one got empty (1 = super, 2 = sub).
+ // We keep the script inset, but remove the empty script.
+ if (nargs() > 2 && (!cell(1).empty() || !cell(2).empty())) {
+ if (cell(2).empty()) {
// must be a subscript...
- recordUndoInset(cur);
removeScript(false);
+ cur.updateFlags(cur.disp_.update() | Update::SinglePar);
return true;
- } else if (cur.idx() == 1 && cell(1).empty()) {
+ } else if (cell(1).empty()) {
// must be a superscript...
- recordUndoInset(cur);
removeScript(true);
+ cur.updateFlags(cur.disp_.update() | Update::SinglePar);
return true;
}
- } else if (nargs() > 1 && cur.idx() == 1 && cell(1).empty()) {
- // could be either subscript or super script
- recordUndoInset(cur);
- removeScript(cell_1_is_up_);
+ }
+ // Now the two suicide cases:
+ // * we have only one script which is empty
+ // * we have two scripts which are both empty.
+ // The script inset is removed completely.
+ if ((nargs() == 2 && cell(1).empty())
+ || (nargs() == 3 && cell(1).empty() && cell(2).empty())) {
+ // Make undo step. We cannot use cur for this because
+ // it does not necessarily point to us. The BufferView
+ // cursor though should do.
+ int scriptSlice
+ = cur.bv().cursor().find(this);
+ BOOST_ASSERT(scriptSlice != -1);
+ Cursor & bvCur = cur.bv().cursor();
+ bvCur.cutOff(scriptSlice);
+ bvCur.recordUndoInset();
+
// Let the script inset commit suicide. This is
// modelled on Cursor.pullArg(), but tries not to
// invoke notifyCursorLeaves again and does not touch
// cur (since the top slice will be deleted
- // afterwards))
+ // afterwards)
MathData ar = cell(0);
- Cursor tmpcur = cur;
- tmpcur.pop();
- tmpcur.cell().erase(tmpcur.pos());
- tmpcur.cell().insert(tmpcur.pos(), ar);
+ bvCur.pop();
+ bvCur.cell().erase(bvCur.pos());
+ bvCur.cell().insert(bvCur.pos(), ar);
+
+ // put cursor behind
+ bvCur.pos() += ar.size();
+
+ // redraw
+ cur.updateFlags(cur.disp_.update() | Update::SinglePar);
return true;
}
- //lyxerr << "InsetMathScript::notifyCursorLeaves: 2 " << cur << endl;
+ //LYXERR0("InsetMathScript::notifyCursorLeaves: 2 " << cur);
return false;
}
void InsetMathScript::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- //lyxerr << "InsetMathScript: request: " << cmd << std::endl;
+ //LYXERR("InsetMathScript: request: " << cmd);
if (cmd.action == LFUN_MATH_LIMITS) {
if (!cmd.argument().empty()) {
projects / lyx.git / blobdiff