}
-int InsetFormula::latex(Buffer const * buf, ostream & os, bool fragil, bool)
- const
+int InsetFormula::latex(Buffer const *, ostream & os, bool fragil, bool) const
{
- WriteStream wi(buf, os, fragil);
+ WriteStream wi(os, fragil);
par_->write(wi);
- return wi.line_;
+ return wi.line();
}
-int InsetFormula::ascii(Buffer const * buf, ostream & os, int) const
+int InsetFormula::ascii(Buffer const *, ostream & os, int) const
{
- WriteStream wi(buf, os, false);
+ WriteStream wi(os, false);
par_->write(wi);
- return wi.line_;
+ return wi.line();
}
{
MathMLStream ms(os);
ms << MTag("equation") << MTag("alt");
- int res = ascii(buf, ms.os_, 0);
+ int res = ascii(buf, ms.os(), 0);
ms << ETag("alt") << MTag("math");
ms << par_.nucleus();
ms << ETag("math") << ETag("equation");
- return ms.line_ + res;
+ return ms.line() + res;
}
void InsetFormula::draw(BufferView * bv, LyXFont const & font,
int y, float & xx, bool) const
{
- int x = int(xx) - 1;
- y -= 2;
+ int x = int(xx);
Painter & pain = bv->painter();
if (lcolor.getX11Name(LColor::mathbg)!=lcolor.getX11Name(LColor::background))
pain.fillRectangle(x, y - a, w, h, LColor::mathbg);
- if (mathcursor && mathcursor->formula() == this) {
+ if (mathcursor &&
+ const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
+ {
mathcursor->drawSelection(pain);
pain.rectangle(x, y - a, w, h, LColor::mathframe);
}
vector<string> const InsetFormula::getLabelList() const
{
- return mat()->getLabelList();
+ return hull()->getLabelList();
}
//lyxerr << "toggling all numbers\n";
if (display()) {
bv->lockedInsetStoreUndo(Undo::INSERT);
- bool old = mat()->numberedType();
+ bool old = hull()->numberedType();
for (MathInset::row_type row = 0; row < par_->nrows(); ++row)
- mat()->numbered(row, !old);
+ hull()->numbered(row, !old);
bv->owner()->message(old ? _("No number") : _("Number"));
updateLocal(bv, true);
}
//lyxerr << "toggling line number\n";
if (display()) {
bv->lockedInsetStoreUndo(Undo::INSERT);
- MathCursor::row_type row = mathcursor->row();
- bool old = mat()->numbered(row);
+ MathCursor::row_type row = mathcursor->hullRow();
+ bool old = hull()->numbered(row);
bv->owner()->message(old ? _("No number") : _("Number"));
- mat()->numbered(row, !old);
+ hull()->numbered(row, !old);
updateLocal(bv, true);
}
break;
{
bv->lockedInsetStoreUndo(Undo::INSERT);
- MathCursor::row_type row = mathcursor->row();
- string old_label = mat()->label(row);
+ MathCursor::row_type row = mathcursor->hullRow();
+ string old_label = hull()->label(row);
string new_label = arg;
if (new_label.empty()) {
pair<bool, string> const res = old_label.empty()
? Alert::askForText(_("Enter new label to insert:"), default_label)
: Alert::askForText(_("Enter label:"), old_label);
-
- lyxerr << "res: " << res.first << " - '" << res.second << "'\n";
if (!res.first)
break;
new_label = frontStrip(strip(res.second));
if (!new_label.empty()) {
lyxerr << "setting label to '" << new_label << "'\n";
- mat()->numbered(row, true);
+ hull()->numbered(row, true);
}
if (!new_label.empty() && bv->ChangeRefsIfUnique(old_label, new_label))
bv->redraw();
- mat()->label(row, new_label);
+ hull()->label(row, new_label);
updateLocal(bv, true);
break;
int x;
int y;
mathcursor->getPos(x, y);
- mat()->mutate(arg);
+ hull()->mutate(arg);
mathcursor->setPos(x, y);
mathcursor->normalize();
updateLocal(bv, true);
int x = 0;
int y = 0;
mathcursor->getPos(x, y);
- if (mat()->getType() == LM_OT_SIMPLE)
- mat()->mutate(LM_OT_EQUATION);
+ if (hull()->getType() == LM_OT_SIMPLE)
+ hull()->mutate(LM_OT_EQUATION);
else
- mat()->mutate(LM_OT_SIMPLE);
+ hull()->mutate(LM_OT_SIMPLE);
mathcursor->setPos(x, y);
mathcursor->normalize();
updateLocal(bv, true);
break;
}
- case LFUN_MATH_COLUMN_INSERT:
- {
- if (mat()->getType() == LM_OT_ALIGN)
- mat()->mutate(LM_OT_ALIGNAT);
- mat()->addCol(mat()->ncols());
- mathcursor->normalize();
- updateLocal(bv, true);
- break;
- }
-
default:
result = InsetFormulaBase::localDispatch(bv, action, arg);
}
bool needEqnArray(string const & extra)
{
- return false;
return extra == "dsolve";
}
MathArray ar;
if (needEqnArray(extra)) {
mathcursor->last();
- mathcursor->readLine(ar);
+ //mathcursor->readLine(ar);
mathcursor->breakLine();
} else if (selected) {
mathcursor->selGet(ar);
bool InsetFormula::display() const
{
- return mat()->getType() != LM_OT_SIMPLE;
+ return hull()->getType() != LM_OT_SIMPLE;
}
-MathHullInset const * InsetFormula::mat() const
+MathHullInset const * InsetFormula::hull() const
{
lyx::Assert(par_->asHullInset());
return par_->asHullInset();
}
-MathHullInset * InsetFormula::mat()
+MathHullInset * InsetFormula::hull()
{
lyx::Assert(par_->asHullInset());
return par_->asHullInset();
int InsetFormula::ascent(BufferView *, LyXFont const &) const
{
- return par_->ascent() + 2;
+ return par_->ascent() + 1;
}
int InsetFormula::descent(BufferView *, LyXFont const &) const
{
- return par_->descent() - 2;
+ return par_->descent() + 1;
}
MathInsetTypes InsetFormula::getType() const
{
- return mat()->getType();
+ return hull()->getType();
}