-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "math_gridinset.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
#include "lyxfont.h"
-#include "Painter.h"
+#include "funcrequest.h"
+#include "frontends/Painter.h"
#include "debug.h"
+#include "Lsstream.h"
-namespace {
+#include "insets/mailinset.h"
+
+using std::swap;
+using std::max;
+using std::min;
+using std::vector;
+
+
+class GridInsetMailer : public MailInset {
+public:
+ GridInsetMailer(MathGridInset & inset) : inset_(inset) {}
+ ///
+ virtual string const & name() const
+ {
+ static const string theName = "tabular";
+ return theName;
+ }
+ ///
+ virtual string const inset2string() 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();
+ }
-///
-int const COLSEP = 6;
-///
-int const ROWSEP = 6;
-///
-int const HLINESEP = 3;
-///
-int const VLINESEP = 3;
-///
-int const BORDER = 2;
+protected:
+ InsetBase & inset() const { return inset_; }
+ MathGridInset & inset_;
+};
+void mathed_parse_normal(MathGridInset &, string const & argument);
+
+namespace {
+
string verboseHLine(int n)
{
string res;
for (int i = 0; i < n; ++i)
res += "\\hline";
- return res + ' ';
+ if (n)
+ res += ' ';
+ return res;
}
}
+//////////////////////////////////////////////////////////////
+
+
+MathGridInset::CellInfo::CellInfo()
+ : dummy_(false)
+{}
+
+
+
-//////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////
MathGridInset::RowInfo::RowInfo()
int MathGridInset::RowInfo::skipPixels() const
{
-#ifdef WITH_WARNINGS
-#warning fix this once the interface to LyXLength has improved
-#endif
- return int(crskip_.value());
+ return crskip_.inBP();
}
-//////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////
MathGridInset::ColInfo::ColInfo()
{}
-//////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////
MathGridInset::MathGridInset(char v, string const & h)
- : MathNestInset(guessColumns(h)), rowinfo_(2), colinfo_(guessColumns(h) + 1)
+ : MathNestInset(guessColumns(h)),
+ rowinfo_(2),
+ colinfo_(guessColumns(h) + 1),
+ cellinfo_(1 * guessColumns(h))
{
setDefaults();
- valign(v);
+ valign(v);
halign(h);
+ //lyxerr << "created grid with " << ncols() << " columns\n";
+}
+
+
+MathGridInset::MathGridInset()
+ : 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 + 1), colinfo_(m + 1), v_align_('c')
+ : MathNestInset(m * n),
+ 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 + 1), colinfo_(m + 1), v_align_(v)
+ : MathNestInset(m * n),
+ rowinfo_(n + 1),
+ colinfo_(m + 1),
+ cellinfo_(m * n),
+ v_align_(v)
{
setDefaults();
- valign(v);
+ valign(v);
halign(h);
}
+MathGridInset::~MathGridInset()
+{
+ GridInsetMailer mailer(*this);
+ mailer.hideDialog();
+}
+
+
+MathInset * MathGridInset::clone() const
+{
+ return new MathGridInset(*this);
+}
+
+
MathInset::idx_type MathGridInset::index(row_type row, col_type col) const
{
return col + ncols() * row;
{
if (ncols() <= 0)
lyxerr << "positive number of columns expected\n";
- if (nrows() <= 0)
- lyxerr << "positive number of rows expected\n";
+ //if (nrows() <= 0)
+ // lyxerr << "positive number of rows expected\n";
for (col_type col = 0; col < ncols(); ++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())
+ break;
char c = *it;
if (c == '|') {
colinfo_[col].lines_++;
++col;
colinfo_[col].lines_ = 0;
} else {
- lyxerr << "unkown column separator: '" << c << "'\n";
+ lyxerr << "unknown column separator: '" << c << "'\n";
}
}
-
+
/*
col_type n = hh.size();
if (n > ncols())
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;
}
for (col_type col = 0; col < ncols(); ++col) {
res += string(colinfo_[col].lines_, '|');
res += colinfo_[col].align_;
- }
+ }
return res + string(colinfo_[ncols()].lines_, '|');
}
}
-void MathGridInset::metrics(MathMetricsInfo const & mi) const
+void MathGridInset::metrics(MathMetricsInfo & mi) const
{
// let the cells adjust themselves
MathNestInset::metrics(mi);
int asc = 0;
int desc = 0;
for (col_type col = 0; col < ncols(); ++col) {
- MathXArray const & c = xcell(index(row, col));
- asc = std::max(asc, c.ascent());
- desc = std::max(desc, c.descent());
+ MathArray const & c = cell(index(row, col));
+ asc = max(asc, c.ascent());
+ desc = max(desc, c.descent());
}
rowinfo_[row].ascent_ = asc;
rowinfo_[row].descent_ = desc;
}
- rowinfo_[0].ascent_ += HLINESEP * rowinfo_[0].lines_;
+ 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) {
- rowinfo_[row].offset_ =
+ rowinfo_[row].offset_ =
rowinfo_[row - 1].offset_ +
rowinfo_[row - 1].descent_ +
rowinfo_[row - 1].skipPixels() +
- ROWSEP +
- rowinfo_[row].lines_ * HLINESEP +
+ rowsep() +
+ rowinfo_[row].lines_ * hlinesep() +
rowinfo_[row].ascent_;
}
}
for (row_type row = 0; row <= nrows(); ++row)
rowinfo_[row].offset_ -= h;
-
+
// compute absolute sizes of horizontal structure
for (col_type col = 0; col < ncols(); ++col) {
int wid = 0;
- for (row_type row = 0; row < nrows(); ++row)
- wid = std::max(wid, xcell(index(row, col)).width());
+ for (row_type row = 0; row < nrows(); ++row)
+ wid = max(wid, cell(index(row, col)).width());
colinfo_[col].width_ = wid;
}
colinfo_[ncols()].width_ = 0;
// compute horizontal offsets
- colinfo_[0].offset_ = BORDER;
+ colinfo_[0].offset_ = border();
for (col_type col = 1; col <= ncols(); ++col) {
colinfo_[col].offset_ =
colinfo_[col - 1].offset_ +
- colinfo_[col - 1].width_ +
+ colinfo_[col - 1].width_ +
colinfo_[col - 1].skip_ +
- COLSEP +
- colinfo_[col].lines_ * VLINESEP;
+ colsep() +
+ colinfo_[col].lines_ * vlinesep();
}
- width_ = colinfo_[ncols() - 1].offset_
- + colinfo_[ncols() - 1].width_
- + VLINESEP * colinfo_[ncols()].lines_
- + BORDER;
+ dim_.w = colinfo_[ncols() - 1].offset_
+ + colinfo_[ncols() - 1].width_
+ + vlinesep() * colinfo_[ncols()].lines_
+ + border();
- ascent_ = - rowinfo_[0].offset_
- + rowinfo_[0].ascent_
- + HLINESEP * rowinfo_[0].lines_
- + BORDER;
+ dim_.a = - rowinfo_[0].offset_
+ + rowinfo_[0].ascent_
+ + hlinesep() * rowinfo_[0].lines_
+ + border();
- descent_ = rowinfo_[nrows() - 1].offset_
- + rowinfo_[nrows() - 1].descent_
- + HLINESEP * rowinfo_[nrows()].lines_
- + BORDER;
+ dim_.d = rowinfo_[nrows() - 1].offset_
+ + rowinfo_[nrows() - 1].descent_
+ + hlinesep() * rowinfo_[nrows()].lines_
+ + border();
-/*
+/*
// Increase ws_[i] for 'R' columns (except the first one)
for (int i = 1; i < nc_; ++i)
if (align_[i] == 'R')
if (align_[0] == 'C')
if (ws_[0] < 7 * workwidth / 8)
ws_[0] = 7 * workwidth / 8;
-
+
// Adjust local tabs
- width = COLSEP;
- for (cxrow = row_.begin(); cxrow; ++cxrow) {
+ width = colsep();
+ for (cxrow = row_.begin(); cxrow; ++cxrow) {
int rg = COLSEP;
int lf = 0;
for (int i = 0; i < nc_; ++i) {
lf = 0;
break;
case 'c':
- lf = (ws_[i] - cxrow->getTab(i))/2;
+ lf = (ws_[i] - cxrow->getTab(i))/2;
break;
case 'r':
case 'R':
else if (cxrow.is_last())
lf = ws_[i] - cxrow->getTab(i);
else
- lf = (ws_[i] - cxrow->getTab(i))/2;
+ lf = (ws_[i] - cxrow->getTab(i))/2;
break;
}
int const ww = (isvoid) ? lf : lf + cxrow->getTab(i);
cxrow->setTab(i, lf + rg);
- rg = ws_[i] - ww + COLSEP;
+ rg = ws_[i] - ww + colsep();
if (cxrow == row_.begin())
- width += ws_[i] + COLSEP;
+ width += ws_[i] + colsep();
}
cxrow->setBaseline(cxrow->getBaseline() - ascent);
}
}
-void MathGridInset::draw(Painter & pain, int x, int y) const
+void MathGridInset::draw(MathPainterInfo & pi, int x, int y) const
{
for (idx_type idx = 0; idx < nargs(); ++idx)
- xcell(idx).draw(pain, x + cellXOffset(idx), y + cellYOffset(idx));
+ cell(idx).draw(pi, x + cellXOffset(idx), y + cellYOffset(idx));
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;
- pain.line(x + 1, yy, x + width_ - 1, yy);
+ - i * hlinesep() - hlinesep()/2 - rowsep()/2;
+ pi.pain.line(x + 1, yy, x + 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;
- pain.line(xx, y - ascent_ + 1, xx, y + descent_ - 1);
+ - i * vlinesep() - vlinesep()/2 - colsep()/2;
+ pi.pain.line(xx, y - ascent() + 1, xx, y + descent() - 1);
}
}
-string MathGridInset::eolString(row_type row) const
+void MathGridInset::metricsT(TextMetricsInfo const & mi) const
+{
+ // let the cells adjust themselves
+ //MathNestInset::metrics(mi);
+ for (idx_type i = 0; i < nargs(); ++i)
+ cell(i).metricsT(mi);
+
+ // compute absolute sizes of vertical structure
+ for (row_type row = 0; row < nrows(); ++row) {
+ int asc = 0;
+ int desc = 0;
+ for (col_type col = 0; col < ncols(); ++col) {
+ MathArray const & c = cell(index(row, col));
+ asc = max(asc, c.ascent());
+ desc = max(desc, c.descent());
+ }
+ rowinfo_[row].ascent_ = asc;
+ 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) {
+ rowinfo_[row].offset_ =
+ rowinfo_[row - 1].offset_ +
+ rowinfo_[row - 1].descent_ +
+ //rowinfo_[row - 1].skipPixels() +
+ 1 + //rowsep() +
+ //rowinfo_[row].lines_ * hlinesep() +
+ rowinfo_[row].ascent_;
+ }
+
+ // adjust vertical offset
+ int h = 0;
+ switch (v_align_) {
+ case 't':
+ h = 0;
+ break;
+ case 'b':
+ h = rowinfo_[nrows() - 1].offset_;
+ break;
+ default:
+ h = rowinfo_[nrows() - 1].offset_ / 2;
+ }
+ for (row_type row = 0; row <= nrows(); ++row)
+ rowinfo_[row].offset_ -= h;
+
+
+ // compute absolute sizes of horizontal structure
+ for (col_type col = 0; col < ncols(); ++col) {
+ int wid = 0;
+ for (row_type row = 0; row < nrows(); ++row)
+ 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) {
+ colinfo_[col].offset_ =
+ colinfo_[col - 1].offset_ +
+ colinfo_[col - 1].width_ +
+ colinfo_[col - 1].skip_ +
+ 1 ; //colsep() +
+ //colinfo_[col].lines_ * vlinesep();
+ }
+
+
+ dim_.w = colinfo_[ncols() - 1].offset_
+ + colinfo_[ncols() - 1].width_
+ //+ vlinesep() * colinfo_[ncols()].lines_
+ + 2;
+
+ dim_.a = -rowinfo_[0].offset_
+ + rowinfo_[0].ascent_
+ //+ hlinesep() * rowinfo_[0].lines_
+ + 1;
+
+ dim_.d = rowinfo_[nrows() - 1].offset_
+ + rowinfo_[nrows() - 1].descent_
+ //+ hlinesep() * rowinfo_[nrows()].lines_
+ + 1;
+
+}
+
+
+void MathGridInset::drawT(TextPainter & pain, int x, int y) const
+{
+ for (idx_type idx = 0; idx < nargs(); ++idx)
+ cell(idx).drawT(pain, x + cellXOffset(idx), y + cellYOffset(idx));
+}
+
+
+string MathGridInset::eolString(row_type row, bool fragile) const
{
string eol;
if (!rowinfo_[row].crskip_.zero())
- eol += "[" + rowinfo_[row].crskip_.asLatexString() + "]";
+ eol += '[' + rowinfo_[row].crskip_.asLatexString() + ']';
// make sure an upcoming '[' does not break anything
if (row + 1 < nrows()) {
MathArray const & c = cell(index(row + 1, 0));
if (c.size() && c.front()->getChar() == '[')
- eol += "[0pt]";
+ //eol += "[0pt]";
+ eol += "{}";
}
// only add \\ if necessary
if (eol.empty() && row + 1 == nrows())
return string();
- return "\\\\" + eol + '\n';
+ return (fragile ? "\\protect\\\\" : "\\\\") + eol;
}
-string MathGridInset::eocString(col_type col) const
+string MathGridInset::eocString(col_type col, col_type lastcol) const
{
- if (col + 1 == ncols())
+ if (col + 1 == lastcol)
return string();
return " & ";
}
void MathGridInset::addRow(row_type row)
{
rowinfo_.insert(rowinfo_.begin() + row + 1, RowInfo());
- cells_.insert(cells_.begin() + (row + 1) * ncols(), ncols(), MathXArray());
+ cells_.insert
+ (cells_.begin() + (row + 1) * ncols(), ncols(), MathArray());
+ cellinfo_.insert
+ (cellinfo_.begin() + (row + 1) * ncols(), ncols(), CellInfo());
}
void MathGridInset::appendRow()
{
rowinfo_.push_back(RowInfo());
- //cells_.insert(cells_.end(), ncols(), MathXArray());
- for (col_type col = 0; col < ncols(); ++col)
+ //cells_.insert(cells_.end(), ncols(), MathArray());
+ for (col_type col = 0; col < ncols(); ++col) {
cells_.push_back(cells_type::value_type());
+ cellinfo_.push_back(CellInfo());
+ }
}
if (nrows() == 1)
return;
- cells_type::iterator it = cells_.begin() + row * ncols();
+ cells_type::iterator it = cells_.begin() + row * ncols();
cells_.erase(it, it + ncols());
+ vector<CellInfo>::iterator jt = cellinfo_.begin() + row * ncols();
+ cellinfo_.erase(jt, jt + ncols());
+
rowinfo_.erase(rowinfo_.begin() + row);
}
+void MathGridInset::copyRow(row_type row)
+{
+ addRow(row);
+ for (col_type col = 0; col < ncols(); ++col)
+ cells_[(row + 1) * ncols() + col] = cells_[row * ncols() + col];
+}
+
+
+void MathGridInset::swapRow(row_type row)
+{
+ if (nrows() == 1)
+ return;
+ if (row + 1 == nrows())
+ --row;
+ for (col_type col = 0; col < ncols(); ++col)
+ swap(cells_[row * ncols() + col], cells_[(row + 1) * ncols() + col]);
+}
+
+
void MathGridInset::addCol(col_type newcol)
{
const col_type nc = ncols();
const row_type nr = nrows();
cells_type new_cells((nc + 1) * nr);
-
+ vector<CellInfo> new_cellinfo((nc + 1) * nr);
+
for (row_type row = 0; row < nr; ++row)
- for (col_type col = 0; col < nc; ++col)
+ for (col_type col = 0; col < nc; ++col) {
new_cells[row * (nc + 1) + col + (col > newcol)]
= cells_[row * nc + col];
- std::swap(cells_, new_cells);
+ new_cellinfo[row * (nc + 1) + col + (col > newcol)]
+ = cellinfo_[row * nc + col];
+ }
+ swap(cells_, new_cells);
+ swap(cellinfo_, new_cellinfo);
ColInfo inf;
inf.skip_ = defaultColSpace(newcol);
return;
cells_type tmpcells;
- for (col_type i = 0; i < nargs(); ++i)
- if (i % ncols() != col)
+ vector<CellInfo> tmpcellinfo;
+ for (col_type i = 0; i < nargs(); ++i)
+ if (i % ncols() != col) {
tmpcells.push_back(cells_[i]);
- std::swap(cells_, tmpcells);
+ tmpcellinfo.push_back(cellinfo_[i]);
+ }
+ swap(cells_, tmpcells);
+ swap(cellinfo_, tmpcellinfo);
colinfo_.erase(colinfo_.begin() + col);
}
+void MathGridInset::copyCol(col_type col)
+{
+ addCol(col);
+ for (row_type row = 0; row < nrows(); ++row)
+ cells_[row * ncols() + col + 1] = cells_[row * ncols() + col];
+}
+
+
+void MathGridInset::swapCol(col_type col)
+{
+ if (ncols() == 1)
+ return;
+ if (col + 1 == ncols())
+ --col;
+ for (row_type row = 0; row < nrows(); ++row)
+ swap(cells_[row * ncols() + col], cells_[row * ncols() + col + 1]);
+}
+
+
int MathGridInset::cellXOffset(idx_type idx) const
{
col_type c = col(idx);
int x = colinfo_[c].offset_;
char align = colinfo_[c].align_;
if (align == 'r' || align == 'R')
- x += colinfo_[c].width_ - xcell(idx).width();
+ x += colinfo_[c].width_ - cell(idx).width();
if (align == 'c' || align == 'C')
- x += (colinfo_[c].width_ - xcell(idx).width()) / 2;
+ x += (colinfo_[c].width_ - cell(idx).width()) / 2;
return x;
}
}
-bool MathGridInset::idxUp(idx_type & idx) const
+bool MathGridInset::idxUpDown(idx_type & idx, pos_type & pos, bool up,
+ int targetx) const
{
- if (idx < ncols())
- return false;
- idx -= ncols();
- return true;
+ if (up) {
+ if (idx < ncols())
+ return false;
+ idx -= ncols();
+ pos = cell(idx).x2pos(targetx - cell(idx).xo());
+ return true;
+ } else {
+ if (idx >= ncols() * (nrows() - 1))
+ return false;
+ idx += ncols();
+ pos = cell(idx).x2pos(targetx - cell(idx).xo());
+ return true;
+ }
}
-
-bool MathGridInset::idxDown(idx_type & idx) const
-{
- if (idx >= ncols() * (nrows() - 1))
- return false;
- idx += ncols();
- return true;
-}
-
-
+
bool MathGridInset::idxLeft(idx_type & idx, pos_type & pos) const
{
// leave matrix if on the left hand edge
pos = cell(idx).size();
return true;
}
-
-
+
+
bool MathGridInset::idxRight(idx_type & idx, pos_type & pos) const
{
// leave matrix if on the right hand edge
case 'b':
idx = (nrows() - 1) * ncols();
break;
- default:
- idx = (nrows() / 2) * ncols();
+ default:
+ idx = ((nrows() - 1) / 2) * ncols();
}
pos = 0;
return true;
idx = nargs() - 1;
break;
default:
- idx = (nrows() / 2 + 1) * ncols() - 1;
+ idx = ((nrows() - 1) / 2 + 1) * ncols() - 1;
}
pos = cell(idx).size();
return true;
}
-void MathGridInset::idxDelete(idx_type & idx, bool & popit, bool & deleteit)
+bool MathGridInset::idxDelete(idx_type & idx)
{
- popit = false;
- deleteit = false;
+ // nothing to do if we have just one row
+ if (nrows() == 1)
+ return false;
- // nothing to do if we are in the last row of the inset
- if (row(idx) + 1 == nrows())
- return;
+ // nothing to do if we are in the middle of the last row of the inset
+ if (idx + ncols() > nargs())
+ return false;
// try to delete entire sequence of ncols() empty cells if possible
for (idx_type i = idx; i < idx + ncols(); ++i)
if (cell(i).size())
- return;
+ return false;
// move cells if necessary
for (idx_type i = index(row(idx), 0); i < idx; ++i)
- cell(i).swap(cell(i + ncols()));
-
+ std::swap(cell(i), cell(i + ncols()));
+
delRow(row(idx));
if (idx >= nargs())
idx = nargs() - 1;
// undo effect of Ctrl-Tab (i.e. pull next cell)
- //if (idx + 1 != nargs())
+ //if (idx + 1 != nargs())
// cell(idx).swap(cell(idx + 1));
+
+ // we handled the event..
+ return true;
}
-void MathGridInset::idxDeleteRange(idx_type /*from*/, idx_type /*to*/)
+// reimplement old behaviour when pressing Delete in the last position
+// of a cell
+void MathGridInset::idxGlue(idx_type idx)
{
-// leave this unimplemented unless someone wants to have it.
-/*
- int n = (to - from) / ncols();
- int r = from / ncols();
-
- if (n >= 1) {
- cells_type::iterator it = cells_.begin() + from;
- cells_.erase(it, it + n * ncols());
- rowinfo_.erase(rowinfo_.begin() + r, rowinfo_.begin() + r + n);
+ col_type c = col(idx);
+ if (c + 1 == ncols()) {
+ if (row(idx) + 1 != nrows()) {
+ for (col_type cc = 0; cc < ncols(); ++cc)
+ cell(idx).append(cell(idx + cc + 1));
+ delRow(row(idx) + 1);
+ }
+ } else {
+ cell(idx).append(cell(idx + 1));
+ for (col_type cc = c + 2; cc < ncols(); ++cc)
+ cell(idx - c + cc - 1) = cell(idx - c + cc);
+ cell(idx - c + ncols() - 1).clear();
}
-*/
}
}
-std::vector<MathInset::idx_type>
- MathGridInset::idxBetween(idx_type from, idx_type to) const
+bool MathGridInset::idxBetween(idx_type idx, idx_type from, idx_type to) const
{
- row_type r1 = std::min(row(from), row(to));
- row_type r2 = std::max(row(from), row(to));
- col_type c1 = std::min(col(from), col(to));
- col_type c2 = std::max(col(from), col(to));
- std::vector<idx_type> res;
- for (row_type i = r1; i <= r2; ++i)
- for (col_type j = c1; j <= c2; ++j)
- res.push_back(index(i, j));
- return res;
+ row_type const ri = row(idx);
+ row_type const r1 = min(row(from), row(to));
+ row_type const r2 = max(row(from), row(to));
+ col_type const ci = col(idx);
+ col_type const c1 = min(col(from), col(to));
+ col_type const c2 = max(col(from), col(to));
+ return r1 <= ri && ri <= r2 && c1 <= ci && ci <= c2;
}
os << MTag("mtable");
for (row_type row = 0; row < nrows(); ++row) {
os << MTag("mtr");
- for (col_type col = 0; col < ncols(); ++col)
+ for (col_type col = 0; col < ncols(); ++col)
os << cell(index(row, col));
os << ETag("mtr");
}
{
for (row_type row = 0; row < nrows(); ++row) {
os << verboseHLine(rowinfo_[row].lines_);
- for (col_type col = 0; col < ncols(); ++col)
- os << cell(index(row, col)) << eocString(col);
- os << eolString(row);
+ // don't write & and empty cells at end of line
+ col_type lastcol = 0;
+ bool emptyline = true;
+ for (col_type col = 0; col < ncols(); ++col)
+ if (!cell(index(row, col)).empty()) {
+ lastcol = col + 1;
+ emptyline = false;
+ }
+ for (col_type col = 0; col < lastcol; ++col)
+ os << cell(index(row, col)) << eocString(col, lastcol);
+ os << eolString(row, os.fragile());
+ // append newline only if line wasn't completely empty
+ // and this was not the last line in the grid
+ if (!emptyline && row + 1 < nrows())
+ os << "\n";
}
string const s = verboseHLine(rowinfo_[nrows()].lines_);
- if (!s.empty())
+ if (!s.empty() && s != " ") {
+ if (os.fragile())
+ os << "\\protect";
os << "\\\\" << s;
+ }
+}
+
+
+int MathGridInset::colsep() const
+{
+ return 6;
}
+
+int MathGridInset::rowsep() const
+{
+ return 6;
+}
+
+
+int MathGridInset::hlinesep() const
+{
+ return 3;
+}
+
+
+int MathGridInset::vlinesep() const
+{
+ return 3;
+}
+
+
+int MathGridInset::border() const
+{
+ return 1;
+}
+
+
+void MathGridInset::splitCell(idx_type & idx, pos_type & pos)
+{
+ if (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);
+}
+
+
+dispatch_result MathGridInset::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;
+ //}
+ break;
+
+ case LFUN_INSET_DIALOG_UPDATE: {
+ GridInsetMailer mailer(*this);
+ mailer.updateDialog(cmd.view());
+ break;
+ }
+
+ // insert file functions
+ case LFUN_DELETE_LINE_FORWARD:
+ //autocorrect_ = false;
+ //macroModeClose();
+ //if (selection_) {
+ // selDel();
+ // 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;
+
+ case LFUN_TABINSERT:
+ //bv->lockedInsetStoreUndo(Undo::EDIT);
+ splitCell(idx, pos);
+ return DISPATCHED_POP;
+
+ case LFUN_BREAKLINE: {
+ //bv->lockedInsetStoreUndo(Undo::INSERT);
+ row_type const r = row(idx);
+ 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)));
+
+ // split cell
+ splitCell(idx, pos);
+ std::swap(cell(idx), cell(idx + ncols() - 1));
+ if (idx > 0)
+ --idx;
+ pos = cell(idx).size();
+
+ //mathcursor->normalize();
+ return DISPATCHED_POP;
+ }
+
+ case LFUN_TABULAR_FEATURE:
+ //lyxerr << "handling tabular-feature " << cmd.argument << "\n";
+ if (cmd.argument == "valign-top")
+ valign('t');
+ else if (cmd.argument == "valign-center")
+ valign('c');
+ else if (cmd.argument == "valign-bottom")
+ valign('b');
+ else if (cmd.argument == "align-left")
+ halign('l', col(idx));
+ else if (cmd.argument == "align-right")
+ halign('r', col(idx));
+ else if (cmd.argument == "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")
+ 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")
+ copyCol(col(idx));
+ else if (cmd.argument == "swap-column")
+ swapCol(col(idx));
+ else
+ return UNDISPATCHED;
+ return DISPATCHED_POP;
+
+ case LFUN_PASTE: {
+ //lyxerr << "pasting '" << cmd.argument << "'\n";
+ 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();
+ } else {
+ // multiple cells
+ col_type const numcols = min(grid.ncols(), ncols() - col(idx));
+ row_type const numrows = min(grid.nrows(), nrows() - row(idx));
+ 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)));
+ }
+ // append the left over horizontal cells to the last column
+ idx_type i = index(r + row(idx), ncols() - 1);
+ for (MathInset::col_type c = numcols; c < grid.ncols(); ++c)
+ cell(i).append(grid.cell(grid.index(r, c)));
+ }
+ // append the left over vertical cells to the last _cell_
+ idx_type i = nargs() - 1;
+ for (row_type r = numrows; r < grid.nrows(); ++r)
+ for (col_type c = 0; c < grid.ncols(); ++c)
+ cell(i).append(grid.cell(grid.index(r, c)));
+ }
+ return DISPATCHED_POP;
+ }
+
+ default:
+ return MathNestInset::dispatch(cmd, idx, pos);
+ }
+ return UNDISPATCHED;
+}
projects / lyx.git / blobdiff