Another warning.

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

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index 19c9d8c54b79ccc11848f348ca7a76d24212dd51..d37870d4ada3b7cc24908a559b75394e0c789e44 100644 (file)
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -42,6 +42,7 @@ using namespace std;
 using namespace lyx::support;
 
 
+
 namespace lyx {
 
 static docstring verboseHLine(int n)
@@ -643,7 +644,8 @@ void InsetMathGrid::updateBuffer(ParIterator const & it, UpdateType utype)
 }
 
 
-docstring InsetMathGrid::eolString(row_type row, bool fragile) const
+docstring InsetMathGrid::eolString(row_type row, bool fragile,
+               bool /*latex*/, bool last_eoln) const
 {
        docstring eol;
 
@@ -661,7 +663,7 @@ docstring InsetMathGrid::eolString(row_type row, bool fragile) const
        }
 
        // only add \\ if necessary
-       if (eol.empty() && row + 1 == nrows())
+       if (eol.empty() && row + 1 == nrows() && (nrows() == 1 || !last_eoln))
                return docstring();
 
        return (fragile ? "\\protect\\\\" : "\\\\") + eol;
@@ -1044,19 +1046,23 @@ void InsetMathGrid::write(WriteStream & os,
                // unless there are vertical lines
                col_type lastcol = 0;
                bool emptyline = true;
-               for (col_type col = beg_col; col < end_col; ++col)
-                       if (!cell(index(row, col)).empty()
-                                 || colinfo_[col + 1].lines_) {
+               bool last_eoln = true;
+               for (col_type col = beg_col; col < end_col; ++col) {
+                       bool const empty_cell = cell(index(row, col)).empty();
+                       if (!empty_cell)
+                               last_eoln = false;
+                       if (!empty_cell || colinfo_[col + 1].lines_) {
                                lastcol = col + 1;
                                emptyline = false;
                        }
+               }
                for (col_type col = beg_col; col < lastcol; ++col) {
                        os << cell(index(row, col));
                        if (os.pendingBrace())
                                ModeSpecifier specifier(os, TEXT_MODE);
                        os << eocString(col, lastcol);
                }
-               eol = eolString(row, os.fragile());
+               eol = eolString(row, os.fragile(), os.latex(), last_eoln);
                os << eol;
                // append newline only if line wasn't completely empty
                // and the formula is not written on a single line
@@ -1366,10 +1372,9 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
                                        cell(i).append(grid.cell(grid.index(r, c)));
                }
                cur.clearSelection(); // bug 393
-               // FIXME audit setBuffer/updateBuffer calls
+               // FIXME audit setBuffer calls
                cur.inset().setBuffer(*buffer_);
-               // FIXME audit setBuffer/updateBuffer calls
-               cur.buffer()->updateBuffer();
+               cur.forceBufferUpdate();
                cur.finishUndo();
                break;
        }