X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTabular.cpp;h=437ac7eca75a5f7d10bec8310300d9c8abf90148;hb=dc8c4f3eab6e01f3767de765423fda5e4d6c5124;hp=433fe197e7593fc53d25082c82f34f7ef05f9f9e;hpb=0092b523c7d3c1735b6854bcbdb4e65ec782f092;p=lyx.git

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 433fe197e7..437ac7eca7 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -151,6 +151,7 @@ TabularFeature tabularFeature[] =
 	{ Tabular::SET_MROFFSET, "set-mroffset", true },
 	{ Tabular::SET_ALL_LINES, "set-all-lines", false },
 	{ Tabular::UNSET_ALL_LINES, "unset-all-lines", false },
+	{ Tabular::TOGGLE_LONGTABULAR, "toggle-longtabular", false },
 	{ Tabular::SET_LONGTABULAR, "set-longtabular", false },
 	{ Tabular::UNSET_LONGTABULAR, "unset-longtabular", false },
 	{ Tabular::SET_PWIDTH, "set-pwidth", true },
@@ -177,6 +178,7 @@ TabularFeature tabularFeature[] =
 	{ Tabular::UNSET_LTCAPTION, "unset-ltcaption", false },
 	{ Tabular::SET_SPECIAL_COLUMN, "set-special-column", true },
 	{ Tabular::SET_SPECIAL_MULTICOLUMN, "set-special-multicolumn", true },
+	{ Tabular::TOGGLE_BOOKTABS, "toggle-booktabs", false },
 	{ Tabular::SET_BOOKTABS, "set-booktabs", false },
 	{ Tabular::UNSET_BOOKTABS, "unset-booktabs", false },
 	{ Tabular::SET_TOP_SPACE, "set-top-space", true },
@@ -262,7 +264,7 @@ string const tostr(Tabular::BoxType const & num)
 
 
 // I would have liked a fromstr template a lot better. (Lgb)
-bool string2type(string const str, LyXAlignment & num)
+bool string2type(string const & str, LyXAlignment & num)
 {
 	if (str == "none")
 		num = LYX_ALIGN_NONE;
@@ -282,7 +284,7 @@ bool string2type(string const str, LyXAlignment & num)
 }
 
 
-bool string2type(string const str, Tabular::HAlignment & num)
+bool string2type(string const & str, Tabular::HAlignment & num)
 {
 	if (str == "left")
 		num = Tabular::LYX_LONGTABULAR_ALIGN_LEFT;
@@ -296,7 +298,7 @@ bool string2type(string const str, Tabular::HAlignment & num)
 }
 
 
-bool string2type(string const str, Tabular::VAlignment & num)
+bool string2type(string const & str, Tabular::VAlignment & num)
 {
 	if (str == "top")
 		num = Tabular::LYX_VALIGN_TOP;
@@ -310,7 +312,7 @@ bool string2type(string const str, Tabular::VAlignment & num)
 }
 
 
-bool string2type(string const str, Tabular::BoxType & num)
+bool string2type(string const & str, Tabular::BoxType & num)
 {
 	if (str == "none")
 		num = Tabular::BOX_NONE;
@@ -324,7 +326,7 @@ bool string2type(string const str, Tabular::BoxType & num)
 }
 
 
-bool string2type(string const str, bool & num)
+bool string2type(string const & str, bool & num)
 {
 	if (str == "true")
 		num = true;
@@ -534,7 +536,7 @@ DocIterator separatorPos(InsetTableCell * cell, docstring const & align_d)
 }
 
 
-InsetTableCell splitCell(InsetTableCell & head, docstring const align_d, bool & hassep)
+InsetTableCell splitCell(InsetTableCell & head, docstring const & align_d, bool & hassep)
 {
 	InsetTableCell tail = InsetTableCell(head);
 	DocIterator const dit = separatorPos(&head, align_d);
@@ -542,7 +544,7 @@ InsetTableCell splitCell(InsetTableCell & head, docstring const align_d, bool &
 	if (hassep) {
 		pit_type const psize = head.paragraphs().front().size();
 		head.paragraphs().front().eraseChars(dit.pos(), psize, false);
-		tail.paragraphs().front().eraseChars(0, 
+		tail.paragraphs().front().eraseChars(0,
 			dit.pos() < psize ? dit.pos() + 1 : psize, false);
 	}
 
@@ -628,30 +630,6 @@ Tabular::CellData & Tabular::CellData::operator=(CellData const & cs)
 	return *this;
 }
 
-void Tabular::CellData::swap(CellData & rhs)
-{
-	std::swap(cellno, rhs.cellno);
-	std::swap(width, rhs.width);
-	std::swap(multicolumn, rhs.multicolumn);
-	std::swap(multirow, rhs.multirow);
-	std::swap(mroffset, rhs.mroffset);
-	std::swap(alignment, rhs.alignment);
-	std::swap(valignment, rhs.valignment);
-	std::swap(decimal_hoffset, rhs.decimal_hoffset);
-	std::swap(decimal_width, rhs.decimal_width);
-	std::swap(voffset, rhs.voffset);
-	std::swap(top_line, rhs.top_line);
-	std::swap(bottom_line, rhs.bottom_line);
-	std::swap(left_line, rhs.left_line);
-	std::swap(right_line, rhs.right_line);
-	std::swap(usebox, rhs.usebox);
-	std::swap(rotate, rhs.rotate);
-	std::swap(align_special, rhs.align_special);
-	p_width.swap(rhs.p_width);
-	inset.swap(rhs.inset);
-}
-
-
 Tabular::RowData::RowData()
 	: ascent(0),
 	  descent(0),
@@ -676,7 +654,7 @@ Tabular::ColumnData::ColumnData()
 
 
 Tabular::ltType::ltType()
-	: topDL(false),
+	: set(false), topDL(false),
 	  bottomDL(false),
 	  empty(false)
 {}
@@ -762,9 +740,9 @@ void Tabular::appendRow(row_type row)
 void Tabular::insertRow(row_type const row, bool copy)
 {
 	row_info.insert(row_info.begin() + row + 1, RowData(row_info[row]));
-	cell_info.insert(cell_info.begin() + row + 1, 
+	cell_info.insert(cell_info.begin() + row + 1,
 		cell_vector(0, CellData(buffer_)));
-	
+
 	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_));
@@ -773,7 +751,7 @@ void Tabular::insertRow(row_type const row, bool copy)
 		if (cell_info[row][c].multirow == CELL_BEGIN_OF_MULTIROW)
 			cell_info[row + 1][c].multirow = CELL_PART_OF_MULTIROW;
 	}
-	
+
 	updateIndexes();
 	for (col_type c = 0; c < ncols(); ++c) {
 		if (isPartOfMultiRow(row, c))
@@ -870,7 +848,7 @@ void Tabular::copyColumn(col_type const col)
 
 
 void Tabular::appendColumn(col_type col)
-{	
+{
 	insertColumn(col, false);
 }
 
@@ -1053,7 +1031,7 @@ bool Tabular::updateColumnWidths()
 			if (columnSpan(i) == 1) {
 				if (getAlignment(i) == LYX_ALIGN_DECIMAL
 					&& cell_info[r][c].decimal_width!=0)
-					new_width = max(new_width, cellInfo(i).width 
+					new_width = max(new_width, cellInfo(i).width
 				                + max_dwidth[c] - cellInfo(i).decimal_width);
 				else
 					new_width = max(new_width, cellInfo(i).width);
@@ -1122,8 +1100,8 @@ void Tabular::setAlignment(idx_type cell, LyXAlignment align,
 		if (align == LYX_ALIGN_DECIMAL && dpoint.empty())
 			dpoint = from_utf8(lyxrc.default_decimal_point);
 	} else {
-		cellInfo(cell).alignment = align; 
-		cellInset(cell).get()->setContentAlignment(align); 
+		cellInfo(cell).alignment = align;
+		cellInset(cell).get()->setContentAlignment(align);
 	}
 }
 
@@ -1147,7 +1125,6 @@ namespace {
  */
 void toggleFixedWidth(Cursor & cur, InsetTableCell * inset, bool fixedWidth)
 {
-	inset->setAutoBreakRows(fixedWidth);
 	inset->toggleFixedWidth(fixedWidth);
 	if (fixedWidth)
 		return;
@@ -1313,7 +1290,7 @@ bool Tabular::columnRightLine(col_type c) const
 		idx_type i = cellIndex(r, c);
 		if (c == cellColumn(i) + columnSpan(i) - 1) {
 			++total;
-			bool left = (c + 1 < ncols() 
+			bool left = (c + 1 < ncols()
 				&& cellInfo(cellIndex(r, c + 1)).left_line)
 				|| c + 1 == ncols();
 			if (cellInfo(i).right_line && left)
@@ -1328,7 +1305,7 @@ LyXAlignment Tabular::getAlignment(idx_type cell, bool onlycolumn) const
 {
 	if (!onlycolumn && (isMultiColumn(cell) || isMultiRow(cell)))
 		return cellInfo(cell).alignment;
-	
+
 	return column_info[cellColumn(cell)].alignment;
 }
 
@@ -1400,7 +1377,7 @@ int Tabular::textVOffset(idx_type cell) const
 	int voffset = cellInfo(cell).voffset;
 	if (isMultiRow(cell)) {
 		row_type const row = cellRow(cell);
-		voffset += (cellHeight(cell) - rowAscent(row) - rowDescent(row))/2; 
+		voffset += (cellHeight(cell) - rowAscent(row) - rowDescent(row))/2;
 	}
 	return voffset;
 }
@@ -1675,7 +1652,7 @@ void Tabular::read(Lexer & lex)
 
 bool Tabular::isMultiColumn(idx_type cell) const
 {
-	return (cellInfo(cell).multicolumn == CELL_BEGIN_OF_MULTICOLUMN 
+	return (cellInfo(cell).multicolumn == CELL_BEGIN_OF_MULTICOLUMN
 		|| cellInfo(cell).multicolumn == CELL_PART_OF_MULTICOLUMN);
 }
 
@@ -1712,7 +1689,8 @@ Tabular::idx_type Tabular::setMultiColumn(idx_type cell, idx_type number,
 		cs.alignment = column_info[col].alignment;
 	setRightLine(cell, right_border);
 
-	for (idx_type i = 1; i < number; ++i) {
+	idx_type lastcell = cellIndex(row, col + number - 1);
+	for (idx_type i = 1; i < lastcell - cell + 1; ++i) {
 		CellData & cs1 = cellInfo(cell + i);
 		cs1.multicolumn = CELL_PART_OF_MULTICOLUMN;
 		cs.inset->appendParagraphs(cs1.inset->paragraphs());
@@ -1793,7 +1771,7 @@ Tabular::idx_type Tabular::rowSpan(idx_type cell) const
 	col_type row = cellRow(cell) + 1;
 	while (row < nrows() && isPartOfMultiRow(row, column))
 		++row;
-	
+
 	return row - cellRow(cell);
 }
 
@@ -1873,7 +1851,7 @@ Tabular::idx_type Tabular::cellAbove(idx_type cell) const
 {
 	if (cellRow(cell) == 0)
 		return cell;
-	
+
 	col_type const col = cellColumn(cell);
 	row_type r = cellRow(cell) - 1;
 	while (r > 0 && cell_info[r][col].multirow == CELL_PART_OF_MULTIROW)
@@ -2164,7 +2142,7 @@ bool Tabular::isPartOfMultiRow(row_type row, col_type column) const
 }
 
 
-void Tabular::TeXTopHLine(otexstream & os, row_type row, string const lang) const
+void Tabular::TeXTopHLine(otexstream & os, row_type row, string const & lang) const
 {
 	// we only output complete row lines and the 1st row here, the rest
 	// is done in Tabular::TeXBottomHLine(...)
@@ -2202,22 +2180,22 @@ void Tabular::TeXTopHLine(otexstream & os, row_type row, string const lang) cons
 				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") 
+					os << "\\expandafter" << (use_booktabs ? "\\cmidrule" : "\\cline")
 					<< "\\expandafter{\\expandafter" << c + 1 + offset << "\\string-";
 				else
 					os << (use_booktabs ? "\\cmidrule{" : "\\cline{") << c + 1 + offset << '-';
-				
+
 				col_type cstart = c;
 				for ( ; c < ncols() && topline[c]; ++c) {}
-				
+
 				for (col_type j = cstart ; j < c ; ++j)
 					if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
 						++offset;
-				
+
 				os << c + offset << "} ";
 			}
 		}
@@ -2226,7 +2204,7 @@ void Tabular::TeXTopHLine(otexstream & os, row_type row, string const lang) cons
 }
 
 
-void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const lang) const
+void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const & lang) const
 {
 	// we output bottomlines of row r and the toplines of row r+1
 	// if the latter do not span the whole tabular
@@ -2275,7 +2253,7 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const lang) c
 				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")
@@ -2283,14 +2261,14 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const lang) c
 					<< "\\expandafter{\\expandafter" << c + 1 + offset << "\\string-";
 				else
 					os << (use_booktabs ? "\\cmidrule{" : "\\cline{") << c + 1 + offset << '-';
-				
+
 				col_type cstart = c;
 				for ( ; c < ncols() && bottomline[c]; ++c) {}
-				
+
 				for (col_type j = cstart ; j < c ; ++j)
 					if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
 						++offset;
-				
+
 				os << c + offset << "} ";
 			}
 		}
@@ -2315,7 +2293,7 @@ void Tabular::TeXCellPreamble(otexstream & os, idx_type cell,
 	bool colright = columnRightLine(c);
 	bool colleft = columnLeftLine(c);
 	bool nextcolleft = nextcol < ncols() && columnLeftLine(nextcol);
-	bool nextcellleft = nextcol < ncols() 
+	bool nextcellleft = nextcol < ncols()
 		&& leftLine(cellIndex(r, nextcol));
 	bool coldouble = colright && nextcolleft;
 	bool celldouble = rightLine(cell) && nextcellleft;
@@ -2588,7 +2566,7 @@ void Tabular::TeXRow(otexstream & os, row_type row,
 		if (isPartOfMultiRow(row, c)
 		    && column_info[c].alignment != LYX_ALIGN_DECIMAL) {
 			if (cell != getLastCellInRow(row))
-				os << " & "; 
+				os << " & ";
 			continue;
 		}
 
@@ -2596,6 +2574,9 @@ void Tabular::TeXRow(otexstream & os, row_type row,
 		shared_ptr<InsetTableCell> inset = cellInset(cell);
 
 		Paragraph const & par = inset->paragraphs().front();
+
+		os.texrow().forceStart(par.id(), 0);
+
 		bool rtl = par.isRTL(buffer().params())
 			&& !par.empty()
 			&& getPWidth(cell).zero()
@@ -2697,14 +2678,16 @@ void Tabular::TeXRow(otexstream & os, row_type row,
 void Tabular::latex(otexstream & os, OutputParams const & runparams) const
 {
 	bool const is_tabular_star = !tabular_width.zero();
+	TexRow::RowEntry pos = TexRow::textEntry(runparams.lastid,
+											 runparams.lastpos);
 
 	//+---------------------------------------------------------------------
 	//+                      first the opening preamble                    +
 	//+---------------------------------------------------------------------
 
 	os << safebreakln;
-	if (runparams.lastid != -1)
-		os.texrow().start(runparams.lastid, runparams.lastpos);
+	if (!TexRow::isNone(pos))
+		os.texrow().start(pos);
 
 	if (rotate != 0)
 		os << "\\begin{turn}{" << convert<string>(rotate) << "}\n";
@@ -2737,7 +2720,7 @@ void Tabular::latex(otexstream & os, OutputParams const & runparams) const
 			break;
 		}
 	}
-	
+
 	os << "{";
 
 	if (is_tabular_star)
@@ -2833,6 +2816,9 @@ void Tabular::latex(otexstream & os, OutputParams const & runparams) const
 
 	if (rotate != 0)
 		os << breakln << "\\end{turn}";
+
+	if (!TexRow::isNone(pos))
+		os.texrow().start(pos);
 }
 
 
@@ -3414,6 +3400,12 @@ bool InsetTableCell::allowParagraphCustomization(idx_type) const
 }
 
 
+bool InsetTableCell::forceLocalFontSwitch() const
+{
+	return isFixedWidth;
+}
+
+
 bool InsetTableCell::getStatus(Cursor & cur, FuncRequest const & cmd,
 	FuncStatus & status) const
 {
@@ -3438,7 +3430,7 @@ bool InsetTableCell::getStatus(Cursor & cur, FuncRequest const & cmd,
 	return true;
 }
 
-docstring InsetTableCell::asString(bool intoInsets) 
+docstring InsetTableCell::asString(bool intoInsets)
 {
 	docstring retval;
 	if (paragraphs().empty())
@@ -3457,9 +3449,10 @@ docstring InsetTableCell::asString(bool intoInsets)
 }
 
 
-void InsetTableCell::addToToc(DocIterator const & di, bool output_active) const
+void InsetTableCell::addToToc(DocIterator const & di, bool output_active,
+							  UpdateType utype) const
 {
-	InsetText::iterateForToc(di, output_active);
+	InsetText::iterateForToc(di, output_active, utype);
 }
 
 
@@ -3480,14 +3473,14 @@ docstring InsetTableCell::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 
 InsetTabular::InsetTabular(Buffer * buf, row_type rows,
 			   col_type columns)
-	: Inset(buf), tabular(buf, max(rows, row_type(1)), max(columns, col_type(1))), scx_(0), 
-	rowselect_(false), colselect_(false)
+	: Inset(buf), tabular(buf, max(rows, row_type(1)), max(columns, col_type(1))),
+	  first_visible_cell_(0), offset_valign_(0), rowselect_(false), colselect_(false)
 {
 }
 
 
 InsetTabular::InsetTabular(InsetTabular const & tab)
-	: Inset(tab), tabular(tab.tabular),  scx_(0)
+	: Inset(tab), tabular(tab.tabular)
 {
 }
 
@@ -3614,15 +3607,15 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
 			MetricsInfo m = mi;
 			Length const p_width = tabular.getPWidth(cell);
 			if (!p_width.zero())
-				m.base.textwidth = p_width.inPixels(mi.base.textwidth);
+				m.base.textwidth = p_width.inPixels(mi.base);
 			tabular.cellInset(cell)->metrics(m, dim);
 			if (!p_width.zero())
 				dim.wid = m.base.textwidth;
-			tabular.cellInfo(cell).width = dim.wid + 2 * WIDTH_OF_LINE 
+			tabular.cellInfo(cell).width = dim.wid + 2 * WIDTH_OF_LINE
 				+ tabular.interColumnSpace(cell);
 
 			// FIXME(?): do we need a second metrics call?
-			TextMetrics const & tm = 
+			TextMetrics const & tm =
 				mi.base.bv->textMetrics(tabular.cellInset(cell)->getText(0));
 
 			// determine horizontal offset because of decimal align (if necessary)
@@ -3659,14 +3652,14 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
 			int const lastpardes = tm.last().second->descent()
 				+ TEXT_TO_INSET_OFFSET;
 			int offset = 0;
-			switch (tabular.getVAlignment(cell)) { 
+			switch (tabular.getVAlignment(cell)) {
 				case Tabular::LYX_VALIGN_TOP:
-					break; 
+					break;
 				case Tabular::LYX_VALIGN_MIDDLE:
-					offset = -(dim.des - lastpardes)/2; 
-					break; 
+					offset = -(dim.des - lastpardes)/2;
+					break;
 				case Tabular::LYX_VALIGN_BOTTOM:
-					offset = -(dim.des - lastpardes); 
+					offset = -(dim.des - lastpardes);
 					break;
 			}
 			tabular.cell_info[r][c].voffset = offset;
@@ -3675,11 +3668,11 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
 		}
 		int const top_space = tabular.row_info[r].top_space_default ?
 			default_line_space :
-			tabular.row_info[r].top_space.inPixels(mi.base.textwidth);
+			tabular.row_info[r].top_space.inPixels(mi.base);
 		tabular.setRowAscent(r, maxasc + ADD_TO_HEIGHT + top_space);
 		int const bottom_space = tabular.row_info[r].bottom_space_default ?
 			default_line_space :
-			tabular.row_info[r].bottom_space.inPixels(mi.base.textwidth);
+			tabular.row_info[r].bottom_space.inPixels(mi.base);
 		tabular.setRowDescent(r, maxdes + ADD_TO_HEIGHT + bottom_space);
 	}
 
@@ -3699,13 +3692,13 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
 	}
 
 	tabular.updateColumnWidths();
-	dim.asc = tabular.rowAscent(0) - offset_valign_;	
+	dim.asc = tabular.rowAscent(0) - offset_valign_;
 	dim.des = tabular.height() - dim.asc;
 	dim.wid = tabular.width() + 2 * ADD_TO_TABULAR_WIDTH;
 }
 
 
-bool InsetTabular::isCellSelected(Cursor & cur, row_type row, col_type col) 
+bool InsetTabular::isCellSelected(Cursor & cur, row_type row, col_type col)
 	const
 {
 	if (&cur.inset() == this && cur.selection()) {
@@ -3713,15 +3706,15 @@ bool InsetTabular::isCellSelected(Cursor & cur, row_type row, col_type col)
 			row_type rs, re;
 			col_type cs, ce;
 			getSelection(cur, rs, re, cs, ce);
-			
+
 			idx_type const cell = tabular.cellIndex(row, col);
 			col_type const cspan = tabular.columnSpan(cell);
 			row_type const rspan = tabular.rowSpan(cell);
-			if (col + cspan - 1 >= cs && col <= ce 
+			if (col + cspan - 1 >= cs && col <= ce
 				&& row + rspan - 1 >= rs && row <= re)
 				return true;
-		} else 
-			if (col == tabular.cellColumn(cur.idx()) 
+		} else
+			if (col == tabular.cellColumn(cur.idx())
 				&& row == tabular.cellRow(cur.idx())) {
 			CursorSlice const & beg = cur.selBegin();
 			CursorSlice const & end = cur.selEnd();
@@ -3738,11 +3731,10 @@ bool InsetTabular::isCellSelected(Cursor & cur, row_type row, col_type col)
 
 void InsetTabular::draw(PainterInfo & pi, int x, int y) const
 {
-	x += scx_ + ADD_TO_TABULAR_WIDTH;
+	x += ADD_TO_TABULAR_WIDTH;
 
 	BufferView * bv = pi.base.bv;
 	Cursor & cur = pi.base.bv->cursor();
-	resetPos(cur);
 
 	// FIXME: As the full background is painted in drawBackground(),
 	// we have no choice but to do a full repaint for the Text cells.
@@ -3751,7 +3743,7 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
 	bool const original_selection_state = pi.selected;
 
 	idx_type idx = 0;
-	first_visible_cell = Tabular::npos;
+	first_visible_cell_ = Tabular::npos;
 
 	int yy = y + offset_valign_;
 	for (row_type r = 0; r < tabular.nrows(); ++r) {
@@ -3759,16 +3751,16 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
 		for (col_type c = 0; c < tabular.ncols(); ++c) {
 			if (tabular.isPartOfMultiColumn(r, c))
 				continue;
-			
+
 			idx = tabular.cellIndex(r, c);
-			
+
 			if (tabular.isPartOfMultiRow(r, c)) {
 				nx += tabular.cellWidth(idx);
 				continue;
 			}
 
-			if (first_visible_cell == Tabular::npos)
-				first_visible_cell = idx;
+			if (first_visible_cell_ == Tabular::npos)
+				first_visible_cell_ = idx;
 
 			pi.selected |= isCellSelected(cur, r, c);
 			int const cx = nx + tabular.textHOffset(idx);
@@ -3782,7 +3774,7 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
 		}
 
 		if (r + 1 < tabular.nrows())
-			yy += tabular.rowDescent(r) + tabular.rowAscent(r + 1) 
+			yy += tabular.rowDescent(r) + tabular.rowAscent(r + 1)
 				+ tabular.interRowSpace(r + 1);
 	}
 }
@@ -3790,7 +3782,7 @@ void InsetTabular::draw(PainterInfo & pi, int x, int y) const
 
 void InsetTabular::drawBackground(PainterInfo & pi, int x, int y) const
 {
-	x += scx_ + ADD_TO_TABULAR_WIDTH;
+	x += ADD_TO_TABULAR_WIDTH;
 	y += offset_valign_ - tabular.rowAscent(0);
 	pi.pain.fillRectangle(x, y, tabular.width(), tabular.height(),
 		pi.backgroundColor(this));
@@ -3800,9 +3792,8 @@ void InsetTabular::drawBackground(PainterInfo & pi, int x, int y) const
 void InsetTabular::drawSelection(PainterInfo & pi, int x, int y) const
 {
 	Cursor & cur = pi.base.bv->cursor();
-	resetPos(cur);
 
-	x += scx_ + ADD_TO_TABULAR_WIDTH;
+	x += ADD_TO_TABULAR_WIDTH;
 
 	if (!cur.selection())
 		return;
@@ -3839,7 +3830,7 @@ void InsetTabular::drawSelection(PainterInfo & pi, int x, int y) const
 				     + tabular.interRowSpace(r + 1);
 		}
 
-	} 
+	}
 	// FIXME: This code has no effect because InsetTableCell does not handle
 	// drawSelection other than the trivial implementation in Inset.
 	//else {
@@ -3883,7 +3874,7 @@ void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y,
 	// Right
 	x -= tabular.interColumnSpace(cell);
 	col_type next_cell_col = col + 1;
-	while (next_cell_col < tabular.ncols() 
+	while (next_cell_col < tabular.ncols()
 		&& tabular.isMultiColumn(tabular.cellIndex(row, next_cell_col)))
 		next_cell_col++;
 	drawline = tabular.rightLine(cell)
@@ -3899,7 +3890,6 @@ void InsetTabular::edit(Cursor & cur, bool front, EntryDirection)
 {
 	//lyxerr << "InsetTabular::edit: " << this << endl;
 	cur.finishUndo();
-	cur.setSelection(false);
 	cur.push(*this);
 	if (front) {
 		if (isRightToLeft(cur))
@@ -3918,7 +3908,6 @@ void InsetTabular::edit(Cursor & cur, bool front, EntryDirection)
 	}
 	cur.setCurrentFont();
 	// FIXME: this accesses the position cache before it is initialized
-	//resetPos(cur);
 	//cur.bv().fitCursor();
 }
 
@@ -3949,13 +3938,14 @@ void InsetTabular::updateBuffer(ParIterator const & it, UpdateType utype)
 }
 
 
-void InsetTabular::addToToc(DocIterator const & cpit, bool output_active) const
+void InsetTabular::addToToc(DocIterator const & cpit, bool output_active,
+							UpdateType utype) const
 {
 	DocIterator dit = cpit;
 	dit.forwardPos();
 	size_t const end = dit.nargs();
 	for ( ; dit.idx() < end; dit.top().forwardIdx())
-		cell(dit.idx())->addToToc(dit, output_active);
+		cell(dit.idx())->addToToc(dit, output_active, utype);
 }
 
 
@@ -3967,7 +3957,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 	Cursor & bvcur = cur.bv().cursor();
 
 	FuncCode const act = cmd.action();
-	
+
 	switch (act) {
 
 	case LFUN_MOUSE_PRESS: {
@@ -3982,13 +3972,13 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 			cur.idx() = tabular.getLastCellInRow(r);
 			cur.pos() = cur.lastpos();
 			cur.setSelection(true);
-			bvcur = cur; 
+			bvcur = cur;
 			rowselect_ = true;
 			break;
 		}
 		// select column
 		int const y0 = yo(cur.bv()) - tabular.rowAscent(0) + offset_valign_;
-		if (cmd.y() < y0 + ADD_TO_TABULAR_WIDTH 
+		if (cmd.y() < y0 + ADD_TO_TABULAR_WIDTH
 			|| cmd.y() > y0 + tabular.height()) {
 			col_type c = columnFromX(cur, cmd.x());
 			cur.idx() = tabular.cellIndex(0, c);
@@ -3997,15 +3987,15 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 			cur.idx() = tabular.cellIndex(tabular.nrows() - 1, c);
 			cur.pos() = cur.lastpos();
 			cur.setSelection(true);
-			bvcur = cur; 
+			bvcur = cur;
 			colselect_ = true;
 			break;
 		}
 		// do not reset cursor/selection if we have selected
 		// some cells (bug 2715).
 		if (cmd.button() == mouse_button::button3
-		    && &bvcur.selBegin().inset() == this 
-		    && bvcur.selIsMultiCell()) 
+		    && &bvcur.selBegin().inset() == this
+		    && bvcur.selIsMultiCell())
 			;
 		else
 			// Let InsetTableCell do it
@@ -4082,7 +4072,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_CHAR_RIGHT_SELECT:
 	case LFUN_CHAR_RIGHT:
 	case LFUN_CHAR_LEFT_SELECT:
-	case LFUN_CHAR_LEFT: 
+	case LFUN_CHAR_LEFT:
 	case LFUN_WORD_FORWARD:
 	case LFUN_WORD_FORWARD_SELECT:
 	case LFUN_WORD_BACKWARD:
@@ -4091,14 +4081,14 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_WORD_RIGHT_SELECT:
 	case LFUN_WORD_LEFT:
 	case LFUN_WORD_LEFT_SELECT: {
-		// determine whether we move to next or previous cell, where to enter 
+		// determine whether we move to next or previous cell, where to enter
 		// the new cell from, and which command to "finish" (i.e., exit the
 		// inset) with:
 		bool next_cell;
 		EntryDirection entry_from = ENTRY_DIRECTION_IGNORE;
 		FuncCode finish_lfun;
 
-		if (act == LFUN_CHAR_FORWARD 
+		if (act == LFUN_CHAR_FORWARD
 				|| act == LFUN_CHAR_FORWARD_SELECT
 				|| act == LFUN_WORD_FORWARD
 				|| act == LFUN_WORD_FORWARD_SELECT) {
@@ -4112,7 +4102,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 			next_cell = false;
 			finish_lfun = LFUN_FINISHED_BACKWARD;
 		}
-		// LEFT or RIGHT commands --- the interpretation will depend on the 
+		// LEFT or RIGHT commands --- the interpretation will depend on the
 		// table's direction.
 		else {
 			bool const right = act == LFUN_CHAR_RIGHT
@@ -4120,14 +4110,14 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 				|| act == LFUN_WORD_RIGHT
 				|| act == LFUN_WORD_RIGHT_SELECT;
 			next_cell = isRightToLeft(cur) != right;
-			
+
 			if (lyxrc.visual_cursor)
 				entry_from = right ? ENTRY_DIRECTION_LEFT:ENTRY_DIRECTION_RIGHT;
 
 			finish_lfun = right ? LFUN_FINISHED_RIGHT : LFUN_FINISHED_LEFT;
 		}
 
-		bool const select =	act == LFUN_CHAR_FORWARD_SELECT 
+		bool const select =	act == LFUN_CHAR_FORWARD_SELECT
 		    || act == LFUN_CHAR_BACKWARD_SELECT
 		    || act == LFUN_CHAR_RIGHT_SELECT
 		    || act == LFUN_CHAR_LEFT_SELECT
@@ -4136,15 +4126,15 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 			|| act == LFUN_WORD_BACKWARD_SELECT
 			|| act == LFUN_WORD_LEFT_SELECT;
 
-		// If we have a multicell selection or we're 
+		// If we have a multicell selection or we're
 		// not doing some LFUN_*_SELECT thing anyway...
 		if (!cur.selIsMultiCell() || !select) {
 			col_type const c = tabular.cellColumn(cur.idx());
 			row_type const r = tabular.cellRow(cur.idx());
-			// Are we trying to select the whole cell and is the whole cell 
+			// Are we trying to select the whole cell and is the whole cell
 			// not yet selected?
 			bool const select_whole = select && !isCellSelected(cur, r, c) &&
-				((next_cell && cur.pit() == cur.lastpit() 
+				((next_cell && cur.pit() == cur.lastpit()
 				&& cur.pos() == cur.lastpos())
 				|| (!next_cell && cur.pit() == 0 && cur.pos() == 0));
 
@@ -4162,7 +4152,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 				break;
 			}
 
-			// FIXME: When we support the selection of an empty cell, remove 
+			// FIXME: When we support the selection of an empty cell, remove
 			// the !empty_cell from this condition. For now we jump to the next
 			// cell if the current cell is empty.
 			if (cur.result().dispatched() && !empty_cell)
@@ -4179,9 +4169,10 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 		else
 			movePrevCell(cur, entry_from);
 		// if we're exiting the table, call the appropriate FINISHED lfun
-		if (sl == cur.top())
+		if (sl == cur.top()) {
 			cmd = FuncRequest(finish_lfun);
-		else
+			cur.undispatched();
+		} else
 			cur.dispatched();
 
 		cur.screenUpdateFlags(Update::Force | Update::FitCursor);
@@ -4193,7 +4184,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_DOWN:
 		if (!(cur.selection() && cur.selIsMultiCell()))
 			cell(cur.idx())->dispatch(cur, cmd);
-		
+
 		cur.dispatched(); // override the cell's decision
 		if (sl == cur.top()) {
 			// if our Text didn't do anything to the cursor
@@ -4275,7 +4266,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 //		int const t =	cur.bv().top_y() + cur.bv().height();
 //		if (t < yo() + tabular.getHeightOfTabular()) {
 //			cur.bv().scrollDocView(t, true);
-//			cur.idx() = tabular.cellBelow(first_visible_cell) + col;
+//			cur.idx() = tabular.cellBelow(first_visible_cell_) + col;
 //		} else {
 //			cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1) + col;
 //		}
@@ -4294,7 +4285,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 //			if (yo() > 0)
 //				cur.idx() = col;
 //			else
-//				cur.idx() = tabular.cellBelow(first_visible_cell) + col;
+//				cur.idx() = tabular.cellBelow(first_visible_cell_) + col;
 //		} else {
 //			cur.idx() = col;
 //		}
@@ -4327,7 +4318,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 				FileName(to_utf8(cmd.argument())));
 			if (tmpstr.empty())
 				break;
-			cur.recordUndoInset(INSERT_UNDO);
+			cur.recordUndoInset();
 			if (insertPlaintextString(cur.bv(), tmpstr, false)) {
 				// content has been replaced,
 				// so cursor might be invalid
@@ -4342,7 +4333,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_CUT:
 		if (cur.selIsMultiCell()) {
 			if (copySelection(cur)) {
-				cur.recordUndoInset(DELETE_UNDO);
+				cur.recordUndoInset();
 				cutSelection(cur);
 			}
 		} else
@@ -4351,14 +4342,14 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_SELF_INSERT:
 		if (cur.selIsMultiCell()) {
-			cur.recordUndoInset(DELETE_UNDO);
+			cur.recordUndoInset();
 			cutSelection(cur);
 			BufferView * bv = &cur.bv();
 			docstring::const_iterator cit = cmd.argument().begin();
 			docstring::const_iterator const end = cmd.argument().end();
 			for (; cit != end; ++cit)
 				bv->translateAndInsert(*cit, getText(cur.idx()), cur);
-	
+
 			cur.resetAnchor();
 			bv->bookmarkEditPosition();
 		} else
@@ -4368,7 +4359,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_CHAR_DELETE_BACKWARD:
 	case LFUN_CHAR_DELETE_FORWARD:
 		if (cur.selIsMultiCell()) {
-			cur.recordUndoInset(DELETE_UNDO);
+			cur.recordUndoInset();
 			cutSelection(cur);
 		} else
 			cell(cur.idx())->dispatch(cur, cmd);
@@ -4394,7 +4385,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 		// pass to InsertPlaintextString, but
 		// only if we have multi-cell content
 		if (clip.find_first_of(from_ascii("\t\n")) != docstring::npos) {
-			cur.recordUndoInset(INSERT_UNDO);
+			cur.recordUndoInset();
 			if (insertPlaintextString(cur.bv(), clip, false)) {
 				// content has been replaced,
 				// so cursor might be invalid
@@ -4416,7 +4407,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 			break;
 		}
 		if (theClipboard().isInternal()) {
-			cur.recordUndoInset(INSERT_UNDO);
+			cur.recordUndoInset();
 			pasteClipboard(cur);
 		}
 		break;
@@ -4490,7 +4481,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
 	switch (cmd.action()) {
 	case LFUN_INSET_MODIFY: {
-		if (&cur.inset() != this || cmd.getArg(0) != "tabular") 
+		if (&cur.inset() != this || cmd.getArg(0) != "tabular")
 			break;
 
 		// FIXME: We only check for the very first argument...
@@ -4633,9 +4624,13 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 		case Tabular::SET_LINE_TOP:
 		case Tabular::SET_LINE_BOTTOM:
+			status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx())));
+			break;
+
 		case Tabular::SET_LINE_LEFT:
 		case Tabular::SET_LINE_RIGHT:
-			status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx())));
+			status.setEnabled(!tabular.use_booktabs
+			                  && !tabular.ltCaption(tabular.cellRow(cur.idx())));
 			break;
 
 		case Tabular::TOGGLE_LINE_TOP:
@@ -4649,12 +4644,14 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 			break;
 
 		case Tabular::TOGGLE_LINE_LEFT:
-			status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx())));
+			status.setEnabled(!tabular.use_booktabs
+			                  && !tabular.ltCaption(tabular.cellRow(cur.idx())));
 			status.setOnOff(tabular.leftLine(cur.idx()));
 			break;
 
 		case Tabular::TOGGLE_LINE_RIGHT:
-			status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx())));
+			status.setEnabled(!tabular.use_booktabs
+			                  && !tabular.ltCaption(tabular.cellRow(cur.idx())));
 			status.setOnOff(tabular.rightLine(cur.idx()));
 			break;
 
@@ -4670,7 +4667,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 		case Tabular::M_ALIGN_RIGHT:
 			flag = false;
 		case Tabular::ALIGN_RIGHT:
-			status.setEnabled(!(tabular.isMultiRow(cur.idx()) 
+			status.setEnabled(!(tabular.isMultiRow(cur.idx())
 				&& !tabular.getPWidth(cur.idx()).zero()));
 			status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_RIGHT);
 			break;
@@ -4678,7 +4675,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 		case Tabular::M_ALIGN_CENTER:
 			flag = false;
 		case Tabular::ALIGN_CENTER:
-			status.setEnabled(!(tabular.isMultiRow(cur.idx()) 
+			status.setEnabled(!(tabular.isMultiRow(cur.idx())
 				&& !tabular.getPWidth(cur.idx()).zero()));
 			status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_CENTER);
 			break;
@@ -4690,7 +4687,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 			break;
 
 		case Tabular::ALIGN_DECIMAL:
-			status.setEnabled(!tabular.isMultiRow(cur.idx()) 
+			status.setEnabled(!tabular.isMultiRow(cur.idx())
 				&& !tabular.isMultiColumn(cur.idx()));
 			status.setOnOff(tabular.getAlignment(cur.idx(), true) == LYX_ALIGN_DECIMAL);
 			break;
@@ -4723,6 +4720,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 			break;
 
 		case Tabular::SET_LONGTABULAR:
+		case Tabular::TOGGLE_LONGTABULAR:
 			// setting as longtable is not allowed when table is inside a float
 			if (cur.innerInsetOfType(FLOAT_CODE) != 0
 				|| cur.innerInsetOfType(WRAP_CODE) != 0)
@@ -4743,30 +4741,30 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 		case Tabular::TABULAR_VALIGN_TOP:
 			status.setEnabled(tabular.tabular_width.zero());
-			status.setOnOff(tabular.tabular_valignment 
+			status.setOnOff(tabular.tabular_valignment
 				== Tabular::LYX_VALIGN_TOP);
 			break;
 		case Tabular::TABULAR_VALIGN_MIDDLE:
 			status.setEnabled(tabular.tabular_width.zero());
-			status.setOnOff(tabular.tabular_valignment 
+			status.setOnOff(tabular.tabular_valignment
 				== Tabular::LYX_VALIGN_MIDDLE);
 			break;
 		case Tabular::TABULAR_VALIGN_BOTTOM:
 			status.setEnabled(tabular.tabular_width.zero());
-			status.setOnOff(tabular.tabular_valignment 
+			status.setOnOff(tabular.tabular_valignment
 				== Tabular::LYX_VALIGN_BOTTOM);
 			break;
 
 		case Tabular::LONGTABULAR_ALIGN_LEFT:
-			status.setOnOff(tabular.longtabular_alignment 
+			status.setOnOff(tabular.longtabular_alignment
 				== Tabular::LYX_LONGTABULAR_ALIGN_LEFT);
 			break;
 		case Tabular::LONGTABULAR_ALIGN_CENTER:
-			status.setOnOff(tabular.longtabular_alignment 
+			status.setOnOff(tabular.longtabular_alignment
 				== Tabular::LYX_LONGTABULAR_ALIGN_CENTER);
 			break;
 		case Tabular::LONGTABULAR_ALIGN_RIGHT:
-			status.setOnOff(tabular.longtabular_alignment 
+			status.setOnOff(tabular.longtabular_alignment
 				== Tabular::LYX_LONGTABULAR_ALIGN_RIGHT);
 			break;
 
@@ -4871,6 +4869,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 			status.setOnOff(tabular.ltCaption(sel_row_start));
 			break;
 
+		case Tabular::TOGGLE_BOOKTABS:
 		case Tabular::SET_BOOKTABS:
 			status.setOnOff(tabular.use_booktabs);
 			break;
@@ -4958,6 +4957,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 			status.setEnabled(false);
 			return true;
 		}
+		// Fall back
 	case LFUN_NEWLINE_INSERT: {
 		if (tabular.getPWidth(cur.idx()).zero()) {
 			status.setEnabled(false);
@@ -4978,7 +4978,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 				getSelection(cur, rs, re, cs, ce);
 				if (paste_tabular && paste_tabular->ncols() == ce - cs + 1
 					  && paste_tabular->nrows() == re - rs + 1)
-					status.setEnabled(true);	
+					status.setEnabled(true);
 				else {
 					status.setEnabled(false);
 					status.message(_("Selection size should match clipboard content."));
@@ -5107,7 +5107,6 @@ void InsetTabular::cursorPos(BufferView const & bv,
 	x += cellXPos(sl.idx());
 	x += tabular.textHOffset(sl.idx());
 	x += ADD_TO_TABULAR_WIDTH;
-	x += scx_;
 }
 
 
@@ -5148,7 +5147,6 @@ Inset * InsetTabular::editXY(Cursor & cur, int x, int y)
 	cur.setSelection(false);
 	cur.push(*this);
 	cur.idx() = getNearestCell(cur.bv(), x, y);
-	resetPos(cur);
 	return cur.bv().textMetrics(&cell(cur.idx())->text()).editXY(cur, x, y);
 }
 
@@ -5182,7 +5180,7 @@ int InsetTabular::cellYPos(idx_type const cell) const
 	row_type row = tabular.cellRow(cell);
 	int ly = 0;
 	for (row_type r = 0; r < row; ++r)
-		ly += tabular.rowDescent(r) + tabular.rowAscent(r + 1) 
+		ly += tabular.rowDescent(r) + tabular.rowAscent(r + 1)
 			+ tabular.interRowSpace(r + 1);
 	return ly;
 }
@@ -5198,36 +5196,6 @@ int InsetTabular::cellXPos(idx_type const cell) const
 }
 
 
-void InsetTabular::resetPos(Cursor & cur) const
-{
-	BufferView & bv = cur.bv();
-	int const maxwidth = bv.workWidth();
-
-	int const scx_old = scx_;
-	int const i = cur.find(this);
-	if (i == -1) {
-		scx_ = 0;
-	} else {
-		int const X1 = 0;
-		int const X2 = maxwidth;
-		int const offset = ADD_TO_TABULAR_WIDTH + 2;
-		int const x1 = xo(cur.bv()) + cellXPos(cur[i].idx()) + offset;
-		int const x2 = x1 + tabular.cellWidth(cur[i].idx());
-
-		if (x1 < X1)
-			scx_ = X1 + 20 - x1;
-		else if (x2 > X2)
-			scx_ = X2 - 20 - x2;
-		else
-			scx_ = 0;
-	}
-
-	// only update if offset changed
-	if (scx_ != scx_old)
-		cur.screenUpdateFlags(Update::Force | Update::FitCursor);
-}
-
-
 void InsetTabular::moveNextCell(Cursor & cur, EntryDirection entry_from)
 {
 	row_type const row = tabular.cellRow(cur.idx());
@@ -5262,7 +5230,6 @@ void InsetTabular::moveNextCell(Cursor & cur, EntryDirection entry_from)
 	if (cur.selIsMultiCell()) {
 		cur.pit() = cur.lastpit();
 		cur.pos() = cur.lastpos();
-		resetPos(cur);
 		return;
 	}
 
@@ -5270,7 +5237,7 @@ void InsetTabular::moveNextCell(Cursor & cur, EntryDirection entry_from)
 	cur.pos() = 0;
 
 	// in visual mode, place cursor at extreme left or right
-	
+
 	switch(entry_from) {
 
 	case ENTRY_DIRECTION_RIGHT:
@@ -5285,7 +5252,6 @@ void InsetTabular::moveNextCell(Cursor & cur, EntryDirection entry_from)
 
 	}
 	cur.setCurrentFont();
-	resetPos(cur);
 }
 
 
@@ -5320,7 +5286,6 @@ void InsetTabular::movePrevCell(Cursor & cur, EntryDirection entry_from)
 	if (cur.selIsMultiCell()) {
 		cur.pit() = cur.lastpit();
 		cur.pos() = cur.lastpos();
-		resetPos(cur);
 		return;
 	}
 
@@ -5328,7 +5293,7 @@ void InsetTabular::movePrevCell(Cursor & cur, EntryDirection entry_from)
 	cur.pos() = cur.lastpos();
 
 	// in visual mode, place cursor at extreme left or right
-	
+
 	switch(entry_from) {
 
 	case ENTRY_DIRECTION_RIGHT:
@@ -5343,7 +5308,6 @@ void InsetTabular::movePrevCell(Cursor & cur, EntryDirection entry_from)
 
 	}
 	cur.setCurrentFont();
-	resetPos(cur);
 }
 
 
@@ -5410,7 +5374,7 @@ static void checkLongtableSpecial(Tabular::ltType & ltt,
 
 bool InsetTabular::oneCellHasRotationState(bool rotated,
 		row_type row_start, row_type row_end,
-		col_type col_start, col_type col_end) const 
+		col_type col_start, col_type col_end) const
 {
 	for (row_type r = row_start; r <= row_end; ++r)
 		for (col_type c = col_start; c <= col_end; ++c)
@@ -5458,10 +5422,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
 		break;
 
 	case Tabular::ALIGN_DECIMAL:
-		if (tabular.column_info[tabular.cellColumn(cur.idx())].alignment == LYX_ALIGN_DECIMAL)
-			setAlign = LYX_ALIGN_CENTER;
-		else
-			setAlign = LYX_ALIGN_DECIMAL;
+		setAlign = LYX_ALIGN_DECIMAL;
 		break;
 
 	case Tabular::M_VALIGN_TOP:
@@ -5483,7 +5444,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
 		break;
 	}
 
-	cur.recordUndoInset(ATOMIC_UNDO, this);
+	cur.recordUndoInset(this);
 
 	getSelection(cur, sel_row_start, sel_row_end, sel_col_start, sel_col_end);
 	row_type const row = tabular.cellRow(cur.idx());
@@ -5804,6 +5765,13 @@ void InsetTabular::tabularFeatures(Cursor & cur,
 		}
 		break;
 
+	case Tabular::TOGGLE_LONGTABULAR:
+		if (tabular.is_long_tabular)
+			tabularFeatures(cur, Tabular::UNSET_LONGTABULAR);
+		else
+			tabular.is_long_tabular = true;
+		break;
+
 	case Tabular::SET_LONGTABULAR:
 		tabular.is_long_tabular = true;
 		break;
@@ -5857,7 +5825,7 @@ 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)
@@ -5944,11 +5912,13 @@ void InsetTabular::tabularFeatures(Cursor & cur,
 		cur.setSelection(false);
 		// If a row is set as caption, then also insert
 		// a caption. Otherwise the LaTeX output is broken.
-		lyx::dispatch(FuncRequest(LFUN_INSET_SELECT_ALL));
+		// Select cell if it is non-empty
+		if (cur.lastpos() > 0 || cur.lastpit() > 0)
+			lyx::dispatch(FuncRequest(LFUN_INSET_SELECT_ALL));
 		lyx::dispatch(FuncRequest(LFUN_CAPTION_INSERT));
 		break;
 	}
-	
+
 	case Tabular::UNSET_LTCAPTION: {
 		if (!tabular.ltCaption(row))
 			break;
@@ -5970,6 +5940,10 @@ void InsetTabular::tabularFeatures(Cursor & cur,
 		break;
 	}
 
+	case Tabular::TOGGLE_BOOKTABS:
+		tabular.use_booktabs = !tabular.use_booktabs;
+		break;
+
 	case Tabular::SET_BOOKTABS:
 		tabular.use_booktabs = true;
 		break;
@@ -6173,7 +6147,7 @@ bool InsetTabular::isRightToLeft(Cursor & cur) const
 }
 
 
-docstring InsetTabular::asString(idx_type stidx, idx_type enidx, 
+docstring InsetTabular::asString(idx_type stidx, idx_type enidx,
                                  bool intoInsets)
 {
 	LASSERT(stidx <= enidx, return docstring());
@@ -6286,7 +6260,6 @@ bool InsetTabular::insertPlaintextString(BufferView & bv, docstring const & buf,
 	if (usePaste) {
 		paste_tabular.reset(new Tabular(buffer_, rows, maxCols));
 		loctab = paste_tabular.get();
-		cols = 0;
 		dirtyTabularStack(true);
 	} else {
 		loctab = &tabular;
@@ -6420,7 +6393,7 @@ bool InsetTabular::insertCompletion(Cursor & cur, docstring const & s, bool fini
 }
 
 
-void InsetTabular::completionPosAndDim(Cursor const & cur, int & x, int & y, 
+void InsetTabular::completionPosAndDim(Cursor const & cur, int & x, int & y,
 				    Dimension & dim) const
 {
 	TextMetrics const & tm = cur.bv().textMetrics(cur.text());
@@ -6466,4 +6439,22 @@ string InsetTabular::params2string(InsetTabular const & inset)
 }
 
 
+void InsetTabular::setLayoutForHiddenCells(DocumentClass const & dc)
+{
+	for (Tabular::col_type c = 0; c < tabular.ncols(); ++c) {
+		for (Tabular::row_type r = 0; r < tabular.nrows(); ++r) {
+			if (!tabular.isPartOfMultiColumn(r,c) &&
+			    !tabular.isPartOfMultiRow(r,c))
+				continue;
+
+			ParagraphList & parlist = tabular.cellInset(r,c)->paragraphs();
+			ParagraphList::iterator it = parlist.begin();
+			ParagraphList::iterator const en = parlist.end();
+			for (; it != en; ++it)
+					it->setLayout(dc.plainLayout());
+		}
+	}
+}
+
+
 } // namespace lyx