GuiPrintNomencl.cpp: fix bug #7853

[lyx.git] / src / mathed / InsetMathGrid.cpp

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index daaa4276a7acd72aafe39ed08834b3a756133f98..5b58f09a03eb1b746873057d84b00d19f985ac60 100644 (file)
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -67,9 +67,9 @@ static int extractInt(istream & is)
 static void resetGrid(InsetMathGrid & grid)
 {
        while (grid.ncols() > 1)
-               grid.delCol(grid.ncols());
+               grid.delCol(grid.ncols() - 1);
        while (grid.nrows() > 1)
-               grid.delRow(grid.nrows());
+               grid.delRow(grid.nrows() - 1);
        grid.cell(0).erase(0, grid.cell(0).size());
        grid.setDefaults();
 }
@@ -688,17 +688,6 @@ void InsetMathGrid::addRow(row_type row)
 }
 
 
-void InsetMathGrid::appendRow()
-{
-       rowinfo_.push_back(RowInfo());
-       //cells_.insert(cells_.end(), ncols(), MathData());
-       for (col_type col = 0; col < ncols(); ++col) {
-               cells_.push_back(cells_type::value_type());
-               cellinfo_.push_back(CellInfo());
-       }
-}
-
-
 void InsetMathGrid::delRow(row_type row)
 {
        if (nrows() == 1)
@@ -799,7 +788,7 @@ int InsetMathGrid::cellXOffset(BufferView const & bv, idx_type idx) const
 {
        col_type c = col(idx);
        int x = colinfo_[c].offset_;
-       char align = colinfo_[c].align_;
+       char align = displayColAlign(c, row(idx));
        Dimension const & celldim = cell(idx).dimension(bv);
        if (align == 'r' || align == 'R')
                x += colinfo_[c].width_ - celldim.wid;
@@ -986,14 +975,14 @@ void InsetMathGrid::mathmlize(MathStream & os) const
        char const * const celltag = havetable ? "mtd" : "mrow";
        for (row_type row = 0; row < nrows(); ++row) {
                if (havetable)
-                       os << MTag("mtr");;
+                       os << MTag("mtr");
                for (col_type col = 0; col < ncols(); ++col) {
                        os << MTag(celltag);
                        os << cell(index(row, col));
                        os << ETag(celltag);
                }
                if (havetable)
-                       os << ETag("mtr");;
+                       os << ETag("mtr");
        }
        if (havetable)
                os << ETag("mtable");
@@ -1011,13 +1000,13 @@ void InsetMathGrid::htmlize(HtmlStream & os, string attrib) const
        }
        os << MTag("table", attrib);
        for (row_type row = 0; row < nrows(); ++row) {
-               os << MTag("tr");;
+               os << MTag("tr");
                for (col_type col = 0; col < ncols(); ++col) {
                        os << MTag("td");
                        os << cell(index(row, col));
                        os << ETag("td");
                }
-               os << ETag("tr");;
+               os << ETag("tr");
        }
        os << ETag("table");
 }
@@ -1191,7 +1180,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.idx() > 0)
                        --cur.idx();
                cur.pos() = cur.lastpos();
-
+               cur.forceBufferUpdate();
                //mathcursor->normalize();
                //cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
                break;
@@ -1534,7 +1523,7 @@ bool InsetMathGrid::getStatus(Cursor & cur, FuncRequest const & cmd,
        }
 
        case LFUN_CELL_SPLIT:
-               status.setEnabled(true);
+               status.setEnabled(cur.idx() != cur.lastidx());
                return true;
 
        case LFUN_CELL_BACKWARD: