+/**
+ * \file math_gridinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
#include "math_gridinset.h"
+#include "math_data.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
-#include "lyxfont.h"
+#include "dispatchresult.h"
+#include "debug.h"
#include "funcrequest.h"
+#include "LColor.h"
#include "frontends/Painter.h"
-#include "debug.h"
-#include "Lsstream.h"
-
+#include "support/std_sstream.h"
#include "insets/mailinset.h"
-using std::swap;
+using std::endl;
using std::max;
using std::min;
+using std::swap;
+
+using std::string;
+using std::auto_ptr;
+using std::istream;
+using std::istringstream;
+using std::ostringstream;
using std::vector;
///
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';
protected:
InsetBase & inset() const { return inset_; }
- MathGridInset & inset_;
+ MathGridInset & inset_;
};
return res;
}
+
+int extractInt(istream & is)
+{
+ int num = 1;
+ is >> num;
+ return (num == 0) ? 1 : num;
+}
+
}
+
//////////////////////////////////////////////////////////////
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;
}
}
}
-void MathGridInset::metrics(MathMetricsInfo & mi) const
+void MathGridInset::metrics(MetricsInfo & mi) const
{
// let the cells adjust themselves
MathNestInset::metrics(mi);
}
- 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::draw(MathPainterInfo & pi, int x, int y) const
+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)
cell(idx).draw(pi, x + cellXOffset(idx), y + cellYOffset(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,
+ LColor::foreground);
}
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,
+ LColor::foreground);
}
}
-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;
-
}
}
-dispatch_result MathGridInset::dispatch
- (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
+ idx_type & idx, pos_type & pos)
{
switch (cmd.action) {
case LFUN_MOUSE_RELEASE:
//if (cmd.button() == mouse_button::button3) {
- // GridInsetMailer mailer(*this);
- // mailer.showDialog();
- // return DISPATCHED;
+ // GridInsetMailer(*this).showDialog();
+ // return DispatchResult(true, true);
//}
- break;
+ return DispatchResult(false);
- case LFUN_INSET_DIALOG_UPDATE: {
- GridInsetMailer mailer(*this);
- mailer.updateDialog(cmd.view());
- break;
- }
+ case LFUN_INSET_DIALOG_UPDATE:
+ GridInsetMailer(*this).updateDialog(cmd.view());
+ return DispatchResult(false);
// insert file functions
case LFUN_DELETE_LINE_FORWARD:
idx = nargs() - 1;
if (pos > cell(idx).size())
pos = cell(idx).size();
- return DISPATCHED_POP;
+ return DispatchResult(true, FINISHED);
- case LFUN_TABINSERT:
- //bv->lockedInsetStoreUndo(Undo::EDIT);
+ case LFUN_CELL_SPLIT:
+ //recordUndo(bv, Undo::ATOMIC);
splitCell(idx, pos);
- return DISPATCHED_POP;
+ return DispatchResult(true, FINISHED);
case LFUN_BREAKLINE: {
- //bv->lockedInsetStoreUndo(Undo::INSERT);
+ //recordUndo(bv, Undo::INSERT);
row_type const r = row(idx);
addRow(r);
pos = cell(idx).size();
//mathcursor->normalize();
- return DISPATCHED_POP;
+ return DispatchResult(true, FINISHED);
}
- case LFUN_TABULAR_FEATURE:
- //lyxerr << "handling tabular-feature " << cmd.argument << "\n";
- if (cmd.argument == "valign-top")
+ case LFUN_TABULAR_FEATURE: {
+ //lyxerr << "handling tabular-feature " << cmd.argument << endl;
+ istringstream is(cmd.argument);
+ string s;
+ is >> s;
+ if (s == "valign-top")
valign('t');
- else if (cmd.argument == "valign-center")
+ else if (s == "valign-middle")
valign('c');
- else if (cmd.argument == "valign-bottom")
+ else if (s == "valign-bottom")
valign('b');
- else if (cmd.argument == "align-left")
+ else if (s == "align-left")
halign('l', col(idx));
- else if (cmd.argument == "align-right")
+ else if (s == "align-right")
halign('r', col(idx));
- else if (cmd.argument == "align-center")
+ else if (s == "align-center")
halign('c', col(idx));
- else if (cmd.argument == "append-row")
- addRow(row(idx));
- else if (cmd.argument == "delete-row") {
- delRow(row(idx));
- if (idx > nargs())
- idx -= ncols();
- } else if (cmd.argument == "copy-row")
- copyRow(row(idx));
- else if (cmd.argument == "swap-row")
+ else if (s == "append-row")
+ for (int i = 0, n = extractInt(is); i < n; ++i)
+ addRow(row(idx));
+ 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")
+ for (int i = 0, n = extractInt(is); i < n; ++i)
+ copyRow(row(idx));
+ else if (s == "swap-row")
swapRow(row(idx));
- else if (cmd.argument == "append-column") {
- row_type r = row(idx);
- col_type c = col(idx);
- addCol(c);
- idx = index(r, c);
- } else if (cmd.argument == "delete-column") {
- row_type r = row(idx);
- col_type c = col(idx);
- delCol(col(idx));
- idx = index(r, c);
- if (idx > nargs())
- idx -= ncols();
- } else if (cmd.argument == "copy-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")
+ for (int i = 0, n = extractInt(is); i < n; ++i) {
+ row_type r = row(idx);
+ col_type c = col(idx);
+ delCol(col(idx));
+ idx = index(r, c);
+ if (idx > nargs())
+ idx -= ncols();
+ }
+ else if (s == "copy-column")
copyCol(col(idx));
- else if (cmd.argument == "swap-column")
+ else if (s == "swap-column")
swapCol(col(idx));
else
- return UNDISPATCHED;
- return DISPATCHED_POP;
+ return DispatchResult(false);
+ lyxerr << "returning DispatchResult(true, FINISHED)" << endl;
+ return DispatchResult(true, FINISHED);
+ }
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) {
for (row_type r = 0; r < numrows; ++r) {
for (col_type c = 0; c < numcols; ++c) {
idx_type i = index(r + row(idx), c + col(idx));
- cell(i).append(grid.cell(grid.index(r, c)));
+ cell(i).insert(0, grid.cell(grid.index(r, c)));
}
// append the left over horizontal cells to the last column
idx_type i = index(r + row(idx), ncols() - 1);
for (col_type c = 0; c < grid.ncols(); ++c)
cell(i).append(grid.cell(grid.index(r, c)));
}
- return DISPATCHED_POP;
+ return DispatchResult(true, FINISHED);
}
default:
- return MathNestInset::dispatch(cmd, idx, pos);
+ return MathNestInset::priv_dispatch(cmd, idx, pos);
}
- return UNDISPATCHED;
}
projects / lyx.git / blobdiff