]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetTabular.cpp
More requires --> required, for C++2a.
[lyx.git] / src / insets / InsetTabular.cpp
index a25f4d6356a54012b9e14c2c6953cbfb18cfc73b..7b4db191732032526bf4d72872f749744a16025b 100644 (file)
@@ -127,12 +127,20 @@ TabularFeature tabularFeature[] =
        { 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_LTRIM_TOP, "set-ltrim-top", true },
+       { Tabular::SET_LTRIM_BOTTOM, "set-ltrim-bottom", true },
+       { Tabular::SET_RTRIM_TOP, "set-rtrim-top", true },
+       { Tabular::SET_RTRIM_BOTTOM, "set-rtrim-bottom", true },
        { Tabular::SET_LINE_LEFT, "set-line-left", true },
        { Tabular::SET_LINE_RIGHT, "set-line-right", true },
        { Tabular::TOGGLE_LINE_TOP, "toggle-line-top", false },
        { Tabular::TOGGLE_LINE_BOTTOM, "toggle-line-bottom", false },
        { Tabular::TOGGLE_LINE_LEFT, "toggle-line-left", false },
        { Tabular::TOGGLE_LINE_RIGHT, "toggle-line-right", false },
+       { Tabular::TOGGLE_LTRIM_TOP, "toggle-ltrim-top", false },
+       { Tabular::TOGGLE_LTRIM_BOTTOM, "toggle-ltrim-bottom", false },
+       { Tabular::TOGGLE_RTRIM_TOP, "toggle-rtrim-top", false },
+       { Tabular::TOGGLE_RTRIM_BOTTOM, "toggle-rtrim-bottom", false },
        { Tabular::ALIGN_LEFT, "align-left", false },
        { Tabular::ALIGN_RIGHT, "align-right", false },
        { Tabular::ALIGN_CENTER, "align-center", false },
@@ -155,6 +163,7 @@ TabularFeature tabularFeature[] =
        { Tabular::UNSET_MULTIROW, "unset-multirow", false },
        { Tabular::SET_MROFFSET, "set-mroffset", true },
        { Tabular::SET_ALL_LINES, "set-all-lines", false },
+       { Tabular::RESET_FORMAL_DEFAULT, "reset-formal-default", false },
        { Tabular::UNSET_ALL_LINES, "unset-all-lines", false },
        { Tabular::TOGGLE_LONGTABULAR, "toggle-longtabular", false },
        { Tabular::SET_LONGTABULAR, "set-longtabular", false },
@@ -199,6 +208,7 @@ TabularFeature tabularFeature[] =
        { Tabular::LONGTABULAR_ALIGN_RIGHT, "longtabular-align-right", false },
        { Tabular::SET_DECIMAL_POINT, "set-decimal-point", true },
        { Tabular::SET_TABULAR_WIDTH, "set-tabular-width", true },
+       { Tabular::SET_INNER_LINES, "set-inner-lines", false },
        { Tabular::LAST_ACTION, "", false }
 };
 
@@ -441,6 +451,49 @@ bool getTokenValue(string const & str, char const * token, Length & len)
 }
 
 
+bool getTokenValue(string const & str, char const * token, Change & change, BufferParams bp)
+{
+       // set the change to be Change() as default as this it should be if not
+       // in the file format.
+       change = Change();
+       string tmp;
+       if (getTokenValue(str, token, tmp)) {
+               vector<string> const changedata = getVectorFromString(tmp, " ");
+               if (changedata.size() != 3) {
+                       Alert::warning(_("Change tracking data incomplete"),
+                                      _("Change tracking information for tabular row/column "
+                                        "is incomplete. I will ignore this."));
+                       return false;
+               }
+               BufferParams::AuthorMap const & am = bp.author_map_;
+               int aid = convert<int>(changedata[1]);
+               if (am.find(aid) == am.end()) {
+                       // FIXME Use ErrorList
+                       Alert::warning(_("Change tracking author index missing"),
+                               bformat(_("A change tracking author information for index "
+                                         "%1$d is missing. This can happen after a wrong "
+                                         "merge by a version control system. In this case, "
+                                         "either fix the merge, or have this information "
+                                         "missing until the corresponding tracked changes "
+                                         "are merged or this user edits the file again.\n"),
+                                       aid));
+                       bp.addAuthor(Author(aid));
+               }
+               istringstream is(changedata[2]);
+               time_t ct;
+               is >> ct;
+               if (changedata[0] == "inserted") {
+                       change = Change(Change::INSERTED, am.find(aid)->second, ct);
+                       return true;
+               } else if (changedata[0] == "deleted") {
+                       change = Change(Change::DELETED, am.find(aid)->second, ct);
+                       return true;
+               }
+       }
+       return false;
+}
+
+
 bool getTokenValue(string const & str, char const * token, Length & len, bool & flag)
 {
        len = Length();
@@ -521,6 +574,21 @@ string const write_attribute(string const & name, Length const & value)
        return value.zero() ? string() : write_attribute(name, value.asString());
 }
 
+string const write_attribute(string const & name, Change const & change, BufferParams const bp)
+{
+       odocstringstream ods;
+       if (change.inserted())
+               ods << from_ascii("inserted");
+       else if (change.deleted())
+               ods << from_ascii("deleted");
+       if (change.changed()) {
+               ods << " " << bp.authors().get(change.author).bufferId()
+                   << " " << change.changetime;
+               return write_attribute(name, ods.str());
+       }
+       return string();
+}
+
 } // namespace
 
 
@@ -583,6 +651,10 @@ Tabular::CellData::CellData(Buffer * buf)
          bottom_line(false),
          left_line(false),
          right_line(false),
+         top_line_rtrimmed(false),
+         top_line_ltrimmed(false),
+         bottom_line_rtrimmed(false),
+         bottom_line_ltrimmed(false),
          usebox(BOX_NONE),
          rotate(0),
          inset(new InsetTableCell(buf))
@@ -606,6 +678,10 @@ Tabular::CellData::CellData(CellData const & cs)
          bottom_line(cs.bottom_line),
          left_line(cs.left_line),
          right_line(cs.right_line),
+         top_line_rtrimmed(cs.top_line_rtrimmed),
+         top_line_ltrimmed(cs.top_line_ltrimmed),
+         bottom_line_rtrimmed(cs.bottom_line_rtrimmed),
+         bottom_line_ltrimmed(cs.bottom_line_ltrimmed),
          usebox(cs.usebox),
          rotate(cs.rotate),
          align_special(cs.align_special),
@@ -632,6 +708,10 @@ Tabular::CellData & Tabular::CellData::operator=(CellData const & cs)
        bottom_line = cs.bottom_line;
        left_line = cs.left_line;
        right_line = cs.right_line;
+       top_line_rtrimmed = cs.top_line_rtrimmed;
+       top_line_ltrimmed = cs.top_line_ltrimmed;
+       bottom_line_rtrimmed = cs.bottom_line_rtrimmed;
+       bottom_line_ltrimmed = cs.bottom_line_ltrimmed;
        usebox = cs.usebox;
        rotate = cs.rotate;
        align_special = cs.align_special;
@@ -651,7 +731,8 @@ Tabular::RowData::RowData()
          endfoot(false),
          endlastfoot(false),
          newpage(false),
-         caption(false)
+         caption(false),
+         change(Change())
 {}
 
 
@@ -659,7 +740,8 @@ Tabular::ColumnData::ColumnData()
        : alignment(LYX_ALIGN_CENTER),
          valignment(LYX_VALIGN_TOP),
          width(0),
-         varwidth(false)
+         varwidth(false),
+         change(Change())
 {
 }
 
@@ -716,12 +798,14 @@ void Tabular::init(Buffer * buf, row_type rows_arg,
 }
 
 
-void Tabular::deleteRow(row_type const row)
+void Tabular::deleteRow(row_type const row, bool const force)
 {
        // Not allowed to delete last row
        if (nrows() == 1)
                return;
 
+       bool const ct = force ? false : buffer().params().track_changes;
+
        for (col_type c = 0; c < ncols(); ++c) {
                // Care about multirow cells
                if (row + 1 < nrows() &&
@@ -730,8 +814,12 @@ void Tabular::deleteRow(row_type const row)
                                cell_info[row + 1][c].multirow = CELL_BEGIN_OF_MULTIROW;
                }
        }
-       row_info.erase(row_info.begin() + row);
-       cell_info.erase(cell_info.begin() + row);
+       if (ct)
+               row_info[row].change.setDeleted();
+       else {
+               row_info.erase(row_info.begin() + row);
+               cell_info.erase(cell_info.begin() + row);
+       }
        updateIndexes();
 }
 
@@ -757,8 +845,6 @@ void Tabular::insertRow(row_type const row, bool copy)
        for (col_type c = 0; c < ncols(); ++c) {
                cell_info[row + 1].insert(cell_info[row + 1].begin() + c,
                        copy ? CellData(cell_info[row][c]) : CellData(buffer_));
-               if (buffer().params().track_changes)
-                       cell_info[row + 1][c].inset->setChange(Change(Change::INSERTED));
                if (cell_info[row][c].multirow == CELL_BEGIN_OF_MULTIROW)
                        cell_info[row + 1][c].multirow = CELL_PART_OF_MULTIROW;
        }
@@ -777,9 +863,10 @@ void Tabular::insertRow(row_type const row, bool copy)
                        setBottomLine(i, true);
                        setBottomLine(j, false);
                }
-               // mark track changes
-               if (buffer().params().track_changes)
-                       cellInfo(i).inset->setChange(Change(Change::INSERTED));
+       }
+       if (buffer().params().track_changes) {
+               row_info[row + 1].change.setInserted();
+               updateIndexes();
        }
 }
 
@@ -796,7 +883,6 @@ void Tabular::moveColumn(col_type col, ColDirection direction)
                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().track_changes) {
@@ -820,7 +906,6 @@ void Tabular::moveRow(row_type row, RowDirection direction)
                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().track_changes) {
@@ -832,12 +917,14 @@ void Tabular::moveRow(row_type row, RowDirection direction)
 }
 
 
-void Tabular::deleteColumn(col_type const col)
+void Tabular::deleteColumn(col_type const col, bool const force)
 {
        // Not allowed to delete last column
        if (ncols() == 1)
                return;
 
+       bool const ct = force ? false : buffer().params().track_changes;
+
        for (row_type r = 0; r < nrows(); ++r) {
                // Care about multicolumn cells
                if (col + 1 < ncols() &&
@@ -845,9 +932,13 @@ void Tabular::deleteColumn(col_type const col)
                    cell_info[r][col + 1].multicolumn == CELL_PART_OF_MULTICOLUMN) {
                                cell_info[r][col + 1].multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
                }
-               cell_info[r].erase(cell_info[r].begin() + col);
+               if (!ct)
+                       cell_info[r].erase(cell_info[r].begin() + col);
        }
-       column_info.erase(column_info.begin() + col);
+       if (ct)
+               column_info[col].change.setDeleted();
+       else
+               column_info.erase(column_info.begin() + col);
        updateIndexes();
 }
 
@@ -866,14 +957,12 @@ void Tabular::appendColumn(col_type col)
 
 void Tabular::insertColumn(col_type const col, bool copy)
 {
-       BufferParams const & bp = buffer().params();
+       bool const ct = buffer().params().track_changes;
        column_info.insert(column_info.begin() + col + 1, ColumnData(column_info[col]));
 
        for (row_type r = 0; r < nrows(); ++r) {
                cell_info[r].insert(cell_info[r].begin() + col + 1,
                        copy ? CellData(cell_info[r][col]) : CellData(buffer_));
-               if (bp.track_changes)
-                       cell_info[r][col + 1].inset->setChange(Change(Change::INSERTED));
                if (cell_info[r][col].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
                        cell_info[r][col + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
        }
@@ -889,8 +978,10 @@ void Tabular::insertColumn(col_type const col, bool copy)
                if (rightLine(i) && rightLine(j)) {
                        setRightLine(j, false);
                }
-               if (buffer().params().track_changes)
-                       cellInfo(i).inset->setChange(Change(Change::INSERTED));
+       }
+       if (ct) {
+               column_info[col + 1].change.setInserted();
+               updateIndexes();
        }
 }
 
@@ -914,8 +1005,8 @@ void Tabular::updateIndexes()
        rowofcell.resize(numberofcells);
        columnofcell.resize(numberofcells);
        idx_type i = 0;
-       // reset column and row of cells and update their width and alignment
-       for (row_type row = 0; row < nrows(); ++row)
+       // reset column and row of cells and update their width, alignment and ct status
+       for (row_type row = 0; row < nrows(); ++row) {
                for (col_type column = 0; column < ncols(); ++column) {
                        if (isPartOfMultiColumn(row, column)) {
                                cell_info[row][column].inset->toggleMultiCol(true);
@@ -936,8 +1027,15 @@ void Tabular::updateIndexes()
                        cell_info[row][column].inset->toggleMultiRow(false);
                        cell_info[row][column].inset->setContentAlignment(
                                getAlignment(cellIndex(row, column)));
+                       if (buffer().params().track_changes) {
+                               if (row_info[row].change.changed())
+                                       cell_info[row][column].inset->setChange(row_info[row].change);
+                               if (column_info[column].change.changed())
+                                       cell_info[row][column].inset->setChange(column_info[column].change);
+                       }
                        ++i;
                }
+       }
 }
 
 
@@ -963,22 +1061,40 @@ bool Tabular::bottomLine(idx_type const cell) const
 }
 
 
-bool Tabular::leftLine(idx_type cell) const
+bool Tabular::leftLine(idx_type cell, bool const ignore_bt) const
 {
-       if (use_booktabs)
+       if (use_booktabs && !ignore_bt)
                return false;
        return cellInfo(cell).left_line;
 }
 
 
-bool Tabular::rightLine(idx_type cell) const
+bool Tabular::rightLine(idx_type cell, bool const ignore_bt) const
 {
-       if (use_booktabs)
+       if (use_booktabs && !ignore_bt)
                return false;
        return cellInfo(cell).right_line;
 }
 
 
+pair<bool, bool> Tabular::topLineTrim(idx_type const cell) const
+{
+       if (!use_booktabs)
+               return make_pair(false, false);
+       return make_pair(cellInfo(cell).top_line_ltrimmed,
+                        cellInfo(cell).top_line_rtrimmed);
+}
+
+
+pair<bool, bool> Tabular::bottomLineTrim(idx_type const cell) const
+{
+       if (!use_booktabs)
+               return make_pair(false, false);
+       return make_pair(cellInfo(cell).bottom_line_ltrimmed,
+                        cellInfo(cell).bottom_line_rtrimmed);
+}
+
+
 int Tabular::interRowSpace(row_type row) const
 {
        if (!row || row >= nrows())
@@ -1029,15 +1145,60 @@ int Tabular::cellHeight(idx_type cell) const
 }
 
 
-bool Tabular::updateColumnWidths()
+bool Tabular::updateColumnWidths(MetricsInfo & mi)
 {
        vector<int> max_dwidth(ncols(), 0);
+       // collect max. fixed width of column
+       map<col_type, int> max_pwidth;
+       // collect max. variable width of column
+       map<col_type, int> max_width;
+
        for(col_type c = 0; c < ncols(); ++c)
                for(row_type r = 0; r < nrows(); ++r) {
                        idx_type const i = cellIndex(r, c);
                        if (getAlignment(i) == LYX_ALIGN_DECIMAL)
                                max_dwidth[c] = max(max_dwidth[c], cell_info[r][c].decimal_width);
+                       if (!getPWidth(i).zero())
+                               max_pwidth[c] = max(max_pwidth[c], cell_info[r][c].width);
+                       else if (!column_info[c].varwidth)
+                               max_width[c] = max(max_width[c], cell_info[r][c].width);
+               }
+
+       // If we have a fixed tabular width, we take this into account
+       Length tab_width = tabular_width;
+       bool const tabularx = hasVarwidthColumn();
+       if (tabularx && tab_width.zero())
+               // If no tabular width is specified with X columns,
+               // we use 100% colwidth
+               tab_width = Length(100, Length::PCW);
+       int restwidth = -1;
+       if (!tab_width.zero()) {
+               restwidth = mi.base.inPixels(tab_width);
+               // Substract the fixed widths from the table width
+               for (auto const w : max_pwidth)
+                       restwidth -= w.second;
+       }
+
+       // If we have a fixed width, distribute the available table width
+       // (minus the fixed widths) to the variable-width columns
+       int vcolwidth = -1;
+       int restcols = ncols() - max_pwidth.size();
+       if ((restwidth > 0) && (restcols != 0))
+               vcolwidth = restwidth / restcols;
+
+       // Now consider that some variable width columns exceed the vcolwidth
+       if (vcolwidth > 0) {
+               bool changed = false;
+               for (auto const w : max_width) {
+                       if (tabularx || w.second > vcolwidth) {
+                               --restcols;
+                               restwidth -= w.second;
+                               changed = true;
+                       }
                }
+               if (changed && restwidth > 0)
+                       vcolwidth = restwidth / restcols;
+       }
 
        bool update = false;
        // for each col get max of single col cells
@@ -1050,14 +1211,23 @@ bool Tabular::updateColumnWidths()
                                        && cell_info[r][c].decimal_width != 0)
                                        new_width = max(new_width, cellInfo(i).width
                                                + max_dwidth[c] - cellInfo(i).decimal_width);
-                               else
+                               else if (getPWidth(i).zero() && vcolwidth > 0) {
+                                       if (tabularx && !column_info[c].varwidth)
+                                               new_width = max(new_width, cellInfo(i).width);
+                                       else if (tabularx)
+                                               new_width = vcolwidth;
+                                       else
+                                               new_width = max(vcolwidth, max(new_width, cellInfo(i).width));
+                               } else
                                        new_width = max(new_width, cellInfo(i).width);
                        }
                }
 
                if (column_info[c].width != new_width) {
                        column_info[c].width = new_width;
-                       update = true;
+                       // Do not trigger update when no space is left for variable
+                       // columns, as this will loop
+                       update = tab_width.zero() || restwidth > 0;
                }
        }
        // update col widths to fit merged cells
@@ -1074,7 +1244,9 @@ bool Tabular::updateColumnWidths()
 
                        if (cellInfo(i).width > old_width) {
                                column_info[c + span - 1].width += cellInfo(i).width - old_width;
-                               update = true;
+                               // Do not trigger update when no space is left for variable
+                               // columns, as this will loop
+                               update = tab_width.zero() || restwidth > 0;
                        }
                }
 
@@ -1114,8 +1286,10 @@ void Tabular::setAlignment(idx_type cell, LyXAlignment align,
                }
                column_info[col].alignment = align;
                docstring & dpoint = column_info[col].decimal_point;
-               if (align == LYX_ALIGN_DECIMAL && dpoint.empty())
-                       dpoint = from_utf8(lyxrc.default_decimal_point);
+               if (align == LYX_ALIGN_DECIMAL && dpoint.empty()) {
+                       Language const * tlang = buffer().paragraphs().front().getParLanguage(buffer().params());
+                       dpoint = tlang->decimalSeparator();
+               }
        } else {
                cellInfo(cell).alignment = align;
                cellInset(cell)->setContentAlignment(align);
@@ -1263,6 +1437,42 @@ void Tabular::setBottomLine(idx_type i, bool line)
 }
 
 
+void Tabular::setTopLineLTrim(idx_type i, bool val)
+{
+       cellInfo(i).top_line_ltrimmed = val;
+}
+
+
+void Tabular::setTopLineRTrim(idx_type i, bool val)
+{
+       cellInfo(i).top_line_rtrimmed = val;
+}
+
+
+void Tabular::setBottomLineLTrim(idx_type i, bool val)
+{
+       cellInfo(i).bottom_line_ltrimmed = val;
+}
+
+
+void Tabular::setBottomLineRTrim(idx_type i, bool val)
+{
+       cellInfo(i).bottom_line_rtrimmed = val;
+}
+
+
+void Tabular::setTopLineTrim(idx_type i, pair<bool, bool> trim)
+{
+       setTopLineLTrim(i, trim.first);
+       setTopLineRTrim(i, trim.second);
+}
+
+void Tabular::setBottomLineTrim(idx_type i, pair<bool, bool> trim)
+{
+       setBottomLineLTrim(i, trim.first);
+       setBottomLineRTrim(i, trim.second);
+}
+
 void Tabular::setLeftLine(idx_type cell, bool line)
 {
        cellInfo(cell).left_line = line;
@@ -1437,7 +1647,7 @@ int Tabular::textVOffset(idx_type cell) const
 }
 
 
-Tabular::idx_type Tabular::getFirstCellInRow(row_type row) const
+Tabular::idx_type Tabular::getFirstCellInRow(row_type row, bool const ct) const
 {
        col_type c = 0;
        idx_type const numcells = numberOfCellsInRow(row);
@@ -1446,26 +1656,52 @@ Tabular::idx_type Tabular::getFirstCellInRow(row_type row) const
        // is really invalid, i.e., it is NOT the first cell in the row. but
        // i do not know what to do here. (rgh)
        while (c < numcells - 1
-              && cell_info[row][c].multirow == CELL_PART_OF_MULTIROW)
+              && (cell_info[row][c].multirow == CELL_PART_OF_MULTIROW
+                  || (ct && column_info[c].change.deleted())))
                ++c;
        return cell_info[row][c].cellno;
 }
 
 
-Tabular::idx_type Tabular::getLastCellInRow(row_type row) const
+Tabular::idx_type Tabular::getLastCellInRow(row_type row, bool const ct) const
 {
        col_type c = ncols() - 1;
        // of course we check against 0 so we don't crash. but we have the same
        // problem as in the previous routine: if all the cells are part of a
        // multirow or part of a multi column, then our return value is invalid.
        while (c > 0
-              && (cell_info[row][c].multirow == CELL_PART_OF_MULTIROW
-                  || cell_info[row][c].multicolumn == CELL_PART_OF_MULTICOLUMN))
+              && ((cell_info[row][c].multirow == CELL_PART_OF_MULTIROW
+                  || cell_info[row][c].multicolumn == CELL_PART_OF_MULTICOLUMN)
+                 || (ct && column_info[c].change.deleted())))
                --c;
        return cell_info[row][c].cellno;
 }
 
 
+Tabular::row_type Tabular::getFirstRow(bool const ct) const
+{
+       row_type r = 0;
+       if (!ct)
+               return r;
+       // exclude deleted rows if ct == true
+       while (r < nrows() && row_info[r].change.deleted())
+               ++r;
+       return r;
+}
+
+
+Tabular::row_type Tabular::getLastRow(bool const ct) const
+{
+       row_type r = nrows() - 1;
+       if (!ct)
+               return r;
+       // exclude deleted rows if ct == true
+       while (r > 0 && row_info[r].change.deleted())
+               --r;
+       return r;
+}
+
+
 Tabular::row_type Tabular::cellRow(idx_type cell) const
 {
        if (cell >= numberofcells)
@@ -1520,8 +1756,9 @@ void Tabular::write(ostream & os) const
                os << "<column"
                   << write_attribute("alignment", column_info[c].alignment);
                if (column_info[c].alignment == LYX_ALIGN_DECIMAL)
-                  os << write_attribute("decimal_point", column_info[c].decimal_point);
-               os << write_attribute("valignment", column_info[c].valignment)
+                       os << write_attribute("decimal_point", column_info[c].decimal_point);
+               os << write_attribute("change", column_info[c].change, buffer().params())
+                  << write_attribute("valignment", column_info[c].valignment)
                   << write_attribute("width", column_info[c].p_width.asString())
                   << write_attribute("varwidth", column_info[c].varwidth)
                   << write_attribute("special", column_info[c].align_special)
@@ -1542,7 +1779,8 @@ void Tabular::write(ostream & os) const
                        os << write_attribute("interlinespace", def);
                else
                        os << write_attribute("interlinespace", row_info[r].interline_space);
-               os << write_attribute("endhead", row_info[r].endhead)
+               os << write_attribute("change", row_info[r].change, buffer().params())
+                  << write_attribute("endhead", row_info[r].endhead)
                   << write_attribute("endfirsthead", row_info[r].endfirsthead)
                   << write_attribute("endfoot", row_info[r].endfoot)
                   << write_attribute("endlastfoot", row_info[r].endlastfoot)
@@ -1557,7 +1795,11 @@ void Tabular::write(ostream & os) const
                           << write_attribute("alignment", cell_info[r][c].alignment)
                           << write_attribute("valignment", cell_info[r][c].valignment)
                           << write_attribute("topline", cell_info[r][c].top_line)
+                          << write_attribute("toplineltrim", cell_info[r][c].top_line_ltrimmed)
+                          << write_attribute("toplinertrim", cell_info[r][c].top_line_rtrimmed)
                           << write_attribute("bottomline", cell_info[r][c].bottom_line)
+                          << write_attribute("bottomlineltrim", cell_info[r][c].bottom_line_ltrimmed)
+                          << write_attribute("bottomlinertrim", cell_info[r][c].bottom_line_rtrimmed)
                           << write_attribute("leftline", cell_info[r][c].left_line)
                           << write_attribute("rightline", cell_info[r][c].right_line)
                           << write_attribute("rotate", cell_info[r][c].rotate)
@@ -1637,6 +1879,7 @@ void Tabular::read(Lexer & lex)
                getTokenValue(line, "width", column_info[c].p_width);
                getTokenValue(line, "special", column_info[c].align_special);
                getTokenValue(line, "varwidth", column_info[c].varwidth);
+               getTokenValue(line, "change", column_info[c].change, buffer().params());
        }
 
        for (row_type i = 0; i < nrows(); ++i) {
@@ -1658,6 +1901,7 @@ void Tabular::read(Lexer & lex)
                getTokenValue(line, "endlastfoot", row_info[i].endlastfoot);
                getTokenValue(line, "newpage", row_info[i].newpage);
                getTokenValue(line, "caption", row_info[i].caption);
+               getTokenValue(line, "change", row_info[i].change, buffer().params());
                for (col_type j = 0; j < ncols(); ++j) {
                        l_getline(is, line);
                        if (!prefixIs(line, "<cell")) {
@@ -1671,7 +1915,11 @@ void Tabular::read(Lexer & lex)
                        getTokenValue(line, "alignment", cell_info[i][j].alignment);
                        getTokenValue(line, "valignment", cell_info[i][j].valignment);
                        getTokenValue(line, "topline", cell_info[i][j].top_line);
+                       getTokenValue(line, "toplineltrim", cell_info[i][j].top_line_ltrimmed);
+                       getTokenValue(line, "toplinertrim", cell_info[i][j].top_line_rtrimmed);
                        getTokenValue(line, "bottomline", cell_info[i][j].bottom_line);
+                       getTokenValue(line, "bottomlineltrim", cell_info[i][j].bottom_line_ltrimmed);
+                       getTokenValue(line, "bottomlinertrim", cell_info[i][j].bottom_line_rtrimmed);
                        getTokenValue(line, "leftline", cell_info[i][j].left_line);
                        getTokenValue(line, "rightline", cell_info[i][j].right_line);
                        getTokenValue(line, "rotate", cell_info[i][j].rotate);
@@ -2240,62 +2488,116 @@ bool Tabular::isPartOfMultiRow(row_type row, col_type column) const
 }
 
 
-void Tabular::TeXTopHLine(otexstream & os, row_type row, string const & lang,
-                         list<col_type> columns) const
+void Tabular::TeXTopHLine(otexstream & os, row_type row, list<col_type> columns,
+                         list<col_type> logical_columns) const
 {
        // we only output complete row lines and the 1st row here, the rest
        // is done in Tabular::TeXBottomHLine(...)
 
        // get for each column the topline (if any)
-       map<col_type, bool> topline;
+       map<col_type, bool> topline, topltrims, toprtrims;
        col_type nset = 0;
+       bool have_trims = false;
        for (auto const & c : columns) {
                topline[c] = topLine(cellIndex(row, c));
+               topltrims[c] = topLineTrim(cellIndex(row, c)).first;
+               toprtrims[c] = topLineTrim(cellIndex(row, c)).second;
                // If cell is part of a multirow and not the first cell of the
                // multirow, no line must be drawn.
                if (row != 0)
                        if (isMultiRow(cellIndex(row, c))
-                           && cell_info[row][c].multirow != CELL_BEGIN_OF_MULTIROW)
+                           && cell_info[row][c].multirow != CELL_BEGIN_OF_MULTIROW) {
                                topline[c] = false;
+                               topltrims[c] = false;
+                               toprtrims[c] = false;
+                       }
+               // copy trimming to multicolumn parts
+               if (isPartOfMultiColumn(row, c)) {
+                       topltrims[c] = topltrims[c-1];
+                       toprtrims[c] = toprtrims[c-1];
+               }
                if (topline.find(c) != topline.end() && topline.find(c)->second)
                        ++nset;
+               if ((topltrims.find(c) != topltrims.end() && topltrims.find(c)->second)
+                    || (toprtrims.find(c) != toprtrims.end() && toprtrims.find(c)->second))
+                       have_trims = true;
        }
 
        // do nothing if empty first row, or incomplete row line after
-       if ((row == 0 && nset == 0) || (row > 0 && nset != ncols()))
+       row_type first = getFirstRow(!buffer().params().output_changes);
+       if ((row == first && nset == 0) || (row > first && nset != columns.size()))
                return;
 
+       // Is this the actual first row (excluding longtable caption row)?
+       bool const realfirstrow = (row == first
+                                  || (is_long_tabular && row == first + 1 && ltCaption(first)));
+
        // only output complete row lines and the 1st row's clines
-       if (nset == ncols()) {
+       if (nset == columns.size() && !have_trims) {
                if (use_booktabs) {
-                       os << (row == 0 ? "\\toprule " : "\\midrule ");
+                       os << (realfirstrow ? "\\toprule " : "\\midrule ");
                } else {
                        os << "\\hline ";
                }
-       } else if (row == 0) {
-               for (auto & c : columns) {
+       } else if (realfirstrow || have_trims) {
+               string const cline = use_booktabs ? "\\cmidrule" : "\\cline";
+               col_type c = 0;
+               std::list<col_type>::const_iterator it1 = logical_columns.begin();
+               std::list<col_type>::const_iterator it2 = columns.begin();
+               // We need to iterate over the logical columns here, but take care for
+               // bidi swapping
+               for (; it1 != logical_columns.end() && it2 != columns.end(); ++it1, ++it2) {
+                       col_type cl = *it1;
+                       if (cl < c)
+                               continue;
+                       c = cl;
                        if (topline.find(c)->second) {
                                col_type offset = 0;
                                for (col_type j = 0 ; j < c; ++j)
                                        if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
                                                ++offset;
-
-                               //babel makes the "-" character an active one, so we have to suppress this here
-                               //see http://groups.google.com/group/comp.text.tex/browse_thread/thread/af769424a4a0f289#
-                               if (lang == "slovak" || lang == "czech")
-                                       os << "\\expandafter" << (use_booktabs ? "\\cmidrule" : "\\cline")
-                                       << "\\expandafter{\\expandafter" << c + 1 + offset << "\\string-";
-                               else
-                                       os << (use_booktabs ? "\\cmidrule{" : "\\cline{") << c + 1 + offset << '-';
-
+                               // If the two iterators differ, we are in bidi with swapped columns
+                               col_type firstcol = (*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset;
+                               while (isPartOfMultiColumn(row, c))
+                                       ++c;
+                               string trim;
+                               if (topltrims.find(c) != topltrims.end()
+                                    && topltrims.find(c)->second)
+                                       trim = "l";
                                col_type cstart = c;
-                               for ( ; c < ncols() && topline.find(c)->second; ++c) {}
+                               for ( ; c < ncols() - 1 && topline.find(c + 1)->second ; ++c) {
+                                       if (isMultiColumn(cellIndex(row, c))
+                                           && c < ncols() - 1 && isPartOfMultiColumn(row, c + 1))
+                                               continue;
+                                       if (c > cstart && topltrims.find(c) != topltrims.end()
+                                                       && topltrims.find(c)->second) {
+                                               if (!isPartOfMultiColumn(row, c))
+                                                       --c;
+                                               break;
+                                       } else if (toprtrims.find(c) != toprtrims.end()
+                                                  && toprtrims.find(c)->second)
+                                               break;
+                               }
 
                                for (col_type j = cstart ; j < c ; ++j)
                                        if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
                                                ++offset;
-
-                               os << c + offset << "} ";
+                               col_type lastcol = (*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset;
+                               if (toprtrims.find(c) != toprtrims.end()
+                                   && toprtrims.find(c)->second)
+                                       trim += "r";
+
+                               os << cline;
+                               if (!trim.empty())
+                                       os << "(" << trim << ")";
+                               if (firstcol > lastcol)
+                                       // This can happen with bidi (swapped columns)
+                                       os << "{" << lastcol << '-' << firstcol << "}";
+                               else
+                                       os << "{" << firstcol << '-' << lastcol << "}";
+                               if (c == columns.size() - 1)
+                                       break;
+                               ++c;
                        }
                }
        }
@@ -2303,19 +2605,24 @@ void Tabular::TeXTopHLine(otexstream & os, row_type row, string const & lang,
 }
 
 
-void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const & lang,
-                            list<col_type> columns) const
+void Tabular::TeXBottomHLine(otexstream & os, row_type row, list<col_type> columns,
+                            list<col_type> logical_columns) const
 {
        // we output bottomlines of row r and the toplines of row r+1
        // if the latter do not span the whole tabular
 
        // get the bottomlines of row r, and toplines in next row
-       bool lastrow = row == nrows() - 1;
-       map<col_type, bool> bottomline, topline;
+       bool lastrow = row == getLastRow(!buffer().params().output_changes);
+       map<col_type, bool> bottomline, topline, topltrims, toprtrims, bottomltrims, bottomrtrims;
        bool nextrowset = true;
        for (auto const & c : columns) {
+               idx_type const idx = cellIndex(row, c);
                bottomline[c] = bottomLine(cellIndex(row, c));
+               bottomltrims[c] = bottomLineTrim(idx).first;
+               bottomrtrims[c] = bottomLineTrim(idx).second;
                topline[c] =  !lastrow && topLine(cellIndex(row + 1, c));
+               topltrims[c] = !lastrow && topLineTrim(cellIndex(row + 1, c)).first;
+               toprtrims[c] = !lastrow && topLineTrim(cellIndex(row + 1, c)).second;
                // If cell is part of a multirow and not the last cell of the
                // multirow, no line must be drawn.
                if (!lastrow)
@@ -2324,52 +2631,109 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const & lang,
                            && cell_info[row + 1][c].multirow != CELL_BEGIN_OF_MULTIROW) {
                                bottomline[c] = false;
                                topline[c] = false;
-                               }
+                               bottomltrims[c] = false;
+                               bottomrtrims[c] = false;
+                               topltrims[c] = false;
+                               toprtrims[c] = false;
+                       }
+               // copy trimming in multicolumn parts
+               if (isPartOfMultiColumn(row, c)) {
+                       topltrims[c] = topltrims[c-1];
+                       toprtrims[c] = toprtrims[c-1];
+                       bottomltrims[c] = bottomltrims[c-1];
+                       bottomrtrims[c] = bottomrtrims[c-1];
+               }
+                       
                nextrowset &= topline.find(c) != topline.end() && topline.find(c)->second;
        }
 
        // combine this row's bottom lines and next row's toplines if necessary
        col_type nset = 0;
+       bool have_trims = false;
        for (auto const & c : columns) {
                if (!nextrowset)
                        bottomline[c] = bottomline.find(c)->second || topline.find(c)->second;
+               bottomltrims[c] = (bottomltrims.find(c) != bottomltrims.end() && bottomltrims.find(c)->second)
+                               || (topltrims.find(c) != topltrims.end() && topltrims.find(c)->second);
+               bottomrtrims[c] = (bottomrtrims.find(c) != bottomrtrims.end() && bottomrtrims.find(c)->second)
+                               || (toprtrims.find(c) != toprtrims.end() && toprtrims.find(c)->second);
                if (bottomline.find(c)->second)
                        ++nset;
+               if ((bottomltrims.find(c) != bottomltrims.end() && bottomltrims.find(c)->second)
+                    || (bottomrtrims.find(c) != bottomrtrims.end() && bottomrtrims.find(c)->second))
+                       have_trims = true;
        }
 
        // do nothing if empty, OR incomplete row line with a topline in next row
-       if (nset == 0 || (nextrowset && nset != ncols()))
+       if (nset == 0 || (nextrowset && nset != columns.size()))
                return;
 
-       if (nset == ncols()) {
+       if (nset == columns.size() && !have_trims) {
                if (use_booktabs)
                        os << (lastrow ? "\\bottomrule" : "\\midrule");
                else
                        os << "\\hline ";
        } else {
-               for (auto & c : columns) {
+               string const cline = use_booktabs ? "\\cmidrule" : "\\cline";
+               col_type c = 0;
+               std::list<col_type>::const_iterator it1 = logical_columns.begin();
+               std::list<col_type>::const_iterator it2 = columns.begin();
+               // We need to iterate over the logical columns here, but take care for
+               // bidi swapping
+               for (; it1 != logical_columns.end() && it2 != columns.end(); ++it1, ++it2) {
+                       col_type cl = *it1;
+                       if (cl < c)
+                               continue;
+                       c = cl;
                        if (bottomline.find(c)->second) {
                                col_type offset = 0;
                                for (col_type j = 0 ; j < c; ++j)
                                        if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
                                                ++offset;
-
-                               //babel makes the "-" character an active one, so we have to suppress this here
-                               //see http://groups.google.com/group/comp.text.tex/browse_thread/thread/af769424a4a0f289#
-                               if (lang == "slovak" || lang == "czech")
-                                       os << "\\expandafter" << (use_booktabs ? "\\cmidrule" : "\\cline")
-                                       << "\\expandafter{\\expandafter" << c + 1 + offset << "\\string-";
-                               else
-                                       os << (use_booktabs ? "\\cmidrule{" : "\\cline{") << c + 1 + offset << '-';
-
+                               // If the two iterators differ, we are in bidi with swapped columns
+                               col_type firstcol = (*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset;
+                               while (isPartOfMultiColumn(row, c))
+                                       ++c;
+                               string trim;
+                               if (bottomltrims.find(c) != bottomltrims.end()
+                                    && bottomltrims.find(c)->second)
+                                       trim = "l";
                                col_type cstart = c;
-                               for ( ; c < ncols() && bottomline.find(c)->second; ++c) {}
+                               for ( ; c < ncols() - 1 && bottomline.find(c + 1)->second ; ++c) {
+                                       if (isMultiColumn(cellIndex(row, c))
+                                           && c < ncols() - 1
+                                           && isPartOfMultiColumn(row, c + 1))
+                                               continue;
+                                       if (c > cstart
+                                           && bottomltrims.find(c) != bottomltrims.end()
+                                           && bottomltrims.find(c)->second) {
+                                               if (!isPartOfMultiColumn(row, c))
+                                                       --c;
+                                               break;
+                                       } else if (bottomrtrims.find(c) != bottomrtrims.end()
+                                                  && bottomrtrims.find(c)->second)
+                                               break;
+                               }
 
                                for (col_type j = cstart ; j < c ; ++j)
                                        if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
                                                ++offset;
-
-                               os << c + offset << "} ";
+                               col_type lastcol = (*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset;
+                               if (bottomrtrims.find(c) != bottomrtrims.end()
+                                   && bottomrtrims.find(c)->second)
+                                       trim += "r";
+
+                               os << cline;
+                               if (!trim.empty())
+                                       os << "(" << trim << ")";
+                               if (firstcol > lastcol)
+                                       // This can happen with bidi (swapped columns)
+                                       os << "{" << lastcol << '-' << firstcol << "}";
+                               else
+                                       os << "{" << firstcol << '-' << lastcol << "}";
+                               if (c == columns.size() - 1)
+                                       break;
+                               ++c;
                        }
                }
        }
@@ -2575,7 +2939,8 @@ void Tabular::TeXCellPostamble(otexstream & os, idx_type cell,
 
 void Tabular::TeXLongtableHeaderFooter(otexstream & os,
                                       OutputParams const & runparams,
-                                      list<col_type> columns) const
+                                      list<col_type> columns,
+                                      list<col_type> logical_columns) const
 {
        if (!is_long_tabular)
                return;
@@ -2587,7 +2952,7 @@ void Tabular::TeXLongtableHeaderFooter(otexstream & os,
                        if (row_info[r].caption &&
                            !row_info[r].endfirsthead && !row_info[r].endhead &&
                            !row_info[r].endfoot && !row_info[r].endlastfoot)
-                               TeXRow(os, r, runparams, columns);
+                               TeXRow(os, r, runparams, columns, logical_columns);
                }
        }
        // output first header info
@@ -2596,7 +2961,7 @@ void Tabular::TeXLongtableHeaderFooter(otexstream & os,
                        os << "\\hline\n";
                for (row_type r = 0; r < nrows(); ++r) {
                        if (row_info[r].endfirsthead)
-                               TeXRow(os, r, runparams, columns);
+                               TeXRow(os, r, runparams, columns, logical_columns);
                }
                if (endfirsthead.bottomDL)
                        os << "\\hline\n";
@@ -2610,7 +2975,7 @@ void Tabular::TeXLongtableHeaderFooter(otexstream & os,
                        os << "\\hline\n";
                for (row_type r = 0; r < nrows(); ++r) {
                        if (row_info[r].endhead)
-                               TeXRow(os, r, runparams, columns);
+                               TeXRow(os, r, runparams, columns, logical_columns);
                }
                if (endhead.bottomDL)
                        os << "\\hline\n";
@@ -2622,7 +2987,7 @@ void Tabular::TeXLongtableHeaderFooter(otexstream & os,
                        os << "\\hline\n";
                for (row_type r = 0; r < nrows(); ++r) {
                        if (row_info[r].endfoot)
-                               TeXRow(os, r, runparams, columns);
+                               TeXRow(os, r, runparams, columns, logical_columns);
                }
                if (endfoot.bottomDL)
                        os << "\\hline\n";
@@ -2636,7 +3001,7 @@ void Tabular::TeXLongtableHeaderFooter(otexstream & os,
                        os << "\\hline\n";
                for (row_type r = 0; r < nrows(); ++r) {
                        if (row_info[r].endlastfoot)
-                               TeXRow(os, r, runparams, columns);
+                               TeXRow(os, r, runparams, columns, logical_columns);
                }
                if (endlastfoot.bottomDL)
                        os << "\\hline\n";
@@ -2657,15 +3022,10 @@ bool Tabular::isValidRow(row_type row) const
 
 void Tabular::TeXRow(otexstream & os, row_type row,
                     OutputParams const & runparams,
-                    list<col_type> columns) const
+                    list<col_type> columns, list<col_type> logical_columns) const
 {
-       idx_type cell = cellIndex(row, 0);
-       InsetTableCell const * cinset = cellInset(cell);
-       Paragraph const & cpar = cinset->paragraphs().front();
-       string const clang = cpar.getParLanguage(buffer().params())->lang();
-
        //output the top line
-       TeXTopHLine(os, row, clang, columns);
+       TeXTopHLine(os, row, columns, logical_columns);
 
        if (row_info[row].top_space_default) {
                if (use_booktabs)
@@ -2686,18 +3046,20 @@ void Tabular::TeXRow(otexstream & os, row_type row,
        bool ismulticol = false;
        bool ismultirow = false;
 
-       // The bidi package (loaded by polyglossia) reverses RTL table columns
+       // The bidi package (loaded by polyglossia with XeTeX) reverses RTL table columns
+       // Luabibdi (used by LuaTeX) behaves like classic
        bool const bidi_rtl =
                runparams.local_font->isRightToLeft()
-               && runparams.use_polyglossia;
+               && runparams.useBidiPackage();
+       bool const ct = !buffer().params().output_changes;
        idx_type lastcell =
-               bidi_rtl ? getFirstCellInRow(row) : getLastCellInRow(row);
+               bidi_rtl ? getFirstCellInRow(row, ct) : getLastCellInRow(row, ct);
 
        for (auto const & c : columns) {
                if (isPartOfMultiColumn(row, c))
                        continue;
 
-               cell = cellIndex(row, c);
+               idx_type cell = cellIndex(row, c);
 
                if (isPartOfMultiRow(row, c)
                    && column_info[c].alignment != LYX_ALIGN_DECIMAL) {
@@ -2812,7 +3174,7 @@ void Tabular::TeXRow(otexstream & os, row_type row,
        os << '\n';
 
        //output the bottom line
-       TeXBottomHLine(os, row, clang, columns);
+       TeXBottomHLine(os, row, columns, logical_columns);
 
        if (row_info[row].interline_space_default) {
                if (use_booktabs)
@@ -2855,6 +3217,58 @@ void Tabular::latex(otexstream & os, OutputParams const & runparams) const
                        os << "\\begin{turn}{" << convert<string>(rotate) << "}\n";
        }
 
+       // The bidi package (loaded by polyglossia with XeTeX) swaps the column
+       // order for RTL (#9686). Thus we use this list.
+       bool const bidi_rtl =
+               runparams.local_font->isRightToLeft()
+               && runparams.useBidiPackage();
+       list<col_type> columns;
+       list<col_type> logical_columns;
+       for (col_type cl = 0; cl < ncols(); ++cl) {
+               if (!buffer().params().output_changes && column_info[cl].change.deleted())
+                       continue;
+               if (bidi_rtl)
+                       columns.push_front(cl);
+               else
+                       columns.push_back(cl);
+               // for some calculations, we need the logical (non-swapped)
+               // columns also in bidi.
+               logical_columns.push_back(cl);
+       }
+
+       // If we use \cline or \cmidrule, we need to locally de-activate
+       // the - character when using languages that activate it (e.g., Czech, Slovak).
+       bool deactivate_chars = false;
+       if ((runparams.use_babel || runparams.use_polyglossia)
+           && contains(runparams.active_chars, '-')) {
+               bool have_clines = false;
+               // Check if we use \cline or \cmidrule
+               for (row_type row = 0; row < nrows(); ++row) {
+                       col_type bset = 0, tset = 0;
+                       for (auto const & c : columns) {
+                               idx_type const idx = cellIndex(row, c);
+                               if (bottomLineTrim(idx).first || bottomLineTrim(idx).second
+                                   || topLineTrim(idx).first || topLineTrim(idx).second) {
+                                       have_clines = true;
+                                       break;
+                               }
+                               if (bottomLine(cellIndex(row, c)))
+                                       ++bset;
+                               if (topLine(cellIndex(row, c)))
+                                       ++tset;
+                       }
+                       if ((bset > 0 && bset < ncols()) || (tset > 0 && tset < ncols())) {
+                               have_clines = true;
+                               break;
+                       }
+               }
+               if (have_clines) {
+                       deactivate_chars = true;
+                       os << "\\begingroup\n"
+                          << "\\catcode`\\-=12\n";
+               }
+       }
+
        if (is_long_tabular) {
                if (is_xltabular)
                        os << "\\begin{xltabular}";
@@ -2905,19 +3319,6 @@ void Tabular::latex(otexstream & os, OutputParams const & runparams) const
        if (is_tabular_star)
                os << "@{\\extracolsep{\\fill}}";
 
-       // The bidi package (loaded by polyglossia) swaps the column
-       // order for RTL (#9686). Thus we use this list.
-       bool const bidi_rtl =
-               runparams.local_font->isRightToLeft()
-               && runparams.use_polyglossia;
-       list<col_type> columns;
-       for (col_type cl = 0; cl < ncols(); ++cl) {
-               if (bidi_rtl)
-                       columns.push_front(cl);
-               else
-                       columns.push_back(cl);
-       }
-
        for (auto const & c : columns) {
                if ((bidi_rtl && columnRightLine(c)) || (!bidi_rtl && columnLeftLine(c)))
                        os << '|';
@@ -3047,15 +3448,17 @@ void Tabular::latex(otexstream & os, OutputParams const & runparams) const
        }
        os << "}\n";
 
-       TeXLongtableHeaderFooter(os, runparams, columns);
+       TeXLongtableHeaderFooter(os, runparams, columns, logical_columns);
 
        //+---------------------------------------------------------------------
        //+                      the single row and columns (cells)            +
        //+---------------------------------------------------------------------
 
        for (row_type r = 0; r < nrows(); ++r) {
+               if (!buffer().params().output_changes && row_info[r].change.deleted())
+                       continue;
                if (isValidRow(r)) {
-                       TeXRow(os, r, runparams, columns);
+                       TeXRow(os, r, runparams, columns, logical_columns);
                        if (is_long_tabular && row_info[r].newpage)
                                os << "\\newpage\n";
                }
@@ -3079,6 +3482,10 @@ void Tabular::latex(otexstream & os, OutputParams const & runparams) const
                        os << "\\end{tabular}";
        }
 
+       if (deactivate_chars)
+               // close the group
+               os << "\n\\endgroup\n";
+
        if (rotate != 0) {
                if (is_long_tabular)
                        os << breakln << "\\end{landscape}";
@@ -3710,7 +4117,7 @@ bool InsetTableCell::allowParagraphCustomization(idx_type) const
 
 bool InsetTableCell::forceLocalFontSwitch() const
 {
-       return isFixedWidth;
+       return true;
 }
 
 
@@ -3719,6 +4126,9 @@ bool InsetTableCell::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        bool enabled = true;
        switch (cmd.action()) {
+       case LFUN_INSET_DISSOLVE:
+               enabled = false;
+               break;
        case LFUN_MATH_DISPLAY:
                if (!hasFixedWidth()) {
                        enabled = false;
@@ -3768,10 +4178,11 @@ docstring InsetTableCell::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 void InsetTableCell::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        TextMetrics & tm = mi.base.bv->textMetrics(&text());
+       int const horiz_offset = leftOffset(mi.base.bv) + rightOffset(mi.base.bv);
 
        // Hand font through to contained lyxtext:
        tm.font_.fontInfo() = mi.base.font;
-       mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
+       mi.base.textwidth -= horiz_offset;
 
        // This can happen when a layout has a left and right margin,
        // and the view is made very narrow. We can't do better than
@@ -3781,15 +4192,14 @@ void InsetTableCell::metrics(MetricsInfo & mi, Dimension & dim) const
 
        // We tell metrics here not to expand on multiple pars
        // This is the difference to InsetText::Metrics
-       // FIXME: pars with newlines are still too wide!
        if (hasFixedWidth())
                tm.metrics(mi, dim, mi.base.textwidth, false);
        else
                tm.metrics(mi, dim, 0, false);
-       mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
-       dim.asc += TEXT_TO_INSET_OFFSET;
-       dim.des += TEXT_TO_INSET_OFFSET;
-       dim.wid += 2 * TEXT_TO_INSET_OFFSET;
+       mi.base.textwidth += horiz_offset;
+       dim.asc += topOffset(mi.base.bv);
+       dim.des += bottomOffset(mi.base.bv);
+       dim.wid += horiz_offset;
 }
 
 
@@ -3938,8 +4348,10 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
                        Length const p_width = tabular.getPWidth(cell);
                        if (!p_width.zero())
                                m.base.textwidth = mi.base.inPixels(p_width);
+                       else if (tabular.column_info[c].varwidth)
+                               m.base.textwidth = tabular.column_info[c].width;
                        tabular.cellInset(cell)->metrics(m, dim0);
-                       if (!p_width.zero())
+                       if (!p_width.zero() || tabular.column_info[c].varwidth)
                                dim0.wid = m.base.textwidth;
                        tabular.cellInfo(cell).width = dim0.wid + 2 * WIDTH_OF_LINE
                                + tabular.interColumnSpace(cell);
@@ -3978,9 +4390,9 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
                        tabular.cell_info[r][c].decimal_width = decimal_width;
 
                        // with LYX_VALIGN_BOTTOM the descent is relative to the last par
-                       // = descent of text in last par + TEXT_TO_INSET_OFFSET:
+                       // = descent of text in last par + bottomOffset:
                        int const lastpardes = tm.last().second->descent()
-                               + TEXT_TO_INSET_OFFSET;
+                               + bottomOffset(mi.base.bv);
                        int offset = 0;
                        switch (tabular.getVAlignment(cell)) {
                                case Tabular::LYX_VALIGN_TOP:
@@ -4006,7 +4418,10 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
                tabular.setRowDescent(r, maxdes + ADD_TO_HEIGHT + bottom_space);
        }
 
-       tabular.updateColumnWidths();
+       // We need to recalculate the metrics after column width calculation
+       // with xtabular (possibly multiple times, so the call is recursive).
+       if (tabular.updateColumnWidths(mi) && tabular.hasVarwidthColumn())
+               metrics(mi, dim);
        dim.asc = tabular.rowAscent(0) - tabular.offsetVAlignment();
        dim.des = tabular.height() - dim.asc;
        dim.wid = tabular.width() + 2 * ADD_TO_TABULAR_WIDTH;
@@ -4057,6 +4472,9 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
        bool const original_selection_state = pi.selected;
 
        idx_type idx = 0;
+       
+       // Save tabular change status
+       Change tab_change = pi.change;
 
        int yy = y + tabular.offsetVAlignment();
        for (row_type r = 0; r < tabular.nrows(); ++r) {
@@ -4073,6 +4491,15 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
                        }
 
                        pi.selected |= isCellSelected(cur, r, c);
+
+                       // Mark deleted rows/columns
+                       if (tabular.column_info[c].change.changed())
+                               pi.change = tabular.column_info[c].change;
+                       else if (tabular.row_info[r].change.changed())
+                               pi.change = tabular.row_info[r].change;
+                       else
+                               pi.change = tab_change;
+
                        int const cx = nx + tabular.textHOffset(idx);
                        int const cy = yy + tabular.textVOffset(idx);
                        // Cache the Inset position.
@@ -4151,35 +4578,81 @@ void InsetTabular::drawSelection(PainterInfo & pi, int x, int y) const
 }
 
 
+namespace {
+
+void tabline(PainterInfo const & pi, int x1, int y1, int x2, int y2, int lt, int rt,
+             Color const incol, bool drawline, bool heavy = false)
+{
+       Color const col = drawline ? incol : Color_tabularonoffline;
+       if (drawline && lt > 0)
+               pi.pain.line(x1, y1, x1 + lt, y2, pi.textColor(Color_tabularonoffline),
+                                        Painter::line_onoffdash,
+                                        Painter::thin_line);
+       pi.pain.line(x1 + lt, y1, x2 - rt, y2, pi.textColor(col),
+                                drawline ? Painter::line_solid : Painter::line_onoffdash,
+                                (heavy ? 2 : 1) * Painter::thin_line);
+       if (drawline && rt > 0)
+               pi.pain.line(x2 - rt, y1, x2, y2, pi.textColor(Color_tabularonoffline),
+                                        Painter::line_onoffdash,
+                                        Painter::thin_line);
+}
+
+}
+
+
 void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y,
                                 row_type row, idx_type cell) const
 {
        y -= tabular.rowAscent(row);
        int const w = tabular.cellWidth(cell);
        int const h = tabular.cellHeight(cell);
-       Color const linecolor = pi.textColor(Color_tabularline);
-       Color const gridcolor = pi.textColor(Color_tabularonoffline);
+       int lt = 0;
+       int rt = 0;
+
+       col_type const col = tabular.cellColumn(cell);
+
+       // Colour the frame if rows/columns are added or deleted
+       Color colour = Color_tabularline;
+       if (tabular.column_info[col].change.changed()
+           || tabular.row_info[row].change.changed())
+               colour = InsetTableCell(*tabular.cellInset(cell)).paragraphs().front().lookupChange(0).color();
 
        // Top
        bool drawline = tabular.topLine(cell)
                || (row > 0 && tabular.bottomLine(tabular.cellAbove(cell)));
-       pi.pain.line(x, y, x + w, y,
-               drawline ? linecolor : gridcolor,
-               drawline ? Painter::line_solid : Painter::line_onoffdash);
+       bool heavy = tabular.use_booktabs
+                       && (row == 0 || (tabular.is_long_tabular && row == 1 && tabular.ltCaption(0)))
+                       && tabular.rowTopLine(row);
+       if (tabular.topLineTrim(cell).first
+           || (row > 0 && tabular.bottomLineTrim(tabular.cellIndex(row - 1, col)).first))
+               lt = 10;
+       if (tabular.topLineTrim(cell).second
+           || (row > 0 && tabular.bottomLineTrim(tabular.cellIndex(row - 1, col)).second))
+               rt = 10;
+       tabline(pi, x, y, x + w, y, lt, rt, colour, drawline, heavy);
 
        // Bottom
+       lt = rt = 0;
        drawline = tabular.bottomLine(cell);
-       pi.pain.line(x, y + h, x + w, y + h,
-               drawline ? linecolor : gridcolor,
-               drawline ? Painter::line_solid : Painter::line_onoffdash);
+       row_type const lastrow = tabular.nrows() - 1;
+       // Consider multi-rows
+       row_type r = row;
+       while (r < lastrow && tabular.isMultiRow(tabular.cellIndex(r, col))
+               && tabular.isPartOfMultiRow(r + 1, col))
+               r++;
+       heavy = tabular.use_booktabs
+               && ((row == lastrow && tabular.rowBottomLine(row))
+                   || (r == lastrow && tabular.rowBottomLine(r)));
+       if (tabular.bottomLineTrim(cell).first)
+               lt = 10;
+       if (tabular.bottomLineTrim(cell).second)
+               rt = 10;
+       tabline(pi, x, y + h, x + w, y + h, lt, rt, colour, drawline, heavy);
 
        // Left
-       col_type const col = tabular.cellColumn(cell);
        drawline = tabular.leftLine(cell)
                || (col > 0 && tabular.rightLine(tabular.cellIndex(row, col - 1)));
-       pi.pain.line(x, y, x, y + h,
-               drawline ? linecolor : gridcolor,
-               drawline ? Painter::line_solid : Painter::line_onoffdash);
+       tabline(pi, x, y, x, y + h, 0, 0, colour, drawline);
 
        // Right
        x -= tabular.interColumnSpace(cell);
@@ -4190,9 +4663,7 @@ void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y,
        drawline = tabular.rightLine(cell)
                   || (next_cell_col < tabular.ncols()
                       && tabular.leftLine(tabular.cellIndex(row, next_cell_col)));
-       pi.pain.line(x + w, y, x + w, y + h,
-               drawline ? linecolor : gridcolor,
-               drawline ? Painter::line_solid : Painter::line_onoffdash);
+       tabline(pi, x + w, y, x + w, y + h, 0, 0, colour, drawline);
 }
 
 
@@ -4702,6 +5173,18 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_PASTE:
                if (!tabularStackDirty()) {
+                       // Check if we have plain text or HTML with rows/columns.
+                       // and if so, pass over to LFUN_CLIPBOARD_PASTE
+                       if (theClipboard().hasTextContents(Clipboard::AnyTextType)
+                           && !theClipboard().hasTextContents(Clipboard::LyXTextType)) {
+                               docstring const clip =
+                                       theClipboard().getAsText(Clipboard::AnyTextType);
+                               if (clip.find_first_of(from_ascii("\t\n")) != docstring::npos) {
+                                       FuncRequest ncmd = FuncRequest(LFUN_CLIPBOARD_PASTE, cmd.argument());
+                                       doDispatch(cur, ncmd);
+                                       break;
+                               }
+                       }
                        if (!cur.selIsMultiCell())
                                cell(cur.idx())->dispatch(cur, cmd);
                        break;
@@ -4712,6 +5195,8 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
                }
                break;
 
+       case LFUN_CHANGE_ACCEPT:
+       case LFUN_CHANGE_REJECT:
        case LFUN_FONT_EMPH:
        case LFUN_FONT_BOLD:
        case LFUN_FONT_BOLDSYMBOL:
@@ -4735,14 +5220,55 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_WORD_CAPITALIZE:
        case LFUN_WORD_UPCASE:
        case LFUN_WORD_LOWCASE:
-       case LFUN_CHARS_TRANSPOSE:
+       case LFUN_CHARS_TRANSPOSE: {
+               bool const ct = (act == LFUN_CHANGE_ACCEPT || act == LFUN_CHANGE_REJECT);
                if (cur.selIsMultiCell()) {
                        row_type rs, re;
                        col_type cs, ce;
                        getSelection(cur, rs, re, cs, ce);
                        Cursor tmpcur = cur;
                        for (row_type r = rs; r <= re; ++r) {
+                               if (ct && cs == 0 && ce == tabular.ncols() - 1) {
+                                       // whole row selected
+                                       if (act == LFUN_CHANGE_ACCEPT) {
+                                               if (tabular.row_info[r].change.inserted())
+                                                       tabular.row_info[r].change.setUnchanged();
+                                               else if (tabular.row_info[r].change.deleted()) {
+                                                       tabular.deleteRow(r, true);
+                                                       --re;
+                                                       continue;
+                                               }
+                                       } else {
+                                               if (tabular.row_info[r].change.deleted())
+                                                       tabular.row_info[r].change.setUnchanged();
+                                               else if (tabular.row_info[r].change.inserted()) {
+                                                       tabular.deleteRow(r, true);
+                                                       --re;
+                                                       continue;
+                                               }
+                                       }
+                               }
                                for (col_type c = cs; c <= ce; ++c) {
+                                       if (ct && rs == 0 && re == tabular.nrows() - 1) {
+                                               // whole col selected
+                                               if (act == LFUN_CHANGE_ACCEPT) {
+                                                       if (tabular.column_info[c].change.inserted())
+                                                               tabular.column_info[c].change.setUnchanged();
+                                                       else if (tabular.column_info[c].change.deleted()) {
+                                                               tabular.deleteColumn(c, true);
+                                                               --ce;
+                                                               continue;
+                                                       }
+                                               } else {
+                                                       if (tabular.column_info[c].change.deleted())
+                                                               tabular.column_info[c].change.setUnchanged();
+                                                       else if (tabular.column_info[c].change.inserted()) {
+                                                               tabular.deleteColumn(c, true);
+                                                               --ce;
+                                                               continue;
+                                                       }
+                                               }
+                                       }
                                        // cursor follows cell:
                                        tmpcur.idx() = tabular.cellIndex(r, c);
                                        // select this cell only:
@@ -4756,11 +5282,53 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
                                        cell(tmpcur.idx())->dispatch(tmpcur, cmd);
                                }
                        }
+                       if (ct) {
+                               tabular.updateIndexes();
+                               // cursor might be invalid
+                               cur.fixIfBroken();
+                               // change bar might need to be redrawn
+                               cur.screenUpdateFlags(Update::Force);
+                               cur.forceBufferUpdate();
+                       }
                        break;
                } else {
                        cell(cur.idx())->dispatch(cur, cmd);
                        break;
                }
+       }
+
+       case LFUN_CHANGE_NEXT:
+       case LFUN_CHANGE_PREVIOUS: {
+               // BufferView::dispatch has already moved the cursor, we just
+               // need to select here if we have a changed row or column
+               if (tabular.row_info[tabular.cellRow(cur.idx())].change.changed()) {
+                       // select row
+                       cur.idx() = tabular.getFirstCellInRow(tabular.cellRow(cur.idx()));
+                       cur.pit() = 0;
+                       cur.pos() = 0;
+                       cur.resetAnchor();
+                       cur.idx() = tabular.getLastCellInRow(tabular.cellRow(cur.idx()));
+                       cur.pit() = cur.lastpit();
+                       cur.pos() = cur.lastpos();
+                       cur.selection(true);
+                       bvcur = cur;
+                       rowselect_ = true;
+               }
+               else if (tabular.column_info[tabular.cellColumn(cur.idx())].change.changed()) {
+                       // select column
+                       cur.idx() = tabular.cellIndex(0, tabular.cellColumn(cur.idx()));
+                       cur.pit() = 0;
+                       cur.pos() = 0;
+                       cur.resetAnchor();
+                       cur.idx() = tabular.cellIndex(tabular.nrows() - 1, tabular.cellColumn(cur.idx()));
+                       cur.pit() = cur.lastpit();
+                       cur.pos() = cur.lastpos();
+                       cur.selection(true);
+                       bvcur = cur;
+                       colselect_ = true;
+               }
+               break;
+       }
 
        case LFUN_INSET_SETTINGS:
                // relay this lfun to Inset, not to the cell.
@@ -4902,10 +5470,15 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
 
                case Tabular::SET_ALL_LINES:
                case Tabular::UNSET_ALL_LINES:
+               case Tabular::SET_INNER_LINES:
                case Tabular::SET_BORDER_LINES:
                        status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx())));
                        break;
 
+               case Tabular::RESET_FORMAL_DEFAULT:
+                       status.setEnabled(tabular.use_booktabs);
+                       break;
+
                case Tabular::SET_LINE_TOP:
                case Tabular::SET_LINE_BOTTOM:
                        status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx())));
@@ -4917,6 +5490,20 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
                                          && !tabular.ltCaption(tabular.cellRow(cur.idx())));
                        break;
 
+               case Tabular::SET_LTRIM_TOP:
+               case Tabular::SET_RTRIM_TOP:
+                       status.setEnabled(tabular.use_booktabs
+                                         && tabular.cellRow(cur.idx()) != 0
+                                         && !tabular.ltCaption(tabular.cellRow(cur.idx())));
+                       break;
+
+               case Tabular::SET_LTRIM_BOTTOM:
+               case Tabular::SET_RTRIM_BOTTOM:
+                       status.setEnabled(tabular.use_booktabs
+                                         && tabular.cellRow(cur.idx()) != tabular.nrows() - 1
+                                         && !tabular.ltCaption(tabular.cellRow(cur.idx())));
+                       break;
+
                case Tabular::TOGGLE_LINE_TOP:
                        status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx())));
                        status.setOnOff(tabular.topLine(cur.idx()));
@@ -4939,6 +5526,30 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
                        status.setOnOff(tabular.rightLine(cur.idx()));
                        break;
 
+               case Tabular::TOGGLE_LTRIM_TOP:
+                       status.setEnabled(tabular.use_booktabs
+                                         && !tabular.ltCaption(tabular.cellRow(cur.idx())));
+                       status.setOnOff(tabular.topLineTrim(cur.idx()).first);
+                       break;
+
+               case Tabular::TOGGLE_RTRIM_TOP:
+                       status.setEnabled(tabular.use_booktabs
+                                         && !tabular.ltCaption(tabular.cellRow(cur.idx())));
+                       status.setOnOff(tabular.topLineTrim(cur.idx()).second);
+                       break;
+
+               case Tabular::TOGGLE_LTRIM_BOTTOM:
+                       status.setEnabled(tabular.use_booktabs
+                                         && !tabular.ltCaption(tabular.cellRow(cur.idx())));
+                       status.setOnOff(tabular.bottomLineTrim(cur.idx()).first);
+                       break;
+
+               case Tabular::TOGGLE_RTRIM_BOTTOM:
+                       status.setEnabled(tabular.use_booktabs
+                                         && !tabular.ltCaption(tabular.cellRow(cur.idx())));
+                       status.setOnOff(tabular.bottomLineTrim(cur.idx()).second);
+                       break;
+
                // multirow cells only inherit the alignment of the column if the column has
                // no width, otherwise they are left-aligned
                // therefore allow always left but right and center only if there is no width
@@ -5249,6 +5860,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
        // disable these with multiple cells selected
        case LFUN_INSET_INSERT:
        case LFUN_TABULAR_INSERT:
+       case LFUN_TABULAR_STYLE_INSERT:
        case LFUN_FLEX_INSERT:
        case LFUN_FLOAT_INSERT:
        case LFUN_FLOAT_WIDE_INSERT:
@@ -5273,6 +5885,37 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
                        return cell(cur.idx())->getStatus(cur, cmd, status);
        }
 
+       case LFUN_CHANGE_ACCEPT:
+       case LFUN_CHANGE_REJECT: {
+               if (cur.selIsMultiCell()) {
+                       row_type rs, re;
+                       col_type cs, ce;
+                       getSelection(cur, rs, re, cs, ce);
+                       for (row_type r = rs; r <= re; ++r) {
+                               if (tabular.row_info[r].change.changed()) {
+                                       status.setEnabled(true);
+                                       return true;
+                               }
+                               for (col_type c = cs; c <= ce; ++c) {
+                                       if (tabular.column_info[c].change.changed()) {
+                                               status.setEnabled(true);
+                                               return true;
+                                       }
+                               }
+                       }
+               } else {
+                       if (tabular.row_info[tabular.cellRow(cur.idx())].change.changed()) {
+                               status.setEnabled(true);
+                               return true;
+                       }
+                       else if (tabular.column_info[tabular.cellColumn(cur.idx())].change.changed()) {
+                               status.setEnabled(true);
+                               return true;
+                       }
+               }
+               return cell(cur.idx())->getStatus(cur, cmd, status);
+       }
+
        // disable in non-fixed-width cells
        case LFUN_PARAGRAPH_BREAK:
                // multirow does not allow paragraph breaks
@@ -5712,6 +6355,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
        row_type sel_row_start;
        row_type sel_row_end;
        bool setLines = false;
+       bool setLinesInnerOnly = false;
        LyXAlignment setAlign = LYX_ALIGN_LEFT;
        Tabular::VAlignment setVAlign = Tabular::LYX_VALIGN_TOP;
 
@@ -5773,10 +6417,12 @@ void InsetTabular::tabularFeatures(Cursor & cur,
 
        case Tabular::SET_PWIDTH: {
                Length const len(value);
-               tabular.setColumnPWidth(cur, cur.idx(), len);
-               if (len.zero()
-                   && tabular.getAlignment(cur.idx(), true) == LYX_ALIGN_BLOCK)
-                       tabularFeatures(cur, Tabular::ALIGN_CENTER, string());
+               for (col_type c = sel_col_start; c <= sel_col_end; ++c) {
+                       tabular.setColumnPWidth(cur, tabular.cellIndex(row, c), len);
+                       if (len.zero()
+                           && tabular.getAlignment(tabular.cellIndex(row, c), true) == LYX_ALIGN_BLOCK)
+                               tabularFeatures(cur, Tabular::ALIGN_CENTER, string());
+               }
                break;
        }
 
@@ -5786,7 +6432,8 @@ void InsetTabular::tabularFeatures(Cursor & cur,
 
        case Tabular::TOGGLE_VARWIDTH_COLUMN: {
                bool const varwidth = value == "on";
-               tabular.toggleVarwidth(cur.idx(), varwidth);
+               for (col_type c = sel_col_start; c <= sel_col_end; ++c)
+                       tabular.toggleVarwidth(tabular.cellIndex(row, c), varwidth);
                break;
        }
 
@@ -5815,9 +6462,12 @@ void InsetTabular::tabularFeatures(Cursor & cur,
 
        case Tabular::DELETE_ROW:
                if (sel_row_end == tabular.nrows() - 1 && sel_row_start != 0) {
-                       for (col_type c = 0; c < tabular.ncols(); c++)
+                       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)));
+                               tabular.setBottomLineTrim(tabular.cellIndex(sel_row_start - 1, c),
+                                       tabular.bottomLineTrim(tabular.cellIndex(sel_row_end, c)));
+                       }
                }
 
                for (row_type r = sel_row_start; r <= sel_row_end; ++r)
@@ -5902,6 +6552,46 @@ void InsetTabular::tabularFeatures(Cursor & cur,
                break;
        }
 
+       case Tabular::SET_LTRIM_TOP:
+       case Tabular::TOGGLE_LTRIM_TOP: {
+               bool l = (feature == Tabular::SET_LTRIM_TOP)
+                              ? (value == "true") : !tabular.topLineTrim(cur.idx()).first;
+               for (row_type r = sel_row_start; r <= sel_row_end; ++r)
+                       for (col_type c = sel_col_start; c <= sel_col_end; ++c)
+                               tabular.setTopLineLTrim(tabular.cellIndex(r, c), l);
+               break;
+       }
+
+       case Tabular::SET_RTRIM_TOP:
+       case Tabular::TOGGLE_RTRIM_TOP: {
+               bool l = (feature == Tabular::SET_RTRIM_TOP)
+                              ? (value == "true") : !tabular.topLineTrim(cur.idx()).second;
+               for (row_type r = sel_row_start; r <= sel_row_end; ++r)
+                       for (col_type c = sel_col_start; c <= sel_col_end; ++c)
+                               tabular.setTopLineRTrim(tabular.cellIndex(r, c), l);
+               break;
+       }
+
+       case Tabular::SET_LTRIM_BOTTOM:
+       case Tabular::TOGGLE_LTRIM_BOTTOM: {
+               bool l = (feature == Tabular::SET_LTRIM_BOTTOM)
+                              ? (value == "true") : !tabular.bottomLineTrim(cur.idx()).first;
+               for (row_type r = sel_row_start; r <= sel_row_end; ++r)
+                       for (col_type c = sel_col_start; c <= sel_col_end; ++c)
+                               tabular.setBottomLineLTrim(tabular.cellIndex(r, c), l);
+               break;
+       }
+
+       case Tabular::SET_RTRIM_BOTTOM:
+       case Tabular::TOGGLE_RTRIM_BOTTOM: {
+               bool l = (feature == Tabular::SET_RTRIM_BOTTOM)
+                              ? (value == "true") : !tabular.bottomLineTrim(cur.idx()).second;
+               for (row_type r = sel_row_start; r <= sel_row_end; ++r)
+                       for (col_type c = sel_col_start; c <= sel_col_end; ++c)
+                               tabular.setBottomLineRTrim(tabular.cellIndex(r, c), l);
+               break;
+       }
+
        case Tabular::SET_LINE_LEFT:
        case Tabular::TOGGLE_LINE_LEFT: {
                bool lineSet = (feature == Tabular::SET_LINE_LEFT)
@@ -6061,6 +6751,9 @@ void InsetTabular::tabularFeatures(Cursor & cur,
                break;
        }
 
+       case Tabular::SET_INNER_LINES:
+               setLinesInnerOnly = true;
+               // fall through
        case Tabular::SET_ALL_LINES:
                setLines = true;
                // fall through
@@ -6068,13 +6761,30 @@ void InsetTabular::tabularFeatures(Cursor & cur,
                for (row_type r = sel_row_start; r <= sel_row_end; ++r)
                        for (col_type c = sel_col_start; c <= sel_col_end; ++c) {
                                idx_type const cell = tabular.cellIndex(r, c);
-                               tabular.setTopLine(cell, setLines);
-                               tabular.setBottomLine(cell, setLines);
-                               tabular.setRightLine(cell, setLines);
-                               tabular.setLeftLine(cell, setLines);
+                               if (!setLinesInnerOnly || r != sel_row_start)
+                                       tabular.setTopLine(cell, setLines);
+                               if ((!setLinesInnerOnly || r != sel_row_end)
+                                   && (!setLines || r == sel_row_end))
+                                       tabular.setBottomLine(cell, setLines);
+                               if ((!setLinesInnerOnly || c != sel_col_end)
+                                   && (!setLines || c == sel_col_end))
+                                       tabular.setRightLine(cell, setLines);
+                               if ((!setLinesInnerOnly || c != sel_col_start))
+                                       tabular.setLeftLine(cell, setLines);
                        }
                break;
 
+       case Tabular::RESET_FORMAL_DEFAULT:
+               for (row_type r = 0; r < tabular.nrows(); ++r) {
+                       bool const head_or_foot = r == 0 || r == tabular.nrows() - 1;
+                       for (col_type c = 0; c < tabular.ncols(); ++c) {
+                               idx_type const cell = tabular.cellIndex(r, c);
+                               tabular.setTopLine(cell, head_or_foot);
+                               tabular.setBottomLine(cell, head_or_foot);
+                       }
+               }
+               break;
+
        case Tabular::SET_BORDER_LINES:
                for (row_type r = sel_row_start; r <= sel_row_end; ++r) {
                        tabular.setLeftLine(tabular.cellIndex(r, sel_col_start), true);
@@ -6146,8 +6856,6 @@ void InsetTabular::tabularFeatures(Cursor & cur,
                tabular.longtabular_alignment = Tabular::LYX_LONGTABULAR_ALIGN_RIGHT;
                break;
 
-
-
        case Tabular::SET_ROTATE_CELL:
                for (row_type r = sel_row_start; r <= sel_row_end; ++r)
                        for (col_type c = sel_col_start; c <= sel_col_end; ++c)
@@ -6519,6 +7227,20 @@ Text * InsetTabular::getText(int idx) const
 }
 
 
+bool InsetTabular::isChanged() const
+{
+       for (idx_type idx = 0; idx < nargs(); ++idx) {
+               if (cell(idx)->isChanged())
+                       return true;
+               if (tabular.row_info[tabular.cellRow(idx)].change.changed())
+                       return true;
+               if (tabular.column_info[tabular.cellColumn(idx)].change.changed())
+                       return true;
+       }
+       return false;
+}
+
+
 void InsetTabular::setChange(Change const & change)
 {
        for (idx_type idx = 0; idx < nargs(); ++idx)
@@ -6530,6 +7252,19 @@ void InsetTabular::acceptChanges()
 {
        for (idx_type idx = 0; idx < nargs(); ++idx)
                cell(idx)->acceptChanges();
+       for (row_type row = 0; row < tabular.nrows(); ++row) {
+               if (tabular.row_info[row].change.inserted())
+                       tabular.row_info[row].change.setUnchanged();
+               else if (tabular.row_info[row].change.deleted())
+                       tabular.deleteRow(row, true);
+       }
+       for (col_type col = 0; col < tabular.ncols(); ++col) {
+               if (tabular.column_info[col].change.inserted())
+                       tabular.column_info[col].change.setUnchanged();
+               else if (tabular.column_info[col].change.deleted())
+                       tabular.deleteColumn(col, true);
+       }
+       tabular.updateIndexes();
 }
 
 
@@ -6537,6 +7272,19 @@ void InsetTabular::rejectChanges()
 {
        for (idx_type idx = 0; idx < nargs(); ++idx)
                cell(idx)->rejectChanges();
+       for (row_type row = 0; row < tabular.nrows(); ++row) {
+               if (tabular.row_info[row].change.deleted())
+                       tabular.row_info[row].change.setUnchanged();
+               else if (tabular.row_info[row].change.inserted())
+                       tabular.deleteRow(row, true);
+       }
+       for (col_type col = 0; col < tabular.ncols(); ++col) {
+               if (tabular.column_info[col].change.deleted())
+                       tabular.column_info[col].change.setUnchanged();
+               else if (tabular.column_info[col].change.inserted())
+                       tabular.deleteColumn(col, true);
+       }
+       tabular.updateIndexes();
 }
 
 
@@ -6596,20 +7344,26 @@ bool InsetTabular::insertPlaintextString(BufferView & bv, docstring const & buf,
        }
 
        size_t op = 0;
-       idx_type const cells = loctab->numberofcells;
+       idx_type cells = loctab->numberofcells;
        p = 0;
        cols = ocol;
        rows = loctab->nrows();
-       col_type const columns = loctab->ncols();
+       col_type columns = loctab->ncols();
 
-       while (cell < cells && p < len && row < rows &&
+       while (p < len &&
               (p = buf.find_first_of(from_ascii("\t\n"), p)) != docstring::npos)
        {
                if (p >= len)
                        break;
                switch (buf[p]) {
                case '\t':
-                       // we can only set this if we are not too far right
+                       // append column if necessary
+                       if (cols == columns) {
+                               loctab->appendColumn(cols - 1);
+                               columns = loctab->ncols();
+                               cells = loctab->numberofcells;
+                               ++cell;
+                       }
                        if (cols < columns) {
                                shared_ptr<InsetTableCell> inset = loctab->cellInset(cell);
                                Font const font = bv.textMetrics(&inset->text()).
@@ -6631,6 +7385,12 @@ bool InsetTabular::insertPlaintextString(BufferView & bv, docstring const & buf,
                        }
                        cols = ocol;
                        ++row;
+                       // append row if necessary
+                       if (row == rows && p < len - 1) {
+                               loctab->appendRow(row - 1);
+                               rows = loctab->nrows();
+                               cells = loctab->numberofcells;
+                       }
                        if (row < rows)
                                cell = loctab->cellIndex(row, cols);
                        break;