]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_gridinset.C
fix #1073
[lyx.git] / src / mathed / math_gridinset.C
index a679d1fd305a213634d02bf4c637e5e09150050f..61729990cbd7b51307c2c768ac7a80a340ab27d2 100644 (file)
@@ -1,7 +1,3 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "math_gridinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
@@ -9,14 +5,46 @@
 #include "funcrequest.h"
 #include "frontends/Painter.h"
 #include "debug.h"
+#include "Lsstream.h"
+
 
+#include "insets/mailinset.h"
 
 using std::swap;
 using std::max;
 using std::min;
 using std::vector;
+using std::istream;
+
+
+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 {
 
 string verboseHLine(int n)
@@ -24,11 +52,22 @@ string verboseHLine(int n)
        string res;
        for (int i = 0; i < n; ++i)
                res += "\\hline";
-       return res + ' ';
+       if (n)
+               res += ' ';
+       return res;
 }
 
+
+int extractInt(istream & is)
+{
+       int num = 1;
+       is >> num;
+       return (num == 0) ? 1 : num;
 }
 
+}
+
+
 //////////////////////////////////////////////////////////////
 
 
@@ -114,6 +153,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);
@@ -173,7 +219,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;
@@ -252,7 +298,7 @@ LyXLength MathGridInset::vcrskip(row_type row) const
 }
 
 
-void MathGridInset::metrics(MathMetricsInfo & mi) const
+void MathGridInset::metrics(MetricsInfo & mi) const
 {
        // let the cells adjust themselves
        MathNestInset::metrics(mi);
@@ -391,7 +437,7 @@ void MathGridInset::metrics(MathMetricsInfo & mi) const
 }
 
 
-void MathGridInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathGridInset::draw(PainterInfo & pi, int x, int y) const
 {
        for (idx_type idx = 0; idx < nargs(); ++idx)
                cell(idx).draw(pi, x + cellXOffset(idx), y + cellYOffset(idx));
@@ -514,7 +560,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()) {
@@ -528,13 +574,13 @@ 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;
 }
 
 
-string MathGridInset::eocString(col_type col) const
+string MathGridInset::eocString(col_type col, col_type lastcol) const
 {
-       if (col + 1 == ncols())
+       if (col + 1 == lastcol)
                return string();
        return " & ";
 }
@@ -576,6 +622,25 @@ void MathGridInset::delRow(row_type row)
 }
 
 
+void MathGridInset::copyRow(row_type row)
+{
+       addRow(row);
+       for (col_type col = 0; col < ncols(); ++col)
+               cells_[(row + 1) * ncols() + col] = cells_[row * ncols() + col];
+}
+
+
+void MathGridInset::swapRow(row_type row)
+{
+       if (nrows() == 1)
+               return;
+       if (row + 1 == nrows())
+               --row;
+       for (col_type col = 0; col < ncols(); ++col)
+               swap(cells_[row * ncols() + col], cells_[(row + 1) * ncols() + col]);
+}
+
+
 void MathGridInset::addCol(col_type newcol)
 {
        const col_type nc = ncols();
@@ -619,6 +684,25 @@ void MathGridInset::delCol(col_type col)
 }
 
 
+void MathGridInset::copyCol(col_type col)
+{
+       addCol(col);
+       for (row_type row = 0; row < nrows(); ++row)
+               cells_[row * ncols() + col + 1] = cells_[row * ncols() + col];
+}
+
+
+void MathGridInset::swapCol(col_type col)
+{
+       if (ncols() == 1)
+               return;
+       if (col + 1 == ncols())
+               --col;
+       for (row_type row = 0; row < nrows(); ++row)
+               swap(cells_[row * ncols() + col], cells_[row * ncols() + col + 1]);
+}
+
+
 int MathGridInset::cellXOffset(idx_type idx) const
 {
        col_type c = col(idx);
@@ -861,9 +945,21 @@ void MathGridInset::write(WriteStream & os) const
 {
        for (row_type row = 0; row < nrows(); ++row) {
                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)
-                       os << cell(index(row, col)) << eocString(col);
+                       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);
                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 != " ") {
@@ -917,11 +1013,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();
@@ -937,10 +1048,9 @@ MathInset::result_type MathGridInset::dispatch
                                pos = cell(idx).size();
                        return DISPATCHED_POP;
 
-               case LFUN_TABINSERT:
+               case LFUN_CELL_SPLIT:
                        //bv->lockedInsetStoreUndo(Undo::EDIT);
                        splitCell(idx, pos);
-                       //updateLocal(bv, true);
                        return DISPATCHED_POP;
 
                case LFUN_BREAKLINE: {
@@ -955,14 +1065,104 @@ 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;
                }
 
-               default:        
-                       break;
+               case LFUN_TABULAR_FEATURE: {
+                       //lyxerr << "handling tabular-feature " << cmd.argument << "\n";
+                       istringstream is(cmd.argument);
+                       string s;
+                       is >> s;
+                       if (s == "valign-top")
+                               valign('t');
+                       else if (s == "valign-center")
+                               valign('c');
+                       else if (s == "valign-bottom")
+                               valign('b');
+                       else if (s == "align-left")
+                               halign('l', col(idx));
+                       else if (s == "align-right")
+                               halign('r', col(idx));
+                       else if (s == "align-center")
+                               halign('c', col(idx));
+                       else if (s == "append-row")
+                               for (int i = 0, n = extractInt(is); i < n; ++i)
+                                       addRow(row(idx));
+                       else if (s == "delete-row") 
+                               for (int i = 0, n = extractInt(is); i < n; ++i) {
+                                       delRow(row(idx));
+                                       if (idx > nargs())
+                                               idx -= ncols();
+                               }
+                       else if (s == "copy-row") 
+                               for (int i = 0, n = extractInt(is); i < n; ++i)
+                                       copyRow(row(idx));
+                       else if (s == "swap-row")
+                               swapRow(row(idx));
+                       else if (s == "append-column") 
+                               for (int i = 0, n = extractInt(is); i < n; ++i) {
+                                       row_type r = row(idx);
+                                       col_type c = col(idx);
+                                       addCol(c);
+                                       idx = index(r, c);
+                               }
+                       else if (s == "delete-column") 
+                               for (int i = 0, n = extractInt(is); i < n; ++i) {
+                                       row_type r = row(idx);
+                                       col_type c = col(idx);
+                                       delCol(col(idx));
+                                       idx = index(r, c);
+                                       if (idx > nargs())
+                                               idx -= ncols();
+                               }
+                       else if (s == "copy-column")
+                               copyCol(col(idx));
+                       else if (s == "swap-column")
+                               swapCol(col(idx));
+                       else
+                               return UNDISPATCHED;
+                       lyxerr << "returning DISPATCHED_POP\n";
+                       return DISPATCHED_POP;
+               }
+
+               case LFUN_PASTE: {
+                       //lyxerr << "pasting '" << cmd.argument << "'\n";
+                       MathGridInset grid(1, 1);
+                       mathed_parse_normal(grid, cmd.argument);
+                       if (grid.nargs() == 1) {
+                               // single cell/part of cell
+                               cell(idx).insert(pos, grid.cell(0));
+                               pos += grid.cell(0).size();
+                       } else {
+                               // multiple cells
+                               col_type const numcols = min(grid.ncols(), ncols() - col(idx));
+                               row_type const numrows = min(grid.nrows(), nrows() - row(idx));
+                               for (row_type r = 0; r < numrows; ++r) {
+                                       for (col_type c = 0; c < numcols; ++c) {
+                                               idx_type i = index(r + row(idx), c + col(idx));
+                                               cell(i).append(grid.cell(grid.index(r, c)));
+                                       }
+                                       // append the left over horizontal cells to the last column
+                                       idx_type i = index(r + row(idx), ncols() - 1);
+                                       for (MathInset::col_type c = numcols; c < grid.ncols(); ++c)
+                                               cell(i).append(grid.cell(grid.index(r, c)));
+                               }
+                               // append the left over vertical cells to the last _cell_
+                               idx_type i = nargs() - 1;
+                               for (row_type r = numrows; r < grid.nrows(); ++r)
+                                       for (col_type c = 0; c < grid.ncols(); ++c)
+                                               cell(i).append(grid.cell(grid.index(r, c)));
+                       }
+                       return DISPATCHED_POP;
+               }
+
+               default:
+                       return MathNestInset::dispatch(cmd, idx, pos);
        }
        return UNDISPATCHED;
 }