rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 5880c2f7c6b55d0cdcf9e27398424cbee27f59ad..7b773ed54d5856e72f3a0fec6539d104fdc0de3f 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"
@@ -9,7 +5,10 @@
 #include "funcrequest.h"
 #include "frontends/Painter.h"
 #include "debug.h"
+#include "Lsstream.h"
+
 
+#include "insets/mailinset.h"
 
 using std::swap;
 using std::max;
@@ -17,6 +16,32 @@ using std::min;
 using std::vector;
 
 
+class GridInsetMailer : public MailInset {
+public:
+       GridInsetMailer(MathGridInset & inset) : inset_(inset) {}
+       ///
+       virtual string const & name() const
+       {
+               static const string theName = "tabular";
+               return theName;
+       }
+       ///
+       virtual string const inset2string() const
+       {
+               ostringstream data;
+               //data << name() << " active_cell " << inset.getActCell() << '\n';
+               data << name() << " active_cell " << 0 << '\n';
+               WriteStream ws(data);
+               inset_.write(ws);
+               return data.str();
+       }
+
+protected:
+       InsetBase & inset() const { return inset_; }
+       MathGridInset & inset_; 
+};
+
+
 void mathed_parse_normal(MathGridInset &, string const & argument);
 
 namespace {
@@ -26,7 +51,9 @@ string verboseHLine(int n)
        string res;
        for (int i = 0; i < n; ++i)
                res += "\\hline";
-       return res + ' ';
+       if (n)
+               res += ' ';
+       return res;
 }
 
 }
@@ -116,6 +143,13 @@ MathGridInset::MathGridInset(col_type m, row_type n, char v, string const & h)
 }
 
 
+MathGridInset::~MathGridInset()
+{
+       GridInsetMailer mailer(*this);
+       mailer.hideDialog();
+}
+
+
 MathInset * MathGridInset::clone() const
 {
        return new MathGridInset(*this);
@@ -175,7 +209,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;
@@ -516,7 +550,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()) {
@@ -530,7 +564,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;
 }
 
 
@@ -903,16 +937,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 != " ") {
@@ -966,11 +1003,26 @@ 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) {
 
+               case LFUN_MOUSE_RELEASE:
+                       //if (cmd.button() == mouse_button::button3) {
+                       //      GridInsetMailer mailer(*this);
+                       //      mailer.showDialog();
+                       //      return DISPATCHED;
+                       //}
+                       break;
+
+               case LFUN_INSET_DIALOG_UPDATE: {
+                       GridInsetMailer mailer(*this);
+                       mailer.updateDialog(cmd.view());
+                       break;
+               }
+
+               // insert file functions
                case LFUN_DELETE_LINE_FORWARD:
                        //autocorrect_ = false;
                        //macroModeClose();
@@ -989,7 +1041,6 @@ MathInset::result_type MathGridInset::dispatch
                case LFUN_TABINSERT:
                        //bv->lockedInsetStoreUndo(Undo::EDIT);
                        splitCell(idx, pos);
-                       //updateLocal(bv, true);
                        return DISPATCHED_POP;
 
                case LFUN_BREAKLINE: {
@@ -1004,9 +1055,11 @@ MathInset::result_type MathGridInset::dispatch
                        // 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;
                }
 
@@ -1050,7 +1103,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;
 
@@ -1085,7 +1138,7 @@ MathInset::result_type MathGridInset::dispatch
                        return DISPATCHED_POP;
                }
 
-               default:        
+               default:
                        return MathNestInset::dispatch(cmd, idx, pos);
        }
        return UNDISPATCHED;