-#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;
}
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)
- if (!cell(index(row, col)).empty())
+ 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);
- // I _really_ hate LaTeX's syntax quirks. Why is
- // \begin{eqnarray}\end{eqnarray} not valid?
- if (lastcol == 0 && os.latex())
- os << "\\ ";
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;
copyCol(col(idx));
else if (cmd.argument == "swap-column")
swapCol(col(idx));
- else
+ else
return UNDISPATCHED;
return DISPATCHED_POP;
return DISPATCHED_POP;
}
- default:
+ default:
return MathNestInset::dispatch(cmd, idx, pos);
}
return UNDISPATCHED;