]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetTabular.cpp
Fix bug #8580: Do not include material in the XHTML TOC that is not
[lyx.git] / src / insets / InsetTabular.cpp
index 840f3cbddd15685907c00087b4e25394351f0e9b..379d29634429aaa23685e7bcb1459fdc33acbffb 100644 (file)
@@ -13,6 +13,7 @@
  * \author Jürgen Vigna
  * \author Uwe Stöhr
  * \author Edwin Leuven
+ * \author Scott Kostyshak
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -32,6 +33,7 @@
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "InsetList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 
 #include <boost/scoped_ptr.hpp>
 
-#include <sstream>
+#include <cstring>
 #include <iostream>
 #include <limits>
-#include <cstring>
+#include <sstream>
 
 using namespace std;
 using namespace lyx::support;
@@ -114,6 +116,10 @@ TabularFeature tabularFeature[] =
        { Tabular::DELETE_COLUMN, "delete-column", false },
        { Tabular::COPY_ROW, "copy-row", false },
        { Tabular::COPY_COLUMN, "copy-column", false },
+       { Tabular::MOVE_COLUMN_RIGHT, "move-column-right", false },
+       { Tabular::MOVE_COLUMN_LEFT, "move-column-left", false },
+       { Tabular::MOVE_ROW_DOWN, "move-row-down", false },
+       { Tabular::MOVE_ROW_UP, "move-row-up", false },
        { Tabular::SET_LINE_TOP, "set-line-top", true },
        { Tabular::SET_LINE_BOTTOM, "set-line-bottom", true },
        { Tabular::SET_LINE_LEFT, "set-line-left", true },
@@ -769,6 +775,50 @@ void Tabular::insertRow(row_type const row, bool copy)
 }
 
 
+void Tabular::moveColumn(col_type col, ColDirection direction)
+{
+       if (direction == Tabular::LEFT)
+               col = col - 1;
+
+       for (row_type r = 0; r < nrows(); ++r) {
+               std::swap(cell_info[r][col], cell_info[r][col + 1]);
+               std::swap(cell_info[r][col].left_line, cell_info[r][col + 1].left_line);
+               std::swap(cell_info[r][col].right_line, cell_info[r][col + 1].right_line);
+
+               // FIXME track changes is broken for tabular features (#8469)
+               idx_type const i = cellIndex(r, col);
+               idx_type const j = cellIndex(r, col + 1);
+               if (buffer().params().trackChanges) {
+                       cellInfo(i).inset->setChange(Change(Change::INSERTED));
+                       cellInfo(j).inset->setChange(Change(Change::INSERTED));
+               }
+       }
+       updateIndexes();
+}
+
+
+void Tabular::moveRow(row_type row, RowDirection direction)
+{
+       if (direction == Tabular::UP)
+               row = row - 1;
+
+       for (col_type c = 0; c < ncols(); ++c) {
+               std::swap(cell_info[row][c], cell_info[row + 1][c]);
+               std::swap(cell_info[row][c].top_line, cell_info[row + 1][c].top_line);
+               std::swap(cell_info[row][c].bottom_line, cell_info[row + 1][c].bottom_line);
+
+               // FIXME track changes is broken for tabular features (#8469)
+               idx_type const i = cellIndex(row, c);
+               idx_type const j = cellIndex(row + 1, c);
+               if (buffer().params().trackChanges) {
+                       cellInfo(i).inset->setChange(Change(Change::INSERTED));
+                       cellInfo(j).inset->setChange(Change(Change::INSERTED));
+               }
+       }
+       updateIndexes();
+}
+
+
 void Tabular::deleteColumn(col_type const col)
 {
        // Not allowed to delete last column
@@ -1603,6 +1653,16 @@ bool Tabular::isMultiColumn(idx_type cell) const
 }
 
 
+bool Tabular::hasMultiColumn(col_type c) const
+{
+       for (row_type r = 0; r < nrows(); ++r) {
+               if (isMultiColumn(cellIndex(r, c)))
+                       return true;
+       }
+       return false;
+}
+
+
 Tabular::CellData & Tabular::cellInfo(idx_type cell) const
 {
        return cell_info[cellRow(cell)][cellColumn(cell)];
@@ -1643,6 +1703,14 @@ bool Tabular::isMultiRow(idx_type cell) const
                || cellInfo(cell).multirow == CELL_PART_OF_MULTIROW);
 }
 
+bool Tabular::hasMultiRow(row_type r) const
+{
+       for (col_type c = 0; c < ncols(); ++c) {
+               if (isMultiRow(cellIndex(r, c)))
+                       return true;
+       }
+       return false;
+}
 
 Tabular::idx_type Tabular::setMultiRow(idx_type cell, idx_type number,
                                       bool const bottom_border)
@@ -3018,7 +3086,7 @@ docstring Tabular::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
 }
 
 
-bool Tabular::plaintextTopHLine(odocstream & os, row_type row,
+bool Tabular::plaintextTopHLine(odocstringstream & os, row_type row,
                                   vector<unsigned int> const & clen) const
 {
        idx_type const fcell = getFirstCellInRow(row);
@@ -3066,7 +3134,7 @@ bool Tabular::plaintextTopHLine(odocstream & os, row_type row,
 }
 
 
-bool Tabular::plaintextBottomHLine(odocstream & os, row_type row,
+bool Tabular::plaintextBottomHLine(odocstringstream & os, row_type row,
                                      vector<unsigned int> const & clen) const
 {
        idx_type const fcell = getFirstCellInRow(row);
@@ -3113,14 +3181,14 @@ bool Tabular::plaintextBottomHLine(odocstream & os, row_type row,
 }
 
 
-void Tabular::plaintextPrintCell(odocstream & os,
+void Tabular::plaintextPrintCell(odocstringstream & os,
                               OutputParams const & runparams,
                               idx_type cell, row_type row, col_type column,
                               vector<unsigned int> const & clen,
-                              bool onlydata) const
+                              bool onlydata, size_t max_length) const
 {
        odocstringstream sstr;
-       cellInset(cell)->plaintext(sstr, runparams);
+       cellInset(cell)->plaintext(sstr, runparams, max_length);
 
        if (onlydata) {
                os << sstr.str();
@@ -3163,9 +3231,9 @@ void Tabular::plaintextPrintCell(odocstream & os,
 }
 
 
-void Tabular::plaintext(odocstream & os,
+void Tabular::plaintext(odocstringstream & os,
                           OutputParams const & runparams, int const depth,
-                          bool onlydata, char_type delim) const
+                          bool onlydata, char_type delim, size_t max_length) const
 {
        // first calculate the width of the single columns
        vector<unsigned int> clen(ncols());
@@ -3179,7 +3247,7 @@ void Tabular::plaintext(odocstream & os,
                                if (isMultiColumn(cell))
                                        continue;
                                odocstringstream sstr;
-                               cellInset(cell)->plaintext(sstr, runparams);
+                               cellInset(cell)->plaintext(sstr, runparams, max_length);
                                if (clen[c] < sstr.str().length())
                                        clen[c] = sstr.str().length();
                        }
@@ -3191,7 +3259,7 @@ void Tabular::plaintext(odocstream & os,
                                if (cell_info[r][c].multicolumn != CELL_BEGIN_OF_MULTICOLUMN)
                                        continue;
                                odocstringstream sstr;
-                               cellInset(cell)->plaintext(sstr, runparams);
+                               cellInset(cell)->plaintext(sstr, runparams, max_length);
                                int len = int(sstr.str().length());
                                idx_type const n = columnSpan(cell);
                                for (col_type k = c; len > 0 && k < c + n - 1; ++k)
@@ -3212,8 +3280,10 @@ void Tabular::plaintext(odocstream & os,
                                // we don't use operator<< for single UCS4 character.
                                // see explanation in docstream.h
                                os.put(delim);
-                       plaintextPrintCell(os, runparams, cell, r, c, clen, onlydata);
+                       plaintextPrintCell(os, runparams, cell, r, c, clen, onlydata, max_length);
                        ++cell;
+                       if (os.str().size() > max_length)
+                               break;
                }
                os << endl;
                if (!onlydata) {
@@ -3221,6 +3291,8 @@ void Tabular::plaintext(odocstream & os,
                        if (plaintextBottomHLine(os, r, clen))
                                os << docstring(depth * 2, ' ');
                }
+               if (os.str().size() > max_length)
+                       break;
        }
 }
 
@@ -3820,13 +3892,13 @@ void InsetTabular::updateBuffer(ParIterator const & it, UpdateType utype)
 }
 
 
-void InsetTabular::addToToc(DocIterator const & cpit) const
+void InsetTabular::addToToc(DocIterator const & cpit, bool output_active) const
 {
        DocIterator dit = cpit;
        dit.forwardPos();
        size_t const end = dit.nargs();
        for ( ; dit.idx() < end; dit.top().forwardIdx())
-               cell(dit.idx())->addToToc(dit);
+               cell(dit.idx())->addToToc(dit, output_active);
 }
 
 
@@ -4029,6 +4101,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
                        if (select_whole && !empty_cell){
                                getText(cur.idx())->selectAll(cur);
                                cur.dispatched();
+                               cur.screenUpdateFlags(Update::Force | Update::FitCursor);
                                break;
                        }
 
@@ -4093,9 +4166,10 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
                        cur.pit() = cur.lastpit();
                        cur.pos() = cur.lastpos();
                        cur.setCurrentFont();
+                       cur.screenUpdateFlags(Update::Force | Update::FitCursor);
                        return;
                }
-               cur.screenUpdateFlags(Update::FitCursor);
+               cur.screenUpdateFlags(Update::Force | Update::FitCursor);
                break;
 
        case LFUN_UP_SELECT:
@@ -4131,9 +4205,10 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
                        cur.pit() = 0;
                        cur.pos() = cur.lastpos();
                        cur.setCurrentFont();
+                       cur.screenUpdateFlags(Update::Force | Update::FitCursor);
                        return;
                }
-               cur.screenUpdateFlags(Update::FitCursor);
+               cur.screenUpdateFlags(Update::Force | Update::FitCursor);
                break;
 
 //     case LFUN_SCREEN_DOWN: {
@@ -4408,6 +4483,56 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
                                && tabular.tabular_valignment == Tabular::LYX_VALIGN_MIDDLE);
                        break;
 
+               case Tabular::MOVE_COLUMN_RIGHT:
+               case Tabular::MOVE_COLUMN_LEFT:
+               case Tabular::MOVE_ROW_DOWN:
+               case Tabular::MOVE_ROW_UP: {
+                       if (cur.selection()) {
+                               status.message(_("Selections not supported."));
+                               status.setEnabled(false);
+                               break;
+                       }
+
+                       if ((action == Tabular::MOVE_COLUMN_RIGHT &&
+                               tabular.ncols() == tabular.cellColumn(cur.idx()) + 1) ||
+                           (action == Tabular::MOVE_COLUMN_LEFT &&
+                               tabular.cellColumn(cur.idx()) == 0) ||
+                           (action == Tabular::MOVE_ROW_DOWN &&
+                               tabular.nrows() == tabular.cellRow(cur.idx()) + 1) ||
+                           (action == Tabular::MOVE_ROW_UP &&
+                               tabular.cellRow(cur.idx()) == 0)) {
+                                       status.setEnabled(false);
+                                       break;
+                       }
+
+                       if (action == Tabular::MOVE_COLUMN_RIGHT ||
+                           action == Tabular::MOVE_COLUMN_LEFT) {
+                               if (tabular.hasMultiColumn(tabular.cellColumn(cur.idx())) ||
+                                   tabular.hasMultiColumn(tabular.cellColumn(cur.idx()) +
+                                       (action == Tabular::MOVE_COLUMN_RIGHT ? 1 : -1))) {
+                                       status.message(_("Multi-column in current or"
+                                                        " destination column."));
+                                       status.setEnabled(false);
+                                       break;
+                               }
+                       }
+
+                       if (action == Tabular::MOVE_ROW_DOWN ||
+                           action == Tabular::MOVE_ROW_UP) {
+                               if (tabular.hasMultiRow(tabular.cellRow(cur.idx())) ||
+                                   tabular.hasMultiRow(tabular.cellRow(cur.idx()) +
+                                       (action == Tabular::MOVE_ROW_DOWN ? 1 : -1))) {
+                                       status.message(_("Multi-row in current or"
+                                                        " destination row."));
+                                       status.setEnabled(false);
+                                       break;
+                               }
+                       }
+
+                       status.setEnabled(true);
+                       break;
+               }
+
                case Tabular::SET_DECIMAL_POINT:
                        status.setEnabled(
                                tabular.getAlignment(cur.idx()) == LYX_ALIGN_DECIMAL);
@@ -4695,6 +4820,37 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
        }
 
+       case LFUN_CAPTION_INSERT: {
+               // caption is only allowed in caption cell of longtable
+               if (!tabular.ltCaption(tabular.cellRow(cur.idx()))) {
+                       status.setEnabled(false);
+                       return true;
+               }
+               // only standard caption is allowed
+               string arg = cmd.getArg(0);
+               if (!arg.empty() && arg != "Standard") {
+                       status.setEnabled(false);
+                       return true;
+               }
+               // check if there is already a caption
+               bool have_caption = false;
+               InsetTableCell itc = InsetTableCell(*tabular.cellInset(cur.idx()).get());
+               ParagraphList::const_iterator pit = itc.paragraphs().begin();
+               ParagraphList::const_iterator pend = itc.paragraphs().end();
+               for (; pit != pend; ++pit) {
+                       InsetList::const_iterator it  = pit->insetList().begin();
+                       InsetList::const_iterator end = pit->insetList().end();
+                       for (; it != end; ++it) {
+                               if (it->inset->lyxCode() == CAPTION_CODE) {
+                                       have_caption = true;
+                                       break;
+                               }
+                       }
+               }
+               status.setEnabled(!have_caption);
+               return true;
+       }
+
        // These are only enabled inside tabular
        case LFUN_CELL_BACKWARD:
        case LFUN_CELL_FORWARD:
@@ -4729,7 +4885,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
        }
 
        // disable in non-fixed-width cells
-       case LFUN_BREAK_PARAGRAPH:
+       case LFUN_PARAGRAPH_BREAK:
                // multirow does not allow paragraph breaks
                if (tabular.isMultiRow(cur.idx())) {
                        status.setEnabled(false);
@@ -4802,11 +4958,12 @@ void InsetTabular::latex(otexstream & os, OutputParams const & runparams) const
 }
 
 
-int InsetTabular::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetTabular::plaintext(odocstringstream & os,
+        OutputParams const & runparams, size_t max_length) const
 {
        os << '\n'; // output table on a new line
        int const dp = runparams.linelen > 0 ? runparams.depth : 0;
-       tabular.plaintext(os, runparams, dp, false, 0);
+       tabular.plaintext(os, runparams, dp, false, 0, max_length);
        return PLAINTEXT_NEWLINE;
 }
 
@@ -5310,6 +5467,12 @@ void InsetTabular::tabularFeatures(Cursor & cur,
                break;
 
        case Tabular::DELETE_ROW:
+               if (sel_row_end == tabular.nrows() - 1 && sel_row_start != 0) {
+                       for (col_type c = 0; c < tabular.ncols(); c++)
+                               tabular.setBottomLine(tabular.cellIndex(sel_row_start - 1, c),
+                                       tabular.bottomLine(tabular.cellIndex(sel_row_end, c)));
+               }
+
                for (row_type r = sel_row_start; r <= sel_row_end; ++r)
                        tabular.deleteRow(sel_row_start);
                if (sel_row_start >= tabular.nrows())
@@ -5321,6 +5484,18 @@ void InsetTabular::tabularFeatures(Cursor & cur,
                break;
 
        case Tabular::DELETE_COLUMN:
+               if (sel_col_end == tabular.ncols() - 1 && sel_col_start != 0) {
+                       for (row_type r = 0; r < tabular.nrows(); r++)
+                               tabular.setRightLine(tabular.cellIndex(r, sel_col_start - 1),
+                                       tabular.rightLine(tabular.cellIndex(r, sel_col_end)));
+               }
+
+               if (sel_col_start == 0 && sel_col_end != tabular.ncols() - 1) {
+                       for (row_type r = 0; r < tabular.nrows(); r++)
+                               tabular.setLeftLine(tabular.cellIndex(r, sel_col_end + 1),
+                                       tabular.leftLine(tabular.cellIndex(r, 0)));
+               }
+
                for (col_type c = sel_col_start; c <= sel_col_end; ++c)
                        tabular.deleteColumn(sel_col_start);
                if (sel_col_start >= tabular.ncols())
@@ -5340,6 +5515,26 @@ void InsetTabular::tabularFeatures(Cursor & cur,
                cur.idx() = tabular.cellIndex(row, column);
                break;
 
+       case Tabular::MOVE_COLUMN_RIGHT:
+               tabular.moveColumn(column, Tabular::RIGHT);
+               cur.idx() = tabular.cellIndex(row, column + 1);
+               break;
+
+       case Tabular::MOVE_COLUMN_LEFT:
+               tabular.moveColumn(column, Tabular::LEFT);
+               cur.idx() = tabular.cellIndex(row, column - 1);
+               break;
+
+       case Tabular::MOVE_ROW_DOWN:
+               tabular.moveRow(row, Tabular::DOWN);
+               cur.idx() = tabular.cellIndex(row + 1, column);
+               break;
+
+       case Tabular::MOVE_ROW_UP:
+               tabular.moveRow(row, Tabular::UP);
+               cur.idx() = tabular.cellIndex(row - 1, column);
+               break;
+
        case Tabular::SET_LINE_TOP:
        case Tabular::TOGGLE_LINE_TOP: {
                bool lineSet = (feature == Tabular::SET_LINE_TOP)
@@ -5415,7 +5610,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
                                        tabular.rightLine(cur.idx()));
                        break;
                }
-               // we have a selection so this means we just add all this
+               // we have a selection so this means we just add all these
                // cells to form a multicolumn cell
                idx_type const s_start = cur.selBegin().idx();
                row_type const col_start = tabular.cellColumn(s_start);
@@ -5809,7 +6004,7 @@ bool InsetTabular::copySelection(Cursor & cur)
 
        odocstringstream os;
        OutputParams const runparams(0);
-       paste_tabular->plaintext(os, runparams, 0, true, '\t');
+       paste_tabular->plaintext(os, runparams, 0, true, '\t', INT_MAX);
        // Needed for the "Edit->Paste recent" menu and the system clipboard.
        cap::copySelection(cur, os.str());