-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "math_gridinset.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
#include "lyxfont.h"
+#include "funcrequest.h"
#include "frontends/Painter.h"
#include "debug.h"
using std::vector;
+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;
}
}
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();
}
setDefaults();
valign(v);
halign(h);
+ //lyxerr << "created grid with " << ncols() << " columns\n";
}
{
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";
}
}
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;
}
int asc = 0;
int desc = 0;
for (col_type col = 0; col < ncols(); ++col) {
- MathXArray const & c = xcell(index(row, col));
+ MathArray const & c = cell(index(row, col));
asc = max(asc, c.ascent());
desc = max(desc, c.descent());
}
for (col_type col = 0; col < ncols(); ++col) {
int wid = 0;
for (row_type row = 0; row < nrows(); ++row)
- wid = max(wid, xcell(index(row, col)).width());
+ wid = max(wid, cell(index(row, col)).width());
colinfo_[col].width_ = wid;
}
colinfo_[ncols()].width_ = 0;
}
- width_ = colinfo_[ncols() - 1].offset_
+ dim_.w = colinfo_[ncols() - 1].offset_
+ colinfo_[ncols() - 1].width_
+ vlinesep() * colinfo_[ncols()].lines_
+ border();
- ascent_ = - rowinfo_[0].offset_
+ dim_.a = - rowinfo_[0].offset_
+ rowinfo_[0].ascent_
+ hlinesep() * rowinfo_[0].lines_
+ border();
- descent_ = rowinfo_[nrows() - 1].offset_
+ dim_.d = rowinfo_[nrows() - 1].offset_
+ rowinfo_[nrows() - 1].descent_
+ hlinesep() * rowinfo_[nrows()].lines_
+ border();
void MathGridInset::draw(MathPainterInfo & pi, int x, int y) const
{
for (idx_type idx = 0; idx < nargs(); ++idx)
- xcell(idx).draw(pi, 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;
- pi.pain.line(x + 1, yy, x + width_ - 1, yy);
+ 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;
- pi.pain.line(xx, y - ascent_ + 1, xx, y + descent_ - 1);
+ pi.pain.line(xx, y - ascent() + 1, xx, y + descent() - 1);
}
}
// let the cells adjust themselves
//MathNestInset::metrics(mi);
for (idx_type i = 0; i < nargs(); ++i)
- xcell(i).metricsT(mi);
+ 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) {
- MathXArray const & c = xcell(index(row, col));
+ MathArray const & c = cell(index(row, col));
asc = max(asc, c.ascent());
desc = max(desc, c.descent());
}
for (col_type col = 0; col < ncols(); ++col) {
int wid = 0;
for (row_type row = 0; row < nrows(); ++row)
- wid = max(wid, xcell(index(row, col)).width());
+ wid = max(wid, cell(index(row, col)).width());
colinfo_[col].width_ = wid;
}
colinfo_[ncols()].width_ = 0;
}
- width_ = colinfo_[ncols() - 1].offset_
+ dim_.w = colinfo_[ncols() - 1].offset_
+ colinfo_[ncols() - 1].width_
//+ vlinesep() * colinfo_[ncols()].lines_
+ 2;
- ascent_ = - rowinfo_[0].offset_
+ dim_.a = -rowinfo_[0].offset_
+ rowinfo_[0].ascent_
//+ hlinesep() * rowinfo_[0].lines_
+ 1;
- descent_ = rowinfo_[nrows() - 1].offset_
+ 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)
- xcell(idx).drawT(pain, x + cellXOffset(idx), y + cellYOffset(idx));
+ cell(idx).drawT(pain, x + cellXOffset(idx), y + cellYOffset(idx));
}
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()) {
if (eol.empty() && row + 1 == nrows())
return string();
- return (fragile ? "\\protect\\\\" : "\\\\") + 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 " & ";
}
{
rowinfo_.insert(rowinfo_.begin() + row + 1, RowInfo());
cells_.insert
- (cells_.begin() + (row + 1) * ncols(), ncols(), MathXArray());
+ (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());
+ //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());
}
+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();
}
+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::idxUpDown(idx_type & idx, bool up) const
+bool MathGridInset::idxUpDown(idx_type & idx, pos_type & pos, bool up,
+ int targetx) const
{
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;
}
}
// 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 (c + 1 == ncols()) {
if (row(idx) + 1 != nrows()) {
for (col_type cc = 0; cc < ncols(); ++cc)
- cell(idx).push_back(cell(idx + cc + 1));
+ cell(idx).append(cell(idx + cc + 1));
delRow(row(idx) + 1);
}
} else {
- cell(idx).push_back(cell(idx + 1));
+ 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).erase();
+ cell(idx - c + ncols() - 1).clear();
}
}
}
-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 = min(row(from), row(to));
- row_type r2 = max(row(from), row(to));
- col_type c1 = min(col(from), col(to));
- col_type c2 = max(col(from), col(to));
- 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;
}
{
for (row_type row = 0; row < nrows(); ++row) {
os << verboseHLine(rowinfo_[row].lines_);
+ // 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)
- os << cell(index(row, col)) << eocString(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() && s != " ") {
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_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);
+ //updateLocal(bv, true);
+ 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();
+ //updateLocal(bv, true);
+ 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