+#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 {
///
virtual string const & name() const
{
- static const string theName = "tabular";
+ static string const theName = "tabular";
return theName;
}
///
- virtual string const inset2string() const
+ virtual string const inset2string(Buffer const &) const
{
ostringstream data;
//data << name() << " active_cell " << inset.getActCell() << '\n';
data << name() << " active_cell " << 0 << '\n';
WriteStream ws(data);
inset_.write(ws);
- return data.str();
+ return STRCONV(data.str());
}
protected:
InsetBase & inset() const { return inset_; }
- MathGridInset & inset_;
+ MathGridInset & inset_;
};
setDefaults();
valign(v);
halign(h);
- //lyxerr << "created grid with " << ncols() << " columns\n";
+ //lyxerr << "created grid with " << ncols() << " columns" << endl;
}
}
-MathInset * 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;
}
}
}
- dim_.w = colinfo_[ncols() - 1].offset_
+ dim_.wid = colinfo_[ncols() - 1].offset_
+ colinfo_[ncols() - 1].width_
- + vlinesep() * colinfo_[ncols()].lines_
+ + vlinesep() * colinfo_[ncols()].lines_
+ border();
- dim_.a = - rowinfo_[0].offset_
+ dim_.asc = - rowinfo_[0].offset_
+ rowinfo_[0].ascent_
- + hlinesep() * rowinfo_[0].lines_
+ + hlinesep() * rowinfo_[0].lines_
+ border();
- dim_.d = rowinfo_[nrows() - 1].offset_
+ dim_.des = rowinfo_[nrows() - 1].offset_
+ rowinfo_[nrows() - 1].descent_
- + hlinesep() * rowinfo_[nrows()].lines_
+ + hlinesep() * rowinfo_[nrows()].lines_
+ border();
}
+void MathGridInset::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+ metrics(mi);
+ dim = dim_;
+}
+
+
void MathGridInset::draw(PainterInfo & pi, int x, int y) const
{
for (idx_type idx = 0; idx < nargs(); ++idx)
for (int i = 0; i < rowinfo_[row].lines_; ++i) {
int yy = y + rowinfo_[row].offset_ - rowinfo_[row].ascent_
- i * hlinesep() - hlinesep()/2 - rowsep()/2;
- pi.pain.line(x + 1, yy, x + width() - 1, yy);
+ pi.pain.line(x + 1, yy, x + dim_.width() - 1, yy);
}
for (col_type col = 0; col <= ncols(); ++col)
for (int i = 0; i < colinfo_[col].lines_; ++i) {
int xx = x + colinfo_[col].offset_
- i * vlinesep() - vlinesep()/2 - colsep()/2;
- pi.pain.line(xx, y - ascent() + 1, xx, y + descent() - 1);
+ pi.pain.line(xx, y - dim_.ascent() + 1, xx, y + dim_.descent() - 1);
}
}
-void MathGridInset::metricsT(TextMetricsInfo const & mi) const
+void MathGridInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
{
// let the cells adjust themselves
//MathNestInset::metrics(mi);
for (idx_type i = 0; i < nargs(); ++i)
- cell(i).metricsT(mi);
+ cell(i).metricsT(mi, dim);
// compute absolute sizes of vertical structure
for (row_type row = 0; row < nrows(); ++row) {
}
- dim_.w = colinfo_[ncols() - 1].offset_
+ dim.wid = colinfo_[ncols() - 1].offset_
+ colinfo_[ncols() - 1].width_
//+ vlinesep() * colinfo_[ncols()].lines_
+ 2;
- dim_.a = -rowinfo_[0].offset_
+ dim.asc = -rowinfo_[0].offset_
+ rowinfo_[0].ascent_
//+ hlinesep() * rowinfo_[0].lines_
+ 1;
- dim_.d = rowinfo_[nrows() - 1].offset_
+ dim.des = rowinfo_[nrows() - 1].offset_
+ rowinfo_[nrows() - 1].descent_
//+ hlinesep() * rowinfo_[nrows()].lines_
+ 1;
-
}
case LFUN_MOUSE_RELEASE:
//if (cmd.button() == mouse_button::button3) {
- // GridInsetMailer mailer(*this);
- // mailer.showDialog();
+ // GridInsetMailer(*this).showDialog();
// return DISPATCHED;
//}
- break;
+ return UNDISPATCHED;
- case LFUN_INSET_DIALOG_UPDATE: {
- GridInsetMailer mailer(*this);
- mailer.updateDialog(cmd.view());
- break;
- }
+ case LFUN_INSET_DIALOG_UPDATE:
+ GridInsetMailer(*this).updateDialog(cmd.view());
+ return UNDISPATCHED;
// insert file functions
case LFUN_DELETE_LINE_FORWARD:
pos = cell(idx).size();
return DISPATCHED_POP;
- case LFUN_TABINSERT:
- //bv->lockedInsetStoreUndo(Undo::EDIT);
+ case LFUN_CELL_SPLIT:
+ //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";
- istringstream is(cmd.argument);
+ //lyxerr << "handling tabular-feature " << cmd.argument << endl;
+ istringstream is(STRCONV(cmd.argument));
string s;
is >> s;
if (s == "valign-top")
else if (s == "append-row")
for (int i = 0, n = extractInt(is); i < n; ++i)
addRow(row(idx));
- else if (s == "delete-row")
+ else if (s == "delete-row")
for (int i = 0, n = extractInt(is); i < n; ++i) {
delRow(row(idx));
if (idx > nargs())
idx -= ncols();
}
- else if (s == "copy-row")
+ else if (s == "copy-row")
for (int i = 0, n = extractInt(is); i < n; ++i)
copyRow(row(idx));
else if (s == "swap-row")
swapRow(row(idx));
- else if (s == "append-column")
+ else if (s == "append-column")
for (int i = 0, n = extractInt(is); i < n; ++i) {
row_type r = row(idx);
col_type c = col(idx);
addCol(c);
idx = index(r, c);
}
- else if (s == "delete-column")
+ else if (s == "delete-column")
for (int i = 0, n = extractInt(is); i < n; ++i) {
row_type r = row(idx);
col_type c = col(idx);
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) {
default:
return MathNestInset::dispatch(cmd, idx, pos);
}
- return UNDISPATCHED;
}
projects / lyx.git / blobdiff