+/**
+ * \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 "BufferView.h"
+#include "cursor.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::vector;
+using std::swap;
+
+using std::string;
+using std::auto_ptr;
using std::istream;
+using std::istringstream;
+using std::ostringstream;
+using std::vector;
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';
protected:
InsetBase & inset() const { return inset_; }
- MathGridInset & inset_;
+ MathGridInset & inset_;
};
}
+//////////////////////////////////////////////////////////////
+
+
+MathGridInset::CellInfo::CellInfo()
+ : dummy_(false)
+{}
+
+
+
+
+//////////////////////////////////////////////////////////////
+
+
+MathGridInset::RowInfo::RowInfo()
+ : lines_(0), skip_(0)
+{}
+
+
+
int MathGridInset::RowInfo::skipPixels() const
{
return crskip_.inBP();
+//////////////////////////////////////////////////////////////
+
+
+MathGridInset::ColInfo::ColInfo()
+ : align_('c'), leftline_(false), rightline_(false), lines_(0)
+{}
+
+
//////////////////////////////////////////////////////////////
MathGridInset::MathGridInset(char v, string const & h)
- : MathNestInset(1), rowinfo_(1), colinfo_(1), cellinfo_(1)
+ : MathNestInset(guessColumns(h)),
+ rowinfo_(2),
+ colinfo_(guessColumns(h) + 1),
+ cellinfo_(1 * guessColumns(h))
{
setDefaults();
valign(v);
halign(h);
- //lyxerr << "created grid with " << ncols() << " columns\n";
+ //lyxerr << "created grid with " << ncols() << " columns" << endl;
}
MathGridInset::MathGridInset()
- : MathNestInset(1), rowinfo_(1), colinfo_(1), cellinfo_(1), v_align_('c')
+ : MathNestInset(1),
+ rowinfo_(1 + 1),
+ colinfo_(1 + 1),
+ cellinfo_(1),
+ v_align_('c')
{
setDefaults();
}
MathGridInset::MathGridInset(col_type m, row_type n)
: MathNestInset(m * n),
- rowinfo_(n), colinfo_(m), cellinfo_(m * n), v_align_('c')
+ rowinfo_(n + 1),
+ colinfo_(m + 1),
+ cellinfo_(m * n),
+ v_align_('c')
{
setDefaults();
}
MathGridInset::MathGridInset(col_type m, row_type n, char v, string const & h)
: MathNestInset(m * n),
- rowinfo_(n), colinfo_(m), cellinfo_(m * n), v_align_(v)
+ rowinfo_(n + 1),
+ colinfo_(m + 1),
+ cellinfo_(m * n),
+ v_align_(v)
{
setDefaults();
valign(v);
}
-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);
+ colinfo_[col].align_ = defaultColAlign(col);
+ colinfo_[col].skip_ = defaultColSpace(col);
}
}
{
col_type col = 0;
for (string::const_iterator it = hh.begin(); it != hh.end(); ++it) {
- if (col == ncols())
- addCol(ncols() - 1);
- char const c = *it;
- lyxerr << "handle column separator: '" << c << "'\n";
+ if (col >= ncols())
+ break;
+ char c = *it;
if (c == '|') {
colinfo_[col].lines_++;
} else if (c == 'c' || c == 'l' || c == 'r') {
- colinfo_[col].align = c;
+ colinfo_[col].align_ = c;
++col;
colinfo_[col].lines_ = 0;
} else {
- lyxerr << "unknown column separator: '" << c << "'\n";
+ lyxerr << "unknown column separator: '" << c << "'" << endl;
}
}
+/*
col_type n = hh.size();
- if (n >= ncols())
- n = ncols() - 1;
+ if (n > ncols())
+ n = ncols();
for (col_type col = 0; col < n; ++col)
- colinfo_[col].align = hh[col];
+ colinfo_[col].align_ = hh[col];
+*/
}
+MathGridInset::col_type MathGridInset::guessColumns(string const & hh) const
+{
+ col_type col = 0;
+ for (string::const_iterator it = hh.begin(); it != hh.end(); ++it)
+ if (*it == 'c' || *it == 'l' || *it == 'r')
+ ++col;
+ // let's have at least one column, even if we did not recognize its
+ // alignment
+ if (col == 0)
+ col = 1;
+ return col;
+}
+
void MathGridInset::halign(char h, col_type col)
{
- colinfo_[col].align = h;
+ colinfo_[col].align_ = h;
}
char MathGridInset::halign(col_type col) const
{
- return colinfo_[col].align;
+ return colinfo_[col].align_;
}
string res;
for (col_type col = 0; col < ncols(); ++col) {
res += string(colinfo_[col].lines_, '|');
- res += colinfo_[col].align;
+ res += colinfo_[col].align_;
}
- return res;
+ return res + string(colinfo_[ncols()].lines_, '|');
}
MathGridInset::col_type MathGridInset::ncols() const
{
- return colinfo_.size();
+ return colinfo_.size() - 1;
}
MathGridInset::row_type MathGridInset::nrows() const
{
- return rowinfo_.size();
+ return rowinfo_.size() - 1;
}
rowinfo_[row].descent_ = desc;
}
rowinfo_[0].ascent_ += hlinesep() * rowinfo_[0].lines_;
+ rowinfo_[nrows()].ascent_ = 0;
+ rowinfo_[nrows()].descent_ = 0;
// compute vertical offsets
rowinfo_[0].offset_ = 0;
- for (row_type row = 1; row < nrows(); ++row) {
+ for (row_type row = 1; row <= nrows(); ++row) {
rowinfo_[row].offset_ =
rowinfo_[row - 1].offset_ +
rowinfo_[row - 1].descent_ +
default:
h = rowinfo_[nrows() - 1].offset_ / 2;
}
- for (row_type row = 0; row < nrows(); ++row)
+ for (row_type row = 0; row <= nrows(); ++row)
rowinfo_[row].offset_ -= h;
wid = max(wid, cell(index(row, col)).width());
colinfo_[col].width_ = wid;
}
+ colinfo_[ncols()].width_ = 0;
// compute horizontal offsets
colinfo_[0].offset_ = border();
- for (col_type col = 1; col < ncols(); ++col) {
+ for (col_type col = 1; col <= ncols(); ++col) {
colinfo_[col].offset_ =
colinfo_[col - 1].offset_ +
colinfo_[col - 1].width_ +
}
- 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_
+ 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)
cell(idx).draw(pi, x + cellXOffset(idx), y + cellYOffset(idx));
- for (row_type row = 0; row < nrows(); ++row)
+ for (row_type row = 0; row <= nrows(); ++row)
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 (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) {
rowinfo_[row].descent_ = desc;
}
//rowinfo_[0].ascent_ += hlinesep() * rowinfo_[0].lines_;
+ rowinfo_[nrows()].ascent_ = 0;
+ rowinfo_[nrows()].descent_ = 0;
// compute vertical offsets
rowinfo_[0].offset_ = 0;
- for (row_type row = 1; row < nrows(); ++row) {
+ for (row_type row = 1; row <= nrows(); ++row) {
rowinfo_[row].offset_ =
rowinfo_[row - 1].offset_ +
rowinfo_[row - 1].descent_ +
default:
h = rowinfo_[nrows() - 1].offset_ / 2;
}
- for (row_type row = 0; row < nrows(); ++row)
+ for (row_type row = 0; row <= nrows(); ++row)
rowinfo_[row].offset_ -= h;
wid = max(wid, cell(index(row, col)).width());
colinfo_[col].width_ = wid;
}
+ colinfo_[ncols()].width_ = 0;
// compute horizontal offsets
colinfo_[0].offset_ = border();
- for (col_type col = 1; col < ncols(); ++col) {
+ for (col_type col = 1; col <= ncols(); ++col) {
colinfo_[col].offset_ =
colinfo_[col - 1].offset_ +
colinfo_[col - 1].width_ +
}
- 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;
-
}
swap(cellinfo_, new_cellinfo);
ColInfo inf;
- inf.skip_ = defaultColSpace(newcol);
- inf.align = defaultColAlign(newcol);
+ inf.skip_ = defaultColSpace(newcol);
+ inf.align_ = defaultColAlign(newcol);
colinfo_.insert(colinfo_.begin() + newcol, inf);
}
{
col_type c = col(idx);
int x = colinfo_[c].offset_;
- char align = colinfo_[c].align;
+ char align = colinfo_[c].align_;
if (align == 'r' || align == 'R')
x += colinfo_[c].width_ - cell(idx).width();
if (align == 'c' || align == 'C')
}
-bool MathGridInset::idxUpDown(idx_type & idx, pos_type & pos, bool up,
- int targetx) const
+bool MathGridInset::idxUpDown(LCursor & cur, bool up) const
{
if (up) {
- if (idx < ncols())
+ if (cur.idx() < ncols())
return false;
- idx -= ncols();
- pos = cell(idx).x2pos(targetx - cell(idx).xo());
- return true;
+ cur.idx() -= ncols();
} else {
- if (idx >= ncols() * (nrows() - 1))
+ if (cur.idx() >= ncols() * (nrows() - 1))
return false;
- idx += ncols();
- pos = cell(idx).x2pos(targetx - cell(idx).xo());
- return true;
+ cur.idx() += ncols();
}
+ cur.pos() = cur.cell().x2pos(cur.x_target() - cur.cell().xo());
+ return true;
}
-bool MathGridInset::idxLeft(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxLeft(LCursor & cur) const
{
// leave matrix if on the left hand edge
- if (col(idx) == 0)
+ if (cur.col() == 0)
return false;
- --idx;
- pos = cell(idx).size();
+ --cur.idx();
+ cur.pos() = cur.lastpos();
return true;
}
-bool MathGridInset::idxRight(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxRight(LCursor & cur) const
{
// leave matrix if on the right hand edge
- if (col(idx) + 1 == ncols())
+ if (cur.col() + 1 == ncols())
return false;
- ++idx;
- pos = 0;
+ ++cur.idx();
+ cur.pos() = 0;
return true;
}
-bool MathGridInset::idxFirst(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxFirst(LCursor & cur) const
{
switch (v_align_) {
case 't':
- idx = 0;
+ cur.idx() = 0;
break;
case 'b':
- idx = (nrows() - 1) * ncols();
+ cur.idx() = (nrows() - 1) * ncols();
break;
default:
- idx = ((nrows() - 1) / 2) * ncols();
+ cur.idx() = ((nrows() - 1) / 2) * ncols();
}
- pos = 0;
+ cur.pos() = 0;
return true;
}
-bool MathGridInset::idxLast(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxLast(LCursor & cur) const
{
switch (v_align_) {
case 't':
- idx = ncols() - 1;
+ cur.idx() = ncols() - 1;
break;
case 'b':
- idx = nargs() - 1;
+ cur.idx() = nargs() - 1;
break;
default:
- idx = ((nrows() - 1) / 2 + 1) * ncols() - 1;
+ cur.idx() = ((nrows() - 1) / 2 + 1) * ncols() - 1;
}
- pos = cell(idx).size();
+ cur.pos() = cur.lastpos();
return true;
}
-bool MathGridInset::idxHome(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxHome(LCursor & cur) const
{
- if (pos > 0) {
- pos = 0;
+ if (cur.pos() > 0) {
+ cur.pos() = 0;
return true;
}
- if (col(idx) > 0) {
- idx -= idx % ncols();
- pos = 0;
+ if (cur.col() > 0) {
+ cur.idx() -= cur.idx() % ncols();
+ cur.pos() = 0;
return true;
}
- if (idx > 0) {
- idx = 0;
- pos = 0;
+ if (cur.idx() > 0) {
+ cur.idx() = 0;
+ cur.pos() = 0;
return true;
}
return false;
}
-bool MathGridInset::idxEnd(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxEnd(LCursor & cur) const
{
- if (pos < cell(idx).size()) {
- pos = cell(idx).size();
+ if (cur.pos() < cur.lastpos()) {
+ cur.pos() = cur.lastpos();
return true;
}
- if (col(idx) < ncols() - 1) {
- idx = idx - idx % ncols() + ncols() - 1;
- pos = cell(idx).size();
+ if (cur.col() < ncols() - 1) {
+ cur.idx() = cur.idx() - cur.idx() % ncols() + ncols() - 1;
+ cur.pos() = cur.lastpos();
return true;
}
- if (idx < nargs() - 1) {
- idx = nargs() - 1;
- pos = cell(idx).size();
+ if (cur.idx() < nargs() - 1) {
+ cur.idx() = nargs() - 1;
+ cur.pos() = cur.lastpos();
return true;
}
return false;
// move cells if necessary
for (idx_type i = index(row(idx), 0); i < idx; ++i)
- std::swap(cell(i), cell(i + ncols()));
+ swap(cell(i), cell(i + ncols()));
delRow(row(idx));
if (!emptyline && row + 1 < nrows())
os << "\n";
}
- //string const s = verboseHLine(rowinfo_[nrows()].lines_);
- //if (!s.empty() && s != " ") {
- // if (os.fragile())
- // os << "\\protect";
- // os << "\\\\" << s;
- //}
+ string const s = verboseHLine(rowinfo_[nrows()].lines_);
+ if (!s.empty() && s != " ") {
+ if (os.fragile())
+ os << "\\protect";
+ os << "\\\\" << s;
+ }
}
}
-void MathGridInset::splitCell(idx_type & idx, pos_type & pos)
+void MathGridInset::splitCell(LCursor & cur)
{
- if (idx + 1 == nargs())
+ if (cur.idx() + 1 == nargs())
return;
- MathArray ar = cell(idx);
- ar.erase(0, pos);
- cell(idx).erase(pos, cell(idx).size());
- ++idx;
- pos = 0;
- cell(idx).insert(0, ar);
+ MathArray ar = cur.cell();
+ ar.erase(0, cur.pos());
+ cur.cell().erase(cur.pos(), cur.lastpos());
+ ++cur.idx();
+ cur.pos() = 0;
+ cur.cell().insert(0, ar);
}
-dispatch_result MathGridInset::dispatch
- (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+DispatchResult
+MathGridInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
{
+ //lyxerr << "*** MathGridInset: request: " << cmd << endl;
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 MathNestInset::priv_dispatch(cur, cmd);
- case LFUN_INSET_DIALOG_UPDATE: {
- GridInsetMailer mailer(*this);
- mailer.updateDialog(cmd.view());
- break;
- }
+ case LFUN_INSET_DIALOG_UPDATE:
+ GridInsetMailer(*this).updateDialog(&cur.bv());
+ return DispatchResult(false);
// insert file functions
case LFUN_DELETE_LINE_FORWARD:
// return;
//}
if (nrows() > 1)
- delRow(row(idx));
- if (idx >= nargs())
- idx = nargs() - 1;
- if (pos > cell(idx).size())
- pos = cell(idx).size();
- return DISPATCHED_POP;
+ delRow(cur.row());
+ if (cur.idx() > cur.lastidx())
+ cur.idx() = cur.lastidx();
+ if (cur.pos() > cur.lastpos())
+ cur.pos() = cur.lastpos();
+ return DispatchResult(true, FINISHED);
case LFUN_CELL_SPLIT:
- //bv->lockedInsetStoreUndo(Undo::EDIT);
- splitCell(idx, pos);
- return DISPATCHED_POP;
+ ////recordUndo(cur, Undo::ATOMIC);
+ splitCell(cur);
+ return DispatchResult(true, FINISHED);
case LFUN_BREAKLINE: {
- //bv->lockedInsetStoreUndo(Undo::INSERT);
- row_type const r = row(idx);
+ ////recordUndo(cur, Undo::INSERT);
+ row_type const r = cur.row();
addRow(r);
// split line
- for (col_type c = col(idx) + 1; c < ncols(); ++c)
- std::swap(cell(index(r, c)), cell(index(r + 1, c)));
+ for (col_type c = col(cur.idx()) + 1; c < ncols(); ++c)
+ swap(cell(index(r, c)), cell(index(r + 1, c)));
// split cell
- splitCell(idx, pos);
- std::swap(cell(idx), cell(idx + ncols() - 1));
- if (idx > 0)
- --idx;
- pos = cell(idx).size();
+ splitCell(cur);
+ swap(cell(cur.idx()), cell(cur.idx() + ncols() - 1));
+ if (cur.idx() > 0)
+ --cur.idx();
+ cur.idx() = cur.lastpos();
//mathcursor->normalize();
- return DISPATCHED_POP;
+ return DispatchResult(true, FINISHED);
}
case LFUN_TABULAR_FEATURE: {
- //lyxerr << "handling tabular-feature " << cmd.argument << "\n";
+ //lyxerr << "handling tabular-feature " << cmd.argument << endl;
istringstream is(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');
else if (s == "align-left")
- halign('l', col(idx));
+ halign('l', col(cur.idx()));
else if (s == "align-right")
- halign('r', col(idx));
+ halign('r', col(cur.idx()));
else if (s == "align-center")
- halign('c', col(idx));
+ halign('c', col(cur.idx()));
else if (s == "append-row")
for (int i = 0, n = extractInt(is); i < n; ++i)
- addRow(row(idx));
- else if (s == "delete-row")
+ addRow(cur.row());
+ else if (s == "delete-row")
for (int i = 0, n = extractInt(is); i < n; ++i) {
- delRow(row(idx));
- if (idx > nargs())
- idx -= ncols();
+ delRow(cur.row());
+ if (cur.idx() > nargs())
+ cur.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));
+ copyRow(cur.row());
else if (s == "swap-row")
- swapRow(row(idx));
- else if (s == "append-column")
+ swapRow(cur.row());
+ 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);
+ row_type r = cur.row();
+ col_type c = col(cur.idx());
addCol(c);
- idx = index(r, c);
+ cur.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);
- delCol(col(idx));
- idx = index(r, c);
- if (idx > nargs())
- idx -= ncols();
+ row_type r = cur.row();
+ col_type c = col(cur.idx());
+ delCol(col(cur.idx()));
+ cur.idx() = index(r, c);
+ if (cur.idx() > nargs())
+ cur.idx() -= ncols();
}
else if (s == "copy-column")
- copyCol(col(idx));
+ copyCol(col(cur.idx()));
else if (s == "swap-column")
- swapCol(col(idx));
+ swapCol(col(cur.idx()));
else
- return UNDISPATCHED;
- lyxerr << "returning DISPATCHED_POP\n";
- 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) {
// single cell/part of cell
- cell(idx).insert(pos, grid.cell(0));
- pos += grid.cell(0).size();
+ cur.cell().insert(cur.pos(), grid.cell(0));
+ cur.pos() += grid.cell(0).size();
} else {
// multiple cells
- col_type const numcols = min(grid.ncols(), ncols() - col(idx));
- row_type const numrows = min(grid.nrows(), nrows() - row(idx));
+ col_type const numcols = min(grid.ncols(), ncols() -
+col(cur.idx()));
+ row_type const numrows = min(grid.nrows(), nrows() -
+cur.row());
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)));
+ idx_type i = index(r + cur.row(), c + col(cur.idx()));
+ 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);
+ idx_type i = index(r + cur.row(), ncols() - 1);
for (MathInset::col_type c = numcols; c < grid.ncols(); ++c)
cell(i).append(grid.cell(grid.index(r, c)));
}
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(cur, cmd);
}
- return UNDISPATCHED;
}
projects / lyx.git / blobdiff