#include <vector>
+using namespace lyx::support;
+
using std::vector;
using std::max;
using std::endl;
using std::pair;
+using std::auto_ptr;
namespace {
if (s == "multline") return 8;
if (s == "gather") return 9;
if (s == "flalign") return 10;
- lyxerr << "unknown hull type '" << s << "'\n";
+ lyxerr << "unknown hull type '" << s << "'" << endl;
return 0;
}
}
-MathInset * MathHullInset::clone() const
+auto_ptr<InsetBase> MathHullInset::clone() const
{
- return new MathHullInset(*this);
+ return auto_ptr<InsetBase>(new MathHullInset(*this));
}
string MathHullInset::label(row_type row) const
{
row_type n = nrows();
- lyx::Assert(row < n);
+ Assert(row < n);
return label_[row];
}
if (colChangeOK())
MathGridInset::addCol(col);
else
- lyxerr << "Can't change number of columns in '" << type_ << "'\n";
+ lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
}
if (colChangeOK())
MathGridInset::delCol(col);
else
- lyxerr << "Can't change number of columns in '" << type_ << "'\n";
+ lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
}
void MathHullInset::mutate(string const & newtype)
{
- //lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'\n";
+ //lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
// we try to move along the chain
// none <-> simple <-> equation <-> eqnarray
void MathHullInset::check() const
{
- lyx::Assert(nonum_.size() == nrows());
- lyx::Assert(label_.size() == nrows());
+ Assert(nonum_.size() == nrows());
+ Assert(label_.size() == nrows());
}
//if (selection()) {
// MathArray ar;
// selGet(ar);
- // lyxerr << "use selection: " << ar << "\n";
+ // lyxerr << "use selection: " << ar << endl;
// insert(pipeThroughExtern(lang, extra, ar));
// return;
//}
asArray(mathcursor->grabAndEraseSelection(), ar);
} else if (pos == cell(idx).size()) {
ar = cell(idx);
- lyxerr << "use whole cell: " << ar << "\n";
+ lyxerr << "use whole cell: " << ar << endl;
} else {
ar = MathArray(cell(idx).begin() + pos + 1, cell(idx).end());
- lyxerr << "use partial cell form pos: " << pos << "\n";
+ lyxerr << "use partial cell form pos: " << pos << endl;
}
cell(idx).append(eq);
cell(idx).append(pipeThroughExtern(lang, extra, ar));
}
if (getType() == "equation") {
- lyxerr << "use equation inset\n";
+ lyxerr << "use equation inset" << endl;
mutate("eqnarray");
MathArray & ar = cell(idx);
- lyxerr << "use cell: " << ar << "\n";
+ lyxerr << "use cell: " << ar << endl;
cell(idx + 1) = eq;
cell(idx + 2) = pipeThroughExtern(lang, extra, ar);
// move to end of line
}
{
- lyxerr << "use eqnarray\n";
+ lyxerr << "use eqnarray" << endl;
idx -= idx % ncols();
idx += 2;
pos = 0;
MathArray ar = cell(idx);
- lyxerr << "use cell: " << ar << "\n";
+ lyxerr << "use cell: " << ar << endl;
#ifdef WITH_WARNINGS
#warning temporarily disabled
#endif
return MathGridInset::dispatch(cmd, idx, pos);
case LFUN_MATH_NUMBER:
- //lyxerr << "toggling all numbers\n";
+ //lyxerr << "toggling all numbers" << endl;
if (display()) {
- //bv->lockedInsetStoreUndo(Undo::INSERT);
+ //recordUndo(bv, Undo::INSERT);
bool old = numberedType();
if (type_ == "multline")
numbered(nrows() - 1, !old);
case LFUN_MATH_NONUMBER:
if (display()) {
row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
- //bv->lockedInsetStoreUndo(Undo::INSERT);
+ //recordUndo(bv, Undo::INSERT);
bool old = numbered(r);
//bv->owner()->message(old ? _("No number") : _("Number"));
numbered(r, !old);
? Alert::askForText(_("Enter new label to insert:"), default_label)
: Alert::askForText(_("Enter label:"), old_label);
if (!res.first)
- break;
+ return UNDISPATCHED;
new_label = trim(res.second);
}
if (!new_label.empty())
numbered(r, true);
-
-#warning FIXME: please check you really mean repaint() ... is it needed,
-#warning and if so, should it be update() instead ?
- if (!new_label.empty()
- && cmd.view()->ChangeRefsIfUnique(old_label, new_label))
- cmd.view()->repaint();
-
label(r, new_label);
return DISPATCHED;
}
default:
return MathGridInset::dispatch(cmd, idx, pos);
-
}
- return UNDISPATCHED;
}