Jean-Marc's fix for wrong descent

[lyx.git] / src / mathed / math_gridinset.C

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index cc0f4264f3c0a43c03a16df864315422a4ce1017..8e3c61838d00b21732966f8843d7f4d0f8c87107 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -1,7 +1,3 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "math_gridinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
@@ -27,7 +23,7 @@ string verboseHLine(int n)
        for (int i = 0; i < n; ++i)
                res += "\\hline";
        if (n)
-               res += " ";
+               res += ' ';
        return res;
 }
 
@@ -177,7 +173,7 @@ MathGridInset::col_type MathGridInset::guessColumns(string const & hh) const
        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;
@@ -518,7 +514,7 @@ string MathGridInset::eolString(row_type row, bool fragile) const
        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()) {
@@ -532,7 +528,7 @@ string MathGridInset::eolString(row_type row, bool fragile) const
        if (eol.empty() && row + 1 == nrows())
                return string();
 
-       return (fragile ? "\\protect\\\\" : "\\\\") + eol + '\n';
+       return (fragile ? "\\protect\\\\" : "\\\\") + eol;
 }
 
 
@@ -905,16 +901,19 @@ void MathGridInset::write(WriteStream & os) const
                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 != " ") {
@@ -968,7 +967,7 @@ void MathGridInset::splitCell(idx_type & idx, pos_type & pos)
 }
 
 
-MathInset::result_type MathGridInset::dispatch
+dispatch_result MathGridInset::dispatch
        (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
 {
        switch (cmd.action) {
@@ -1009,7 +1008,7 @@ MathInset::result_type MathGridInset::dispatch
                        if (idx > 0)
                                --idx;
                        pos = cell(idx).size();
-               
+
                        //mathcursor->normalize();
                        //updateLocal(bv, true);
                        return DISPATCHED_POP;
@@ -1055,7 +1054,7 @@ MathInset::result_type MathGridInset::dispatch
                                copyCol(col(idx));
                        else if (cmd.argument == "swap-column")
                                swapCol(col(idx));
-                       else 
+                       else
                                return UNDISPATCHED;
                        return DISPATCHED_POP;
 
@@ -1090,7 +1089,7 @@ MathInset::result_type MathGridInset::dispatch
                        return DISPATCHED_POP;
                }
 
-               default:        
+               default:
                        return MathNestInset::dispatch(cmd, idx, pos);
        }
        return UNDISPATCHED;