-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "math_gridinset.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
string res;
for (int i = 0; i < n; ++i)
res += "\\hline";
- return res + ' ';
+ if (n)
+ res += ' ';
+ return res;
}
}
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
+ // let's have at least one column, even if we did not recognize its
// alignment
if (col == 0)
col = 1;
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 " & ";
}
}
+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);
{
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 != " ") {
}
-MathInset::result_type MathGridInset::dispatch
+dispatch_result MathGridInset::dispatch
(FuncRequest const & cmd, idx_type & idx, pos_type & pos)
{
switch (cmd.action) {
// 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_MATH_HALIGN:
- halign((cmd.argument + "c")[0], col(idx));
- return DISPATCHED_POP;
-
- case LFUN_MATH_VALIGN:
- valign((cmd.argument + "c")[0]);
- return DISPATCHED_POP;
-
- case LFUN_MATH_ROW_INSERT:
- addRow(row(idx));
- return DISPATCHED_POP;
-
- case LFUN_MATH_ROW_DELETE:
- delRow(row(idx));
- if (idx > nargs())
- idx -= ncols();
- return DISPATCHED_POP;
-
- case LFUN_MATH_COLUMN_INSERT: {
- row_type r = row(idx);
- col_type c = col(idx);
- addFancyCol(c);
- idx = index(r, c);
- return DISPATCHED_POP;
- }
-
- case LFUN_MATH_COLUMN_DELETE: {
- row_type r = row(idx);
- col_type c = col(idx);
- delFancyCol(col(idx));
- idx = index(r, c);
- if (idx > nargs())
- idx -= ncols();
+ 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";
return DISPATCHED_POP;
}
- default:
- break;
+ default:
+ return MathNestInset::dispatch(cmd, idx, pos);
}
return UNDISPATCHED;
}
projects / lyx.git / blobdiff