+#include <config.h>
+
#include "math_gridinset.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
using std::min;
using std::vector;
using std::istream;
+using std::auto_ptr;
+using std::endl;
class GridInsetMailer : public MailInset {
setDefaults();
valign(v);
halign(h);
- //lyxerr << "created grid with " << ncols() << " columns\n";
+ //lyxerr << "created grid with " << ncols() << " columns" << endl;
}
}
-InsetBase * MathGridInset::clone() const
+auto_ptr<InsetBase> MathGridInset::clone() const
{
- return new MathGridInset(*this);
+ return auto_ptr<InsetBase>(new MathGridInset(*this));
}
void MathGridInset::setDefaults()
{
if (ncols() <= 0)
- lyxerr << "positive number of columns expected\n";
+ lyxerr << "positive number of columns expected" << endl;
//if (nrows() <= 0)
- // lyxerr << "positive number of rows expected\n";
+ // lyxerr << "positive number of rows expected" << endl;
for (col_type col = 0; col < ncols(); ++col) {
colinfo_[col].align_ = defaultColAlign(col);
colinfo_[col].skip_ = defaultColSpace(col);
++col;
colinfo_[col].lines_ = 0;
} else {
- lyxerr << "unknown column separator: '" << c << "'\n";
+ lyxerr << "unknown column separator: '" << c << "'" << endl;
}
}
return DISPATCHED_POP;
case LFUN_CELL_SPLIT:
- //bv->lockedInsetStoreUndo(Undo::EDIT);
+ //recordUndo(bv, Undo::ATOMIC);
splitCell(idx, pos);
return DISPATCHED_POP;
case LFUN_BREAKLINE: {
- //bv->lockedInsetStoreUndo(Undo::INSERT);
+ //recordUndo(bv, Undo::INSERT);
row_type const r = row(idx);
addRow(r);
}
case LFUN_TABULAR_FEATURE: {
- //lyxerr << "handling tabular-feature " << cmd.argument << "\n";
+ //lyxerr << "handling tabular-feature " << cmd.argument << endl;
istringstream is(STRCONV(cmd.argument));
string s;
is >> s;
if (s == "valign-top")
valign('t');
- else if (s == "valign-center")
+ else if (s == "valign-middle")
valign('c');
else if (s == "valign-bottom")
valign('b');
swapCol(col(idx));
else
return UNDISPATCHED;
- lyxerr << "returning DISPATCHED_POP\n";
+ lyxerr << "returning DISPATCHED_POP" << endl;
return DISPATCHED_POP;
}
case LFUN_PASTE: {
- //lyxerr << "pasting '" << cmd.argument << "'\n";
+ //lyxerr << "pasting '" << cmd.argument << "'" << endl;
MathGridInset grid(1, 1);
mathed_parse_normal(grid, cmd.argument);
if (grid.nargs() == 1) {