X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.C;h=f07b3e48c28aa6831c3f0feb19cef526996bd1dc;hb=342cdf432246110db37bee4e0aebb4b72c933ddb;hp=b5067a263c96e71cf03027c2669a6433e31b5dad;hpb=6f91069b50be4458809ca3475bd2251c988de35c;p=lyx.git

diff --git a/src/tabular.C b/src/tabular.C
index b5067a263c..f07b3e48c2 100644
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -1,55 +1,63 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file tabular.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author José Matos
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
- *           Copyright 2000-2002 The LyX Team.
- *
- *           @author: Jürgen Vigna
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "tabular.h"
-#include "LaTeXFeatures.h"
-#include "Lsstream.h"
+
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
-#include "gettext.h"
+#include "LaTeXFeatures.h"
 #include "lyxlex.h"
-#include "vspace.h"
+#include "outputparams.h"
+#include "paragraph.h"
 
 #include "insets/insettabular.h"
-#include "insets/insettext.h"
 
-#include "support/LAssert.h"
-#include "support/LIstream.h"
 #include "support/lstrings.h"
-#include "support/lyxmanip.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
-#include "frontends/Alert.h"
-#include "frontends/Painter.h"
+#include <sstream>
 
-#include <algorithm>
-#include <cstdlib>
+using lyx::support::ltrim;
+using lyx::support::prefixIs;
+using lyx::support::rtrim;
+using lyx::support::suffixIs;
 
-using namespace lyx::support;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 using std::abs;
-using std::ostream;
-using std::istream;
+using std::endl;
 using std::getline;
 using std::max;
-using std::endl;
+
+using std::istream;
+using std::ostream;
+using std::ostringstream;
 using std::vector;
+using std::string;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
 #endif
 
+
 namespace {
 
 int const WIDTH_OF_LINE = 5;
@@ -61,28 +69,41 @@ string const write_attribute(string const & name, T const & t)
 	return s.empty() ? s : " " + name + "=\"" + s + "\"";
 }
 
+template <>
 string const write_attribute(string const & name, string const & t)
 {
 	return t.empty() ? t : " " + name + "=\"" + t + "\"";
 }
 
 
+template <>
 string const write_attribute(string const & name, bool const & b)
 {
 	// we write only true attribute values so we remove a bit of the
 	// file format bloat for tabulars.
-	return b ? write_attribute(name, tostr(b)) : string();
+	return b ? write_attribute(name, convert<string>(b)) : string();
 }
 
 
+template <>
 string const write_attribute(string const & name, int const & i)
 {
 	// we write only true attribute values so we remove a bit of the
 	// file format bloat for tabulars.
-	return i ? write_attribute(name, tostr(i)) : string();
+	return i ? write_attribute(name, convert<string>(i)) : string();
 }
 
 
+template <>
+string const write_attribute(string const & name, LyXTabular::idx_type const & i)
+{
+	// we write only true attribute values so we remove a bit of the
+	// file format bloat for tabulars.
+	return i ? write_attribute(name, convert<string>(i)) : string();
+}
+
+
+template <>
 string const write_attribute(string const & name, LyXLength const & value)
 {
 	// we write only the value if we really have one same reson as above.
@@ -117,8 +138,8 @@ string const tostr(LyXTabular::VAlignment const & num)
 	switch (num) {
 	case LyXTabular::LYX_VALIGN_TOP:
 		return "top";
-	case LyXTabular::LYX_VALIGN_CENTER:
-		return "center";
+	case LyXTabular::LYX_VALIGN_MIDDLE:
+		return "middle";
 	case LyXTabular::LYX_VALIGN_BOTTOM:
 		return "bottom";
 	}
@@ -139,6 +160,7 @@ string const tostr(LyXTabular::BoxType const & num)
 	return string();
 }
 
+
 // I would have liked a fromstr template a lot better. (Lgb)
 bool string2type(string const str, LyXAlignment & num)
 {
@@ -162,8 +184,8 @@ bool string2type(string const str, LyXTabular::VAlignment & num)
 {
 	if (str == "top")
 		num = LyXTabular::LYX_VALIGN_TOP;
-	else if (str == "center")
-		num = LyXTabular::LYX_VALIGN_CENTER;
+	else if (str == "middle" )
+		num = LyXTabular::LYX_VALIGN_MIDDLE;
 	else if (str == "bottom")
 		num = LyXTabular::LYX_VALIGN_BOTTOM;
 	else
@@ -198,7 +220,7 @@ bool string2type(string const str, bool & num)
 }
 
 
-bool getTokenValue(string const & str, const char * token, string & ret)
+bool getTokenValue(string const & str, char const * token, string & ret)
 {
 	ret.erase();
 	size_t token_length = strlen(token);
@@ -209,78 +231,68 @@ bool getTokenValue(string const & str, const char * token, string & ret)
 		return false;
 	pos += token_length + 1;
 	char ch = str[pos];
-	if ((ch != '"') && (ch != '\'')) { // only read till next space
+	if (ch != '"' && ch != '\'') { // only read till next space
 		ret += ch;
 		ch = ' ';
 	}
-	while ((pos < str.length() - 1) && (str[++pos] != ch))
+	while (pos < str.length() - 1 && str[++pos] != ch)
 		ret += str[pos];
 
 	return true;
 }
 
 
-bool getTokenValue(string const & str, const char * token, int & num)
+bool getTokenValue(string const & str, char const * token, int & num)
 {
 	string tmp;
 	num = 0;
 	if (!getTokenValue(str, token, tmp))
 		return false;
-	num = strToInt(tmp);
+	num = convert<int>(tmp);
 	return true;
 }
 
 
-bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
+bool getTokenValue(string const & str, char const * token, LyXAlignment & num)
 {
 	string tmp;
-	if (!getTokenValue(str, token, tmp))
-		return false;
-	return string2type(tmp, num);
+	return getTokenValue(str, token, tmp) && string2type(tmp, num);
 }
 
 
-bool getTokenValue(string const & str, const char * token,
+bool getTokenValue(string const & str, char const * token,
 				   LyXTabular::VAlignment & num)
 {
 	string tmp;
-	if (!getTokenValue(str, token, tmp))
-		return false;
-	return string2type(tmp, num);
+	return getTokenValue(str, token, tmp) && string2type(tmp, num);
 }
 
 
-bool getTokenValue(string const & str, const char * token,
+bool getTokenValue(string const & str, char const * token,
 				   LyXTabular::BoxType & num)
 {
 	string tmp;
-	if (!getTokenValue(str, token, tmp))
-		return false;
-	return string2type(tmp, num);
+	return getTokenValue(str, token, tmp) && string2type(tmp, num);
 }
 
 
-bool getTokenValue(string const & str, const char * token, bool & flag)
+bool getTokenValue(string const & str, char const * token, bool & flag)
 {
 	// set the flag always to false as this should be the default for bools
 	// not in the file-format.
 	flag = false;
 	string tmp;
-	if (!getTokenValue(str, token, tmp))
-		return false;
-	return string2type(tmp, flag);
+	return getTokenValue(str, token, tmp) && string2type(tmp, flag);
 }
 
 
-bool getTokenValue(string const & str, const char * token, LyXLength & len)
+bool getTokenValue(string const & str, char const * token, LyXLength & len)
 {
 	// set the lenght to be zero() as default as this it should be if not
 	// in the file format.
 	len = LyXLength();
 	string tmp;
-	if (!getTokenValue(str, token, tmp))
-		return false;
-	return isValidLength(tmp, &len);
+	return getTokenValue(str, token, tmp) && isValidLength(tmp, &len);
 }
 
 
@@ -298,164 +310,176 @@ void l_getline(istream & is, string & str)
 
 /// Define a few methods for the inner structs
 
-LyXTabular::cellstruct::cellstruct(BufferParams const & bg)
-	: inset(bg)
-{
-	cellno = 0;
-	width_of_cell = 0;
-	multicolumn = LyXTabular::CELL_NORMAL;
-	alignment = LYX_ALIGN_CENTER;
-	valignment = LYX_VALIGN_TOP;
-	top_line = true;
-	bottom_line = false;
-	left_line = true;
-	right_line = false;
-	usebox = BOX_NONE;
-	rotate = false;
+LyXTabular::cellstruct::cellstruct(BufferParams const & bp)
+	: cellno(0),
+	  width_of_cell(0),
+	  multicolumn(LyXTabular::CELL_NORMAL),
+	  alignment(LYX_ALIGN_CENTER),
+	  valignment(LYX_VALIGN_TOP),
+	  top_line(true),
+	  bottom_line(false),
+	  left_line(true),
+	  right_line(false),
+	  usebox(BOX_NONE),
+	  rotate(false),
+	  inset(new InsetText(bp))
+{}
+
+
+LyXTabular::cellstruct::cellstruct(cellstruct const & cs)
+	: cellno(cs.cellno),
+	  width_of_cell(cs.width_of_cell),
+	  multicolumn(cs.multicolumn),
+	  alignment(cs.alignment),
+	  valignment(cs.valignment),
+	  top_line(cs.top_line),
+	  bottom_line(cs.bottom_line),
+	  left_line(cs.left_line),
+	  right_line(cs.right_line),
+	  usebox(cs.usebox),
+	  rotate(cs.rotate),
+	  align_special(cs.align_special),
+	  p_width(cs.p_width),
+	  inset(dynamic_cast<InsetText*>(cs.inset->clone().release()))
+{}
+
+
+LyXTabular::cellstruct &
+LyXTabular::cellstruct::operator=(cellstruct cs)
+{
+	swap(cs);
+	return *this;
+}
+
+
+void
+LyXTabular::cellstruct::swap(cellstruct & rhs)
+{
+	std::swap(cellno, rhs.cellno);
+	std::swap(width_of_cell, rhs.width_of_cell);
+	std::swap(multicolumn, rhs.multicolumn);
+	std::swap(alignment, rhs.alignment);
+	std::swap(valignment, rhs.valignment);
+	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);
 }
 
 
 LyXTabular::rowstruct::rowstruct()
-{
-	top_line = true;
-	bottom_line = false;
-	ascent_of_row = 0;
-	descent_of_row = 0;
-	endhead = false;
-	endfirsthead = false;
-	endfoot = false;
-	endlastfoot = false;
-	newpage = false;
-}
+	: ascent_of_row(0),
+	  descent_of_row(0),
+	  top_line(true),
+	  bottom_line(false),
+	  endhead(false),
+	  endfirsthead(false),
+	  endfoot(false),
+	  endlastfoot(false),
+	  newpage(false)
+{}
 
 
 LyXTabular::columnstruct::columnstruct()
+	: alignment(LYX_ALIGN_CENTER),
+	  valignment(LYX_VALIGN_TOP),
+	  left_line(true),
+	  right_line(false),
+	  width_of_column(0)
 {
-	left_line = true;
-	right_line = false;
-	alignment = LYX_ALIGN_CENTER;
-	valignment = LYX_VALIGN_TOP;
-	width_of_column = 0;
 }
 
 
 LyXTabular::ltType::ltType()
-{
-	topDL = false;
-	bottomDL = false;
-	empty = false;
-}
+	: topDL(false),
+	  bottomDL(false),
+	  empty(false)
+{}
 
 
-LyXTabular::LyXTabular(BufferParams const & bp,
-		       InsetTabular * inset, int rows_arg, int columns_arg)
+LyXTabular::LyXTabular(BufferParams const & bp, row_type rows_arg,
+                       col_type columns_arg)
 {
-	owner_ = inset;
-	cur_cell = -1;
 	init(bp, rows_arg, columns_arg);
 }
 
 
-LyXTabular::LyXTabular(BufferParams const & bp,
-		       InsetTabular * inset, LyXTabular const & lt)
-{
-	owner_ = inset;
-	cur_cell = -1;
-	init(bp, lt.rows_, lt.columns_, &lt);
-}
-
-
-LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex)
-{
-	owner_ = inset;
-	cur_cell = -1;
-	read(buf, lex);
-}
-
-
 // activates all lines and sets all widths to 0
-void LyXTabular::init(BufferParams const & bp,
-		      int rows_arg, int columns_arg, LyXTabular const * lt)
+void LyXTabular::init(BufferParams const & bp, row_type rows_arg,
+                      col_type columns_arg)
 {
-	rows_ = rows_arg;
+	rows_    = rows_arg;
 	columns_ = columns_arg;
-	row_info = row_vector(rows_, rowstruct());
-	column_info = column_vector(columns_, columnstruct());
+	row_info = row_vector(rows_);
+	column_info = column_vector(columns_);
 	cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp)));
+	row_info.reserve(10);
+	column_info.reserve(10);
+	cell_info.reserve(100);
+	fixCellNums();
+	for (row_type i = 0; i < rows_; ++i)
+		cell_info[i].back().right_line = true;
+	row_info.back().bottom_line = true;
+	row_info.front().bottom_line = true;
+	column_info.back().right_line = true;
+	is_long_tabular = false;
+	rotate = false;
+}
 
-	if (lt) {
-		operator=(*lt);
-		return;
-	}
 
-	int cellno = 0;
-	for (int i = 0; i < rows_; ++i) {
-		for (int j = 0; j < columns_; ++j) {
-			cell_info[i][j].inset.setOwner(owner_);
-			cell_info[i][j].inset.setDrawFrame(0, InsetText::LOCKED);
+void LyXTabular::fixCellNums()
+{
+	idx_type cellno = 0;
+	for (row_type i = 0; i < rows_; ++i) {
+		for (col_type j = 0; j < columns_; ++j) {
+			// When debugging it can be nice to set
+			// this to true.
+			cell_info[i][j].inset->setDrawFrame(false);
 			cell_info[i][j].cellno = cellno++;
 		}
 		cell_info[i].back().right_line = true;
 	}
-	row_info.back().bottom_line = true;
-	row_info.front().bottom_line = true;
-
-	for (int i = 0; i < columns_; ++i) {
-		calculate_width_of_column(i);
-	}
-	column_info.back().right_line = true;
-
-	calculate_width_of_tabular();
 
-	rowofcell = vector<int>();
-	columnofcell = vector<int>();
 	set_row_column_number_info();
-	is_long_tabular = false;
-	rotate = false;
 }
 
 
-void LyXTabular::appendRow(BufferParams const & bp, int cell)
+void LyXTabular::appendRow(BufferParams const & bp, idx_type const cell)
 {
 	++rows_;
 
-	int row = row_of_cell(cell);
+	row_type const row = row_of_cell(cell);
 
 	row_vector::iterator rit = row_info.begin() + row;
 	row_info.insert(rit, rowstruct());
 	// now set the values of the row before
 	row_info[row] = row_info[row + 1];
 
-#if 0
-	cell_vvector::iterator cit = cell_info.begin() + row;
-	cell_info.insert(cit, vector<cellstruct>(columns_, cellstruct(bp)));
-#else
-	cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
-							      cellstruct(bp)));
+	cell_vvector old(rows_ - 1);
+	for (row_type i = 0; i < rows_ - 1; ++i)
+		swap(cell_info[i], old[i]);
 
-	for (int i = 0; i <= row; ++i) {
-		for (int j = 0; j < columns_; ++j) {
-			c_info[i][j] = cell_info[i][j];
-		}
-	}
-	for (int i = row + 1; i < rows_; ++i) {
-		for (int j = 0; j < columns_; ++j) {
-			c_info[i][j] = cell_info[i-1][j];
-		}
-	}
-	cell_info = c_info;
-	++row;
-	for (int j = 0; j < columns_; ++j) {
-		cell_info[row][j].inset.clear(false);
-		if (bp.tracking_changes)
-			cell_info[row][j].inset.markNew(true);
-	}
-#endif
-	Reinit();
+	cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp)));
+
+	for (row_type i = 0; i <= row; ++i)
+		swap(cell_info[i], old[i]);
+	for (row_type i = row + 2; i < rows_; ++i)
+		swap(cell_info[i], old[i - 1]);
+
+	if (bp.tracking_changes)
+		for (col_type j = 0; j < columns_; ++j)
+			cell_info[row + 1][j].inset->markNew(true);
+
+	set_row_column_number_info();
 }
 
 
-void LyXTabular::deleteRow(int row)
+void LyXTabular::deleteRow(row_type const row)
 {
 	// Not allowed to delete last row
 	if (rows_ == 1)
@@ -464,108 +488,78 @@ void LyXTabular::deleteRow(int row)
 	row_info.erase(row_info.begin() + row);
 	cell_info.erase(cell_info.begin() + row);
 	--rows_;
-	Reinit();
+	fixCellNums();
 }
 
 
-void LyXTabular::appendColumn(BufferParams const & bp, int cell)
+void LyXTabular::appendColumn(BufferParams const & bp, idx_type const cell)
 {
 	++columns_;
 
-	cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
-							      cellstruct(bp)));
-	int const column = column_of_cell(cell);
+	col_type const column = column_of_cell(cell);
 	column_vector::iterator cit = column_info.begin() + column + 1;
 	column_info.insert(cit, columnstruct());
 	// set the column values of the column before
 	column_info[column + 1] = column_info[column];
 
-	for (int i = 0; i < rows_; ++i) {
-		for (int j = 0; j <= column; ++j) {
-			c_info[i][j] = cell_info[i][j];
-		}
-		for (int j = column + 1; j < columns_; ++j) {
-			c_info[i][j] = cell_info[i][j - 1];
-		}
+	for (row_type i = 0; i < rows_; ++i) {
+		cell_info[i].insert(cell_info[i].begin() + column + 1, cellstruct(bp));
+
 		// care about multicolumns
-		if (c_info[i][column + 1].multicolumn==CELL_BEGIN_OF_MULTICOLUMN)
-		{
-			c_info[i][column + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
-		}
-		if (column + 2 >= columns_ ||
-			c_info[i][column + 2].multicolumn != CELL_PART_OF_MULTICOLUMN)
-		{
-			c_info[i][column + 1].multicolumn = LyXTabular::CELL_NORMAL;
-		}
+		if (cell_info[i][column + 1].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
+			cell_info[i][column + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
+
+		if (column + 2 >= columns_
+		    || cell_info[i][column + 2].multicolumn != CELL_PART_OF_MULTICOLUMN)
+			cell_info[i][column + 1].multicolumn = LyXTabular::CELL_NORMAL;
 	}
-	cell_info = c_info;
 	//++column;
-	for (int i = 0; i < rows_; ++i) {
-		cell_info[i][column + 1].inset.clear(false);
+	for (row_type i = 0; i < rows_; ++i) {
+		cell_info[i][column + 1].inset->clear(false);
 		if (bp.tracking_changes)
-			cell_info[i][column + 1].inset.markNew(true);
+			cell_info[i][column + 1].inset->markNew(true);
 	}
-	Reinit();
+	fixCellNums();
 }
 
 
-void LyXTabular::deleteColumn(int column)
+void LyXTabular::deleteColumn(col_type const column)
 {
 	// Not allowed to delete last column
 	if (columns_ == 1)
 		return;
 
 	column_info.erase(column_info.begin() + column);
-	for (int i = 0; i < rows_; ++i)
+	for (row_type i = 0; i < rows_; ++i)
 		cell_info[i].erase(cell_info[i].begin() + column);
 	--columns_;
-	Reinit();
-}
-
-
-void LyXTabular::reinit()
-{
-	Reinit(false);
-}
-
-
-void LyXTabular::Reinit(bool reset_widths)
-{
-	if (reset_widths) {
-		for (int i = 0; i < rows_; ++i) {
-			for (int j = 0; j < columns_; ++j) {
-				cell_info[i][j].width_of_cell = 0;
-				cell_info[i][j].inset.setOwner(owner_);
-			}
-		}
-	}
-
-	for (int i = 0; i < columns_; ++i)
-		calculate_width_of_column(i);
-
-	calculate_width_of_tabular();
-
-	set_row_column_number_info();
+	fixCellNums();
 }
 
 
-void LyXTabular::set_row_column_number_info(bool oldformat)
+void LyXTabular::set_row_column_number_info()
 {
-	numberofcells = -1;
-	for (int row = 0; row < rows_; ++row) {
-		for (int column = 0; column < columns_; ++column) {
+	numberofcells = 0;
+	for (row_type row = 0; row < rows_; ++row) {
+		for (col_type column = 0; column < columns_; ++column) {
 			if (cell_info[row][column].multicolumn
 				!= LyXTabular::CELL_PART_OF_MULTICOLUMN)
 				++numberofcells;
-			cell_info[row][column].cellno = numberofcells;
+			if (numberofcells == 0)
+				// FIXME: Is this intended?
+				cell_info[row][column].cellno = npos;
+			else
+				cell_info[row][column].cellno =
+					numberofcells - 1;
 		}
 	}
-	++numberofcells; // because this is one more than as we start from 0
 
 	rowofcell.resize(numberofcells);
 	columnofcell.resize(numberofcells);
 
-	for (int row = 0, column = 0, c = 0;
+	row_type row = 0;
+	col_type column = 0;
+	for (idx_type c = 0;
 		 c < numberofcells && row < rows_ && column < columns_;) {
 		rowofcell[c] = row;
 		columnofcell[c] = column;
@@ -575,42 +569,35 @@ void LyXTabular::set_row_column_number_info(bool oldformat)
 		} while (column < columns_ &&
 				 cell_info[row][column].multicolumn
 				 == LyXTabular::CELL_PART_OF_MULTICOLUMN);
+
 		if (column == columns_) {
 			column = 0;
 			++row;
 		}
 	}
 
-	for (int row = 0; row < rows_; ++row) {
-		for (int column = 0; column < columns_; ++column) {
+	for (row_type row = 0; row < rows_; ++row) {
+		for (col_type column = 0; column < columns_; ++column) {
 			if (isPartOfMultiColumn(row,column))
 				continue;
-			// now set the right line of multicolumns right for oldformat read
-			if (oldformat &&
-				cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
-			{
-				int cn = cells_in_multicolumn(cell_info[row][column].cellno);
-				cell_info[row][column].right_line =
-					cell_info[row][column+cn-1].right_line;
-			}
-			cell_info[row][column].inset.setAutoBreakRows(
+			cell_info[row][column].inset->setAutoBreakRows(
 				!getPWidth(getCellNumber(row, column)).zero());
 		}
 	}
 }
 
 
-int LyXTabular::getNumberOfCells() const
+LyXTabular::idx_type LyXTabular::getNumberOfCells() const
 {
 	return numberofcells;
 }
 
 
-int LyXTabular::numberOfCellsInRow(int cell) const
+LyXTabular::idx_type LyXTabular::numberOfCellsInRow(idx_type const cell) const
 {
-	int const row = row_of_cell(cell);
-	int result = 0;
-	for (int i = 0; i < columns_; ++i)
+	row_type const row = row_of_cell(cell);
+	idx_type result = 0;
+	for (col_type i = 0; i < columns_; ++i)
 		if (cell_info[row][i].multicolumn != LyXTabular::CELL_PART_OF_MULTICOLUMN)
 			++result;
 	return result;
@@ -618,7 +605,7 @@ int LyXTabular::numberOfCellsInRow(int cell) const
 
 
 // returns 1 if there is a topline, returns 0 if not
-bool LyXTabular::topLine(int cell, bool onlycolumn) const
+bool LyXTabular::topLine(idx_type const cell, bool const onlycolumn) const
 {
 	if (!onlycolumn && isMultiColumn(cell))
 		return cellinfo_of_cell(cell).top_line;
@@ -626,7 +613,7 @@ bool LyXTabular::topLine(int cell, bool onlycolumn) const
 }
 
 
-bool LyXTabular::bottomLine(int cell, bool onlycolumn) const
+bool LyXTabular::bottomLine(idx_type const cell, bool onlycolumn) const
 {
 	if (!onlycolumn && isMultiColumn(cell))
 		return cellinfo_of_cell(cell).bottom_line;
@@ -634,7 +621,7 @@ bool LyXTabular::bottomLine(int cell, bool onlycolumn) const
 }
 
 
-bool LyXTabular::leftLine(int cell, bool onlycolumn) const
+bool LyXTabular::leftLine(idx_type cell, bool onlycolumn) const
 {
 	if (!onlycolumn && isMultiColumn(cell) &&
 		(isFirstCellInRow(cell) || isMultiColumn(cell-1)))
@@ -649,10 +636,10 @@ bool LyXTabular::leftLine(int cell, bool onlycolumn) const
 }
 
 
-bool LyXTabular::rightLine(int cell, bool onlycolumn) const
+bool LyXTabular::rightLine(idx_type cell, bool onlycolumn) const
 {
 	if (!onlycolumn && isMultiColumn(cell) &&
-		(isLastCellInRow(cell) || isMultiColumn(cell+1)))
+		(isLastCellInRow(cell) || isMultiColumn(cell + 1)))
 	{
 		if (cellinfo_of_cell(cell).align_special.empty())
 			return cellinfo_of_cell(cell).right_line;
@@ -664,11 +651,11 @@ bool LyXTabular::rightLine(int cell, bool onlycolumn) const
 }
 
 
-bool LyXTabular::topAlreadyDrawn(int cell) const
+bool LyXTabular::topAlreadyDrawn(idx_type cell) const
 {
-	int row = row_of_cell(cell);
+	row_type row = row_of_cell(cell);
 	if (row > 0 && !getAdditionalHeight(row)) {
-		int column = column_of_cell(cell);
+		col_type column = column_of_cell(cell);
 		--row;
 		while (column
 			   && cell_info[row][column].multicolumn
@@ -683,11 +670,11 @@ bool LyXTabular::topAlreadyDrawn(int cell) const
 }
 
 
-bool LyXTabular::leftAlreadyDrawn(int cell) const
+bool LyXTabular::leftAlreadyDrawn(idx_type cell) const
 {
-	int column = column_of_cell(cell);
+	col_type column = column_of_cell(cell);
 	if (column > 0) {
-		int row = row_of_cell(cell);
+		row_type row = row_of_cell(cell);
 		while (--column &&
 			   (cell_info[row][column].multicolumn ==
 				LyXTabular::CELL_PART_OF_MULTICOLUMN));
@@ -699,13 +686,13 @@ bool LyXTabular::leftAlreadyDrawn(int cell) const
 }
 
 
-bool LyXTabular::isLastRow(int cell) const
+bool LyXTabular::isLastRow(idx_type cell) const
 {
-	return (row_of_cell(cell) == rows_ - 1);
+	return row_of_cell(cell) == rows_ - 1;
 }
 
 
-int LyXTabular::getAdditionalHeight(int row) const
+int LyXTabular::getAdditionalHeight(row_type row) const
 {
 	if (!row || row >= rows_)
 		return 0;
@@ -713,7 +700,7 @@ int LyXTabular::getAdditionalHeight(int row) const
 	bool top = true;
 	bool bottom = true;
 
-	for (int column = 0; column < columns_ && bottom; ++column) {
+	for (col_type column = 0; column < columns_ && bottom; ++column) {
 		switch (cell_info[row - 1][column].multicolumn) {
 		case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
 			bottom = cell_info[row - 1][column].bottom_line;
@@ -722,7 +709,7 @@ int LyXTabular::getAdditionalHeight(int row) const
 			bottom = row_info[row - 1].bottom_line;
 		}
 	}
-	for (int column = 0; column < columns_ && top; ++column) {
+	for (col_type column = 0; column < columns_ && top; ++column) {
 		switch (cell_info[row][column].multicolumn) {
 		case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
 			top = cell_info[row][column].top_line;
@@ -737,12 +724,12 @@ int LyXTabular::getAdditionalHeight(int row) const
 }
 
 
-int LyXTabular::getAdditionalWidth(int cell) const
+int LyXTabular::getAdditionalWidth(idx_type cell) const
 {
 	// internally already set in setWidthOfCell
 	// used to get it back in text.C
-	int const col = right_column_of_cell(cell);
-	int const row = row_of_cell(cell);
+	col_type const col = right_column_of_cell(cell);
+	row_type const row = row_of_cell(cell);
 	if (col < columns_ - 1 && rightLine(cell) &&
 		leftLine(cell_info[row][col+1].cellno)) // column_info[col+1].left_line)
 	{
@@ -753,12 +740,12 @@ int LyXTabular::getAdditionalWidth(int cell) const
 
 
 // returns the maximum over all rows
-int LyXTabular::getWidthOfColumn(int cell) const
+int LyXTabular::getWidthOfColumn(idx_type cell) const
 {
-	int const column1 = column_of_cell(cell);
-	int const column2 = right_column_of_cell(cell);
+	col_type const column1 = column_of_cell(cell);
+	col_type const column2 = right_column_of_cell(cell);
 	int result = 0;
-	for (int i = column1; i <= column2; ++i)
+	for (col_type i = column1; i <= column2; ++i)
 		result += column_info[i].width_of_column;
 	return result;
 }
@@ -771,23 +758,23 @@ int LyXTabular::getWidthOfTabular() const
 
 
 // returns true if a complete update is necessary, otherwise false
-bool LyXTabular::setWidthOfMulticolCell(int cell, int new_width)
+bool LyXTabular::setWidthOfMulticolCell(idx_type cell, int new_width)
 {
 	if (!isMultiColumn(cell))
 		return false;
 
-	int const row = row_of_cell(cell);
-	int const column1 = column_of_cell(cell);
-	int const column2 = right_column_of_cell(cell);
+	row_type const row = row_of_cell(cell);
+	col_type const column1 = column_of_cell(cell);
+	col_type const column2 = right_column_of_cell(cell);
 	int const old_val = cell_info[row][column2].width_of_cell;
 
 	// first set columns to 0 so we can calculate the right width
-	for (int i = column1; i <= column2; ++i) {
+	for (col_type i = column1; i <= column2; ++i) {
 		cell_info[row][i].width_of_cell = 0;
 	}
 	// set the width to MAX_WIDTH until width > 0
 	int width = new_width + 2 * WIDTH_OF_LINE;
-	int i = column1;
+	col_type i = column1;
 	for (; i < column2 && width > column_info[i].width_of_column; ++i) {
 		cell_info[row][i].width_of_cell = column_info[i].width_of_column;
 		width -= column_info[i].width_of_column;
@@ -806,14 +793,14 @@ bool LyXTabular::setWidthOfMulticolCell(int cell, int new_width)
 }
 
 
-void LyXTabular::recalculateMulticolumnsOfColumn(int column)
+void LyXTabular::recalculateMulticolumnsOfColumn(col_type column)
 {
 	// the last column does not have to be recalculated because all
 	// multicolumns will have here there last multicolumn cell which
 	// always will have the whole rest of the width of the cell.
 	if (column > (columns_ - 2))
 		return;
-	for(int row = 0; row < rows_; ++row) {
+	for(row_type row = 0; row < rows_; ++row) {
 		int mc = cell_info[row][column].multicolumn;
 		int nmc = cell_info[row][column+1].multicolumn;
 		// we only have to update multicolumns which do not have this
@@ -822,7 +809,7 @@ void LyXTabular::recalculateMulticolumnsOfColumn(int column)
 			  (mc == CELL_PART_OF_MULTICOLUMN &&
 			   nmc == CELL_PART_OF_MULTICOLUMN))
 		{
-			int const cellno = cell_info[row][column].cellno;
+			idx_type const cellno = cell_info[row][column].cellno;
 			setWidthOfMulticolCell(cellno,
 					       getWidthOfCell(cellno) - 2 * WIDTH_OF_LINE);
 		}
@@ -831,10 +818,10 @@ void LyXTabular::recalculateMulticolumnsOfColumn(int column)
 
 
 // returns 1 if a complete update is necessary, otherwise 0
-bool LyXTabular::setWidthOfCell(int cell, int new_width)
+void LyXTabular::setWidthOfCell(idx_type cell, int new_width)
 {
-	int const row = row_of_cell(cell);
-	int const column1 = column_of_cell(cell);
+	row_type const row = row_of_cell(cell);
+	col_type const column1 = column_of_cell(cell);
 	bool tmp = false;
 	int width = 0;
 	int add_width = 0;
@@ -843,13 +830,13 @@ bool LyXTabular::setWidthOfCell(int cell, int new_width)
 		column1 < columns_ - 1 &&
 		leftLine(cell_info[row][column1+1].cellno, true))
 	{
-		// additional width
 		add_width = WIDTH_OF_LINE;
 	}
-	if (getWidthOfCell(cell) == new_width + 2 * WIDTH_OF_LINE + add_width) {
-		return false;
-	}
-	if (isMultiColumn(cell, true)) {
+
+	if (getWidthOfCell(cell) == new_width + 2 * WIDTH_OF_LINE + add_width)
+		return;
+
+	if (isMultiColumnReal(cell)) {
 		tmp = setWidthOfMulticolCell(cell, new_width);
 	} else {
 		width = new_width + 2 * WIDTH_OF_LINE + add_width;
@@ -859,16 +846,15 @@ bool LyXTabular::setWidthOfCell(int cell, int new_width)
 			recalculateMulticolumnsOfColumn(column1);
 	}
 	if (tmp) {
-		for (int i = 0; i < columns_; ++i)
+		for (col_type i = 0; i < columns_; ++i)
 			calculate_width_of_column(i);
 		calculate_width_of_tabular();
-		return true;
 	}
-	return false;
 }
 
 
-void LyXTabular::setAlignment(int cell, LyXAlignment align, bool onlycolumn)
+void LyXTabular::setAlignment(idx_type cell, LyXAlignment align,
+                              bool onlycolumn)
 {
 	if (!isMultiColumn(cell) || onlycolumn)
 		column_info[column_of_cell(cell)].alignment = align;
@@ -877,7 +863,8 @@ void LyXTabular::setAlignment(int cell, LyXAlignment align, bool onlycolumn)
 }
 
 
-void LyXTabular::setVAlignment(int cell, VAlignment align, bool onlycolumn)
+void LyXTabular::setVAlignment(idx_type cell, VAlignment align,
+                               bool onlycolumn)
 {
 	if (!isMultiColumn(cell) || onlycolumn)
 		column_info[column_of_cell(cell)].valignment = align;
@@ -886,33 +873,31 @@ void LyXTabular::setVAlignment(int cell, VAlignment align, bool onlycolumn)
 }
 
 
-void LyXTabular::setColumnPWidth(int cell, LyXLength const & width)
+void LyXTabular::setColumnPWidth(idx_type cell, LyXLength const & width)
 {
-	int const j = column_of_cell(cell);
+	col_type const j = column_of_cell(cell);
 
 	column_info[j].p_width = width;
-	for (int i = 0; i < rows_; ++i) {
-		int const cell = getCellNumber(i, j);
+	for (row_type i = 0; i < rows_; ++i) {
+		idx_type const cell = getCellNumber(i, j);
 		// because of multicolumns
-		getCellInset(cell).setAutoBreakRows(!getPWidth(cell).zero());
+		getCellInset(cell)->setAutoBreakRows(!getPWidth(cell).zero());
 	}
 }
 
 
-bool LyXTabular::setMColumnPWidth(int cell, LyXLength const & width)
+bool LyXTabular::setMColumnPWidth(idx_type cell, LyXLength const & width)
 {
-	bool const flag = !width.zero();
+	if (!isMultiColumn(cell))
+		return false;
 
 	cellinfo_of_cell(cell).p_width = width;
-	if (isMultiColumn(cell)) {
-		getCellInset(cell).setAutoBreakRows(flag);
-		return true;
-	}
-	return false;
+	getCellInset(cell)->setAutoBreakRows(!width.zero());
+	return true;
 }
 
 
-void LyXTabular::setAlignSpecial(int cell, string const & special,
+void LyXTabular::setAlignSpecial(idx_type cell, string const & special,
 				 LyXTabular::Feature what)
 {
 	if (what == SET_SPECIAL_MULTI)
@@ -922,7 +907,7 @@ void LyXTabular::setAlignSpecial(int cell, string const & special,
 }
 
 
-void LyXTabular::setAllLines(int cell, bool line)
+void LyXTabular::setAllLines(idx_type cell, bool line)
 {
 	setTopLine(cell, line);
 	setBottomLine(cell, line);
@@ -931,9 +916,9 @@ void LyXTabular::setAllLines(int cell, bool line)
 }
 
 
-void LyXTabular::setTopLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setTopLine(idx_type cell, bool line, bool onlycolumn)
 {
-	int const row = row_of_cell(cell);
+	row_type const row = row_of_cell(cell);
 	if (onlycolumn || !isMultiColumn(cell))
 		row_info[row].top_line = line;
 	else
@@ -941,7 +926,7 @@ void LyXTabular::setTopLine(int cell, bool line, bool onlycolumn)
 }
 
 
-void LyXTabular::setBottomLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setBottomLine(idx_type cell, bool line, bool onlycolumn)
 {
 	if (onlycolumn || !isMultiColumn(cell))
 		row_info[row_of_cell(cell)].bottom_line = line;
@@ -950,7 +935,7 @@ void LyXTabular::setBottomLine(int cell, bool line, bool onlycolumn)
 }
 
 
-void LyXTabular::setLeftLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setLeftLine(idx_type cell, bool line, bool onlycolumn)
 {
 	if (onlycolumn || !isMultiColumn(cell))
 		column_info[column_of_cell(cell)].left_line = line;
@@ -959,7 +944,7 @@ void LyXTabular::setLeftLine(int cell, bool line, bool onlycolumn)
 }
 
 
-void LyXTabular::setRightLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setRightLine(idx_type cell, bool line, bool onlycolumn)
 {
 	if (onlycolumn || !isMultiColumn(cell))
 		column_info[right_column_of_cell(cell)].right_line = line;
@@ -968,7 +953,7 @@ void LyXTabular::setRightLine(int cell, bool line, bool onlycolumn)
 }
 
 
-LyXAlignment LyXTabular::getAlignment(int cell, bool onlycolumn) const
+LyXAlignment LyXTabular::getAlignment(idx_type cell, bool onlycolumn) const
 {
 	if (!onlycolumn && isMultiColumn(cell))
 		return cellinfo_of_cell(cell).alignment;
@@ -977,7 +962,7 @@ LyXAlignment LyXTabular::getAlignment(int cell, bool onlycolumn) const
 
 
 LyXTabular::VAlignment
-LyXTabular::getVAlignment(int cell, bool onlycolumn) const
+LyXTabular::getVAlignment(idx_type cell, bool onlycolumn) const
 {
 	if (!onlycolumn && isMultiColumn(cell))
 		return cellinfo_of_cell(cell).valignment;
@@ -985,7 +970,7 @@ LyXTabular::getVAlignment(int cell, bool onlycolumn) const
 }
 
 
-LyXLength const LyXTabular::getPWidth(int cell) const
+LyXLength const LyXTabular::getPWidth(idx_type cell) const
 {
 	if (isMultiColumn(cell))
 		return cellinfo_of_cell(cell).p_width;
@@ -993,13 +978,13 @@ LyXLength const LyXTabular::getPWidth(int cell) const
 }
 
 
-LyXLength const LyXTabular::getColumnPWidth(int cell) const
+LyXLength const LyXTabular::getColumnPWidth(idx_type cell) const
 {
 	return column_info[column_of_cell(cell)].p_width;
 }
 
 
-LyXLength const LyXTabular::getMColumnPWidth(int cell) const
+LyXLength const LyXTabular::getMColumnPWidth(idx_type cell) const
 {
 	if (isMultiColumn(cell))
 		return cellinfo_of_cell(cell).p_width;
@@ -1007,7 +992,7 @@ LyXLength const LyXTabular::getMColumnPWidth(int cell) const
 }
 
 
-string const LyXTabular::getAlignSpecial(int cell, int what) const
+string const LyXTabular::getAlignSpecial(idx_type cell, int what) const
 {
 	if (what == SET_SPECIAL_MULTI)
 		return cellinfo_of_cell(cell).align_special;
@@ -1015,19 +1000,19 @@ string const LyXTabular::getAlignSpecial(int cell, int what) const
 }
 
 
-int LyXTabular::getWidthOfCell(int cell) const
+int LyXTabular::getWidthOfCell(idx_type cell) const
 {
-	int const row = row_of_cell(cell);
-	int const column1 = column_of_cell(cell);
-	int const column2 = right_column_of_cell(cell);
+	row_type const row = row_of_cell(cell);
+	col_type const column1 = column_of_cell(cell);
+	col_type const column2 = right_column_of_cell(cell);
 	int result = 0;
-	for (int i = column1; i <= column2; ++i)
+	for (col_type i = column1; i <= column2; ++i)
 		result += cell_info[row][i].width_of_cell;
 	return result;
 }
 
 
-int LyXTabular::getBeginningOfTextInCell(int cell) const
+int LyXTabular::getBeginningOfTextInCell(idx_type cell) const
 {
 	int x = 0;
 
@@ -1050,13 +1035,13 @@ int LyXTabular::getBeginningOfTextInCell(int cell) const
 }
 
 
-bool LyXTabular::isFirstCellInRow(int cell) const
+bool LyXTabular::isFirstCellInRow(idx_type cell) const
 {
 	return column_of_cell(cell) == 0;
 }
 
 
-int LyXTabular::getFirstCellInRow(int row) const
+LyXTabular::idx_type LyXTabular::getFirstCellInRow(row_type row) const
 {
 	if (row > rows_ - 1)
 		row = rows_ - 1;
@@ -1064,13 +1049,13 @@ int LyXTabular::getFirstCellInRow(int row) const
 }
 
 
-bool LyXTabular::isLastCellInRow(int cell) const
+bool LyXTabular::isLastCellInRow(idx_type cell) const
 {
 	return right_column_of_cell(cell) == columns_ - 1;
 }
 
 
-int LyXTabular::getLastCellInRow(int row) const
+LyXTabular::idx_type LyXTabular::getLastCellInRow(row_type row) const
 {
 	if (row > rows_ - 1)
 		row = rows_ - 1;
@@ -1078,10 +1063,10 @@ int LyXTabular::getLastCellInRow(int row) const
 }
 
 
-void LyXTabular::calculate_width_of_column(int column)
+void LyXTabular::calculate_width_of_column(col_type column)
 {
 	int maximum = 0;
-	for (int i = 0; i < rows_; ++i)
+	for (row_type i = 0; i < rows_; ++i)
 		maximum = max(cell_info[i][column].width_of_cell, maximum);
 	column_info[column].width_of_column = maximum;
 }
@@ -1093,13 +1078,13 @@ void LyXTabular::calculate_width_of_column(int column)
 // column of this multicolumn cell as this gives an added width to the
 // column, all the rest should be adapted!
 //
-bool LyXTabular::calculate_width_of_column_NMC(int column)
+bool LyXTabular::calculate_width_of_column_NMC(col_type column)
 {
 	int const old_column_width = column_info[column].width_of_column;
 	int max = 0;
-	for (int i = 0; i < rows_; ++i) {
-		int cell = getCellNumber(i, column);
-		bool ismulti = isMultiColumn(cell, true);
+	for (row_type i = 0; i < rows_; ++i) {
+		idx_type cell = getCellNumber(i, column);
+		bool ismulti = isMultiColumnReal(cell);
 		if ((!ismulti || column == right_column_of_cell(cell)) &&
 			cell_info[i][column].width_of_cell > max)
 		{
@@ -1114,35 +1099,35 @@ bool LyXTabular::calculate_width_of_column_NMC(int column)
 void LyXTabular::calculate_width_of_tabular()
 {
 	width_of_tabular = 0;
-	for (int i = 0; i < columns_; ++i)
+	for (col_type i = 0; i < columns_; ++i)
 		width_of_tabular += column_info[i].width_of_column;
 }
 
 
-int LyXTabular::row_of_cell(int cell) const
+LyXTabular::row_type LyXTabular::row_of_cell(idx_type cell) const
 {
 	if (cell >= numberofcells)
 		return rows_ - 1;
-	if (cell < 0)
+	if (cell == npos)
 		return 0;
 	return rowofcell[cell];
 }
 
 
-int LyXTabular::column_of_cell(int cell) const
+LyXTabular::col_type LyXTabular::column_of_cell(idx_type cell) const
 {
 	if (cell >= numberofcells)
 		return columns_ - 1;
-	if (cell < 0)
+	if (cell == npos)
 		return 0;
 	return columnofcell[cell];
 }
 
 
-int LyXTabular::right_column_of_cell(int cell) const
+LyXTabular::col_type LyXTabular::right_column_of_cell(idx_type cell) const
 {
-	int const row = row_of_cell(cell);
-	int column = column_of_cell(cell);
+	row_type const row = row_of_cell(cell);
+	col_type column = column_of_cell(cell);
 	while (column < columns_ - 1 &&
 		   cell_info[row][column + 1].multicolumn == LyXTabular::CELL_PART_OF_MULTICOLUMN)
 		++column;
@@ -1150,7 +1135,7 @@ int LyXTabular::right_column_of_cell(int cell) const
 }
 
 
-void LyXTabular::write(Buffer const * buf, ostream & os) const
+void LyXTabular::write(Buffer const & buf, ostream & os) const
 {
 	// header line
 	os << "<lyxtabular"
@@ -1173,7 +1158,7 @@ void LyXTabular::write(Buffer const * buf, ostream & os) const
 	   << write_attribute("lastFootBottomDL", endlastfoot.bottomDL)
 	   << write_attribute("lastFootEmpty", endlastfoot.empty)
 	   << ">\n";
-	for (int j = 0; j < columns_; ++j) {
+	for (col_type j = 0; j < columns_; ++j) {
 		os << "<column"
 		   << write_attribute("alignment", column_info[j].alignment)
 		   << write_attribute("valignment", column_info[j].valignment)
@@ -1183,7 +1168,7 @@ void LyXTabular::write(Buffer const * buf, ostream & os) const
 		   << write_attribute("special", column_info[j].align_special)
 		   << ">\n";
 	}
-	for (int i = 0; i < rows_; ++i) {
+	for (row_type i = 0; i < rows_; ++i) {
 		os << "<row"
 		   << write_attribute("topline", row_info[i].top_line)
 		   << write_attribute("bottomline", row_info[i].bottom_line)
@@ -1193,7 +1178,7 @@ void LyXTabular::write(Buffer const * buf, ostream & os) const
 		   << write_attribute("endlastfoot", row_info[i].endlastfoot)
 		   << write_attribute("newpage", row_info[i].newpage)
 		   << ">\n";
-		for (int j = 0; j < columns_; ++j) {
+		for (col_type j = 0; j < columns_; ++j) {
 			os << "<cell"
 			   << write_attribute("multicolumn", cell_info[i][j].multicolumn)
 			   << write_attribute("alignment", cell_info[i][j].alignment)
@@ -1208,8 +1193,8 @@ void LyXTabular::write(Buffer const * buf, ostream & os) const
 			   << write_attribute("special", cell_info[i][j].align_special)
 			   << ">\n";
 			os << "\\begin_inset ";
-			cell_info[i][j].inset.write(buf, os);
-			os << "\n\\end_inset \n"
+			cell_info[i][j].inset->write(buf, os);
+			os << "\n\\end_inset\n"
 			   << "</cell>\n";
 		}
 		os << "</row>\n";
@@ -1218,85 +1203,7 @@ void LyXTabular::write(Buffer const * buf, ostream & os) const
 }
 
 
-void LyXTabular::setHeaderFooterRows(int hr, int fhr, int fr, int lfr)
-{
-	// set header info
-	while (hr > 0) {
-		row_info[--hr].endhead = true;
-	}
-	// set firstheader info
-	if (fhr && fhr < rows_) {
-		if (row_info[fhr].endhead) {
-			while (fhr > 0) {
-				row_info[--fhr].endfirsthead = true;
-				row_info[fhr].endhead = false;
-			}
-		} else if (row_info[fhr - 1].endhead) {
-			endfirsthead.empty = true;
-		} else {
-			while (fhr > 0 && !row_info[--fhr].endhead) {
-				row_info[fhr].endfirsthead = true;
-			}
-		}
-	}
-	// set footer info
-	if (fr && fr < rows_) {
-		if (row_info[fr].endhead && row_info[fr-1].endhead) {
-			while (fr > 0 && !row_info[--fr].endhead) {
-				row_info[fr].endfoot = true;
-				row_info[fr].endhead = false;
-			}
-		} else if (row_info[fr].endfirsthead && row_info[fr-1].endfirsthead) {
-			while (fr > 0 && !row_info[--fr].endfirsthead) {
-				row_info[fr].endfoot = true;
-				row_info[fr].endfirsthead = false;
-			}
-		} else if (!row_info[fr - 1].endhead && !row_info[fr - 1].endfirsthead) {
-			while (fr > 0 && !row_info[--fr].endhead &&
-				  !row_info[fr].endfirsthead)
-			{
-				row_info[fr].endfoot = true;
-			}
-		}
-	}
-	// set lastfooter info
-	if (lfr && lfr < rows_) {
-		if (row_info[lfr].endhead && row_info[lfr - 1].endhead) {
-			while (lfr > 0 && !row_info[--lfr].endhead) {
-				row_info[lfr].endlastfoot = true;
-				row_info[lfr].endhead = false;
-			}
-		} else if (row_info[lfr].endfirsthead &&
-				   row_info[lfr - 1].endfirsthead)
-		{
-			while (lfr > 0 && !row_info[--lfr].endfirsthead) {
-				row_info[lfr].endlastfoot = true;
-				row_info[lfr].endfirsthead = false;
-			}
-		} else if (row_info[lfr].endfoot
-			   && row_info[lfr - 1].endfoot) {
-			while (lfr > 0 && !row_info[--lfr].endfoot) {
-				row_info[lfr].endlastfoot = true;
-				row_info[lfr].endfoot = false;
-			}
-		} else if (!row_info[fr - 1].endhead
-			   && !row_info[fr - 1].endfirsthead &&
-				   !row_info[fr - 1].endfoot)
-		{
-			while (lfr > 0 &&
-				  !row_info[--lfr].endhead && !row_info[lfr].endfirsthead &&
-				  !row_info[lfr].endfoot)
-			{
-				row_info[lfr].endlastfoot = true;
-			}
-		} else if (haveLTFoot()) {
-			endlastfoot.empty = true;
-		}
-	}
-}
-
-
-void LyXTabular::read(Buffer const * buf, LyXLex & lex)
+void LyXTabular::read(Buffer const & buf, LyXLex & lex)
 {
 	string line;
 	istream & is = lex.getStream();
@@ -1304,14 +1211,14 @@ void LyXTabular::read(Buffer const * buf, LyXLex & lex)
 	l_getline(is, line);
 	if (!prefixIs(line, "<lyxtabular ")
 		&& !prefixIs(line, "<LyXTabular ")) {
-		Assert(false);
+		BOOST_ASSERT(false);
 		return;
 	}
 
 	int version;
 	if (!getTokenValue(line, "version", version))
 		return;
-	Assert(version >= 2);
+	BOOST_ASSERT(version >= 2);
 
 	int rows_arg;
 	if (!getTokenValue(line, "rows", rows_arg))
@@ -1319,7 +1226,7 @@ void LyXTabular::read(Buffer const * buf, LyXLex & lex)
 	int columns_arg;
 	if (!getTokenValue(line, "columns", columns_arg))
 		return;
-	init(buf->params, rows_arg, columns_arg);
+	init(buf.params(), rows_arg, columns_arg);
 	l_getline(is, line);
 	if (!prefixIs(line, "<features")) {
 		lyxerr << "Wrong tabular format (expected <features ...> got"
@@ -1328,38 +1235,18 @@ void LyXTabular::read(Buffer const * buf, LyXLex & lex)
 	}
 	getTokenValue(line, "rotate", rotate);
 	getTokenValue(line, "islongtable", is_long_tabular);
-	// compatibility read for old longtable options. Now we can make any
-	// row part of the header/footer type we want before it was strict
-	// sequential from the first row down (as LaTeX does it!). So now when
-	// we find a header/footer line we have to go up the rows and set it
-	// on all preceding rows till the first or one with already a h/f option
-	// set. If we find a firstheader on the same line as a header or a
-	// lastfooter on the same line as a footer then this should be set empty.
-	// (Jug 20011220)
-	if (version < 3) {
-		int hrow;
-		int fhrow;
-		int frow;
-		int lfrow;
-
-		getTokenValue(line, "endhead", hrow);
-		getTokenValue(line, "endfirsthead", fhrow);
-		getTokenValue(line, "endfoot", frow);
-		getTokenValue(line, "endlastfoot", lfrow);
-		setHeaderFooterRows(abs(hrow), abs(fhrow), abs(frow), abs(lfrow));
-	} else {
-		getTokenValue(line, "firstHeadTopDL", endfirsthead.topDL);
-		getTokenValue(line, "firstHeadBottomDL", endfirsthead.bottomDL);
-		getTokenValue(line, "firstHeadEmpty", endfirsthead.empty);
-		getTokenValue(line, "headTopDL", endhead.topDL);
-		getTokenValue(line, "headBottomDL", endhead.bottomDL);
-		getTokenValue(line, "footTopDL", endfoot.topDL);
-		getTokenValue(line, "footBottomDL", endfoot.bottomDL);
-		getTokenValue(line, "lastFootTopDL", endlastfoot.topDL);
-		getTokenValue(line, "lastFootBottomDL", endlastfoot.bottomDL);
-		getTokenValue(line, "lastFootEmpty", endlastfoot.empty);
-	}
-	for (int j = 0; j < columns_; ++j) {
+	getTokenValue(line, "firstHeadTopDL", endfirsthead.topDL);
+	getTokenValue(line, "firstHeadBottomDL", endfirsthead.bottomDL);
+	getTokenValue(line, "firstHeadEmpty", endfirsthead.empty);
+	getTokenValue(line, "headTopDL", endhead.topDL);
+	getTokenValue(line, "headBottomDL", endhead.bottomDL);
+	getTokenValue(line, "footTopDL", endfoot.topDL);
+	getTokenValue(line, "footBottomDL", endfoot.bottomDL);
+	getTokenValue(line, "lastFootTopDL", endlastfoot.topDL);
+	getTokenValue(line, "lastFootBottomDL", endlastfoot.bottomDL);
+	getTokenValue(line, "lastFootEmpty", endlastfoot.empty);
+
+	for (col_type j = 0; j < columns_; ++j) {
 		l_getline(is,line);
 		if (!prefixIs(line,"<column")) {
 			lyxerr << "Wrong tabular format (expected <column ...> got"
@@ -1374,7 +1261,7 @@ void LyXTabular::read(Buffer const * buf, LyXLex & lex)
 		getTokenValue(line, "special", column_info[j].align_special);
 	}
 
-	for (int i = 0; i < rows_; ++i) {
+	for (row_type i = 0; i < rows_; ++i) {
 		l_getline(is, line);
 		if (!prefixIs(line, "<row")) {
 			lyxerr << "Wrong tabular format (expected <row ...> got"
@@ -1388,7 +1275,7 @@ void LyXTabular::read(Buffer const * buf, LyXLex & lex)
 		getTokenValue(line, "endfoot", row_info[i].endfoot);
 		getTokenValue(line, "endlastfoot", row_info[i].endlastfoot);
 		getTokenValue(line, "newpage", row_info[i].newpage);
-		for (int j = 0; j < columns_; ++j) {
+		for (col_type j = 0; j < columns_; ++j) {
 			l_getline(is, line);
 			if (!prefixIs(line, "<cell")) {
 				lyxerr << "Wrong tabular format (expected <cell ...> got"
@@ -1408,7 +1295,7 @@ void LyXTabular::read(Buffer const * buf, LyXLex & lex)
 			getTokenValue(line, "special", cell_info[i][j].align_special);
 			l_getline(is, line);
 			if (prefixIs(line, "\\begin_inset")) {
-				cell_info[i][j].inset.read(buf, lex);
+				cell_info[i][j].inset->read(buf, lex);
 				l_getline(is, line);
 			}
 			if (!prefixIs(line, "</cell>")) {
@@ -1431,20 +1318,27 @@ void LyXTabular::read(Buffer const * buf, LyXLex & lex)
 }
 
 
-bool LyXTabular::isMultiColumn(int cell, bool real) const
+bool LyXTabular::isMultiColumn(idx_type cell) const
+{
+	return cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
+}
+
+
+bool LyXTabular::isMultiColumnReal(idx_type cell) const
 {
-	return (!real || column_of_cell(cell) != right_column_of_cell(cell)) &&
+	return column_of_cell(cell) != right_column_of_cell(cell) &&
 			cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
 }
 
 
-LyXTabular::cellstruct & LyXTabular::cellinfo_of_cell(int cell) const
+LyXTabular::cellstruct & LyXTabular::cellinfo_of_cell(idx_type cell) const
 {
 	return cell_info[row_of_cell(cell)][column_of_cell(cell)];
 }
 
 
-void LyXTabular::setMultiColumn(Buffer * buffer, int cell, int number)
+void LyXTabular::setMultiColumn(Buffer * buffer, idx_type cell,
+                                idx_type number)
 {
 	cellstruct & cs = cellinfo_of_cell(cell);
 	cs.multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
@@ -1452,21 +1346,21 @@ void LyXTabular::setMultiColumn(Buffer * buffer, int cell, int number)
 	cs.top_line = row_info[row_of_cell(cell)].top_line;
 	cs.bottom_line = row_info[row_of_cell(cell)].bottom_line;
 	cs.right_line = column_info[column_of_cell(cell+number-1)].right_line;
-	for (int i = 1; i < number; ++i) {
+	for (idx_type i = 1; i < number; ++i) {
 		cellstruct & cs1 = cellinfo_of_cell(cell + i);
 		cs1.multicolumn = CELL_PART_OF_MULTICOLUMN;
-		cs.inset.appendParagraphs(buffer, cs1.inset.paragraphs);
-		cs1.inset.clear(false);
+		cs.inset->appendParagraphs(buffer, cs1.inset->paragraphs());
+		cs1.inset->clear(false);
 	}
 	set_row_column_number_info();
 }
 
 
-int LyXTabular::cells_in_multicolumn(int cell) const
+LyXTabular::idx_type LyXTabular::cells_in_multicolumn(idx_type cell) const
 {
-	int const row = row_of_cell(cell);
-	int column = column_of_cell(cell);
-	int result = 1;
+	row_type const row = row_of_cell(cell);
+	col_type column = column_of_cell(cell);
+	idx_type result = 1;
 	++column;
 	while (column < columns_ &&
 		   cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN)
@@ -1478,12 +1372,12 @@ int LyXTabular::cells_in_multicolumn(int cell) const
 }
 
 
-int LyXTabular::unsetMultiColumn(int cell)
+LyXTabular::idx_type LyXTabular::unsetMultiColumn(idx_type cell)
 {
-	int const row = row_of_cell(cell);
-	int column = column_of_cell(cell);
+	row_type const row = row_of_cell(cell);
+	col_type column = column_of_cell(cell);
 
-	int result = 0;
+	idx_type result = 0;
 
 	if (cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN) {
 		cell_info[row][column].multicolumn = CELL_NORMAL;
@@ -1525,13 +1419,13 @@ bool LyXTabular::getRotateTabular() const
 }
 
 
-void LyXTabular::setRotateCell(int cell, bool flag)
+void LyXTabular::setRotateCell(idx_type cell, bool flag)
 {
 	cellinfo_of_cell(cell).rotate = flag;
 }
 
 
-bool LyXTabular::getRotateCell(int cell) const
+bool LyXTabular::getRotateCell(idx_type cell) const
 {
 	return cellinfo_of_cell(cell).rotate;
 }
@@ -1541,15 +1435,15 @@ bool LyXTabular::needRotating() const
 {
 	if (rotate)
 		return true;
-	for (int i = 0; i < rows_; ++i)
-		for (int j = 0; j < columns_; ++j)
+	for (row_type i = 0; i < rows_; ++i)
+		for (col_type j = 0; j < columns_; ++j)
 			if (cell_info[i][j].rotate)
 				return true;
 	return false;
 }
 
 
-bool LyXTabular::isLastCell(int cell) const
+bool LyXTabular::isLastCell(idx_type cell) const
 {
 	if (cell + 1 < numberofcells)
 		return false;
@@ -1557,7 +1451,7 @@ bool LyXTabular::isLastCell(int cell) const
 }
 
 
-int LyXTabular::getCellAbove(int cell) const
+LyXTabular::idx_type LyXTabular::getCellAbove(idx_type cell) const
 {
 	if (row_of_cell(cell) > 0)
 		return cell_info[row_of_cell(cell)-1][column_of_cell(cell)].cellno;
@@ -1565,7 +1459,7 @@ int LyXTabular::getCellAbove(int cell) const
 }
 
 
-int LyXTabular::getCellBelow(int cell) const
+LyXTabular::idx_type LyXTabular::getCellBelow(idx_type cell) const
 {
 	if (row_of_cell(cell) + 1 < rows_)
 		return cell_info[row_of_cell(cell)+1][column_of_cell(cell)].cellno;
@@ -1573,9 +1467,9 @@ int LyXTabular::getCellBelow(int cell) const
 }
 
 
-int LyXTabular::getLastCellAbove(int cell) const
+LyXTabular::idx_type LyXTabular::getLastCellAbove(idx_type cell) const
 {
-	if (row_of_cell(cell) <= 0)
+	if (row_of_cell(cell) == 0)
 		return cell;
 	if (!isMultiColumn(cell))
 		return getCellAbove(cell);
@@ -1583,7 +1477,7 @@ int LyXTabular::getLastCellAbove(int cell) const
 }
 
 
-int LyXTabular::getLastCellBelow(int cell) const
+LyXTabular::idx_type LyXTabular::getLastCellBelow(idx_type cell) const
 {
 	if (row_of_cell(cell) + 1 >= rows_)
 		return cell;
@@ -1593,20 +1487,22 @@ int LyXTabular::getLastCellBelow(int cell) const
 }
 
 
-int LyXTabular::getCellNumber(int row, int column) const
+LyXTabular::idx_type LyXTabular::getCellNumber(row_type row,
+                                               col_type column) const
 {
-	Assert(column >= 0 || column < columns_ || row >= 0 || row < rows_);
+	BOOST_ASSERT(column != npos && column < columns_ &&
+	             row    != npos && row    < rows_);
 	return cell_info[row][column].cellno;
 }
 
 
-void LyXTabular::setUsebox(int cell, BoxType type)
+void LyXTabular::setUsebox(idx_type cell, BoxType type)
 {
 	cellinfo_of_cell(cell).usebox = type;
 }
 
 
-LyXTabular::BoxType LyXTabular::getUsebox(int cell) const
+LyXTabular::BoxType LyXTabular::getUsebox(idx_type cell) const
 {
 	if (column_info[column_of_cell(cell)].p_width.zero() &&
 		!(isMultiColumn(cell) && !cellinfo_of_cell(cell).p_width.zero()))
@@ -1620,7 +1516,8 @@ LyXTabular::BoxType LyXTabular::getUsebox(int cell) const
 ///
 //  This are functions used for the longtable support
 ///
-void LyXTabular::setLTHead(int row, bool flag, ltType const & hd, bool first)
+void LyXTabular::setLTHead(row_type row, bool flag, ltType const & hd,
+                           bool first)
 {
 	if (first) {
 		endfirsthead = hd;
@@ -1634,7 +1531,7 @@ void LyXTabular::setLTHead(int row, bool flag, ltType const & hd, bool first)
 }
 
 
-bool LyXTabular::getRowOfLTHead(int row, ltType & hd) const
+bool LyXTabular::getRowOfLTHead(row_type row, ltType & hd) const
 {
 	hd = endhead;
 	hd.set = haveLTHead();
@@ -1642,7 +1539,7 @@ bool LyXTabular::getRowOfLTHead(int row, ltType & hd) const
 }
 
 
-bool LyXTabular::getRowOfLTFirstHead(int row, ltType & hd) const
+bool LyXTabular::getRowOfLTFirstHead(row_type row, ltType & hd) const
 {
 	hd = endfirsthead;
 	hd.set = haveLTFirstHead();
@@ -1650,7 +1547,8 @@ bool LyXTabular::getRowOfLTFirstHead(int row, ltType & hd) const
 }
 
 
-void LyXTabular::setLTFoot(int row, bool flag, ltType const & fd, bool last)
+void LyXTabular::setLTFoot(row_type row, bool flag, ltType const & fd,
+                           bool last)
 {
 	if (last) {
 		endlastfoot = fd;
@@ -1664,7 +1562,7 @@ void LyXTabular::setLTFoot(int row, bool flag, ltType const & fd, bool last)
 }
 
 
-bool LyXTabular::getRowOfLTFoot(int row, ltType & fd) const
+bool LyXTabular::getRowOfLTFoot(row_type row, ltType & fd) const
 {
 	fd = endfoot;
 	fd.set = haveLTFoot();
@@ -1672,7 +1570,7 @@ bool LyXTabular::getRowOfLTFoot(int row, ltType & fd) const
 }
 
 
-bool LyXTabular::getRowOfLTLastFoot(int row, ltType & fd) const
+bool LyXTabular::getRowOfLTLastFoot(row_type row, ltType & fd) const
 {
 	fd = endlastfoot;
 	fd.set = haveLTLastFoot();
@@ -1680,13 +1578,13 @@ bool LyXTabular::getRowOfLTLastFoot(int row, ltType & fd) const
 }
 
 
-void LyXTabular::setLTNewPage(int row, bool what)
+void LyXTabular::setLTNewPage(row_type row, bool what)
 {
 	row_info[row].newpage = what;
 }
 
 
-bool LyXTabular::getLTNewPage(int row) const
+bool LyXTabular::getLTNewPage(row_type row) const
 {
 	return row_info[row].newpage;
 }
@@ -1694,7 +1592,7 @@ bool LyXTabular::getLTNewPage(int row) const
 
 bool LyXTabular::haveLTHead() const
 {
-	for (int i = 0; i < rows_; ++i)
+	for (row_type i = 0; i < rows_; ++i)
 		if (row_info[i].endhead)
 			return true;
 	return false;
@@ -1705,7 +1603,7 @@ bool LyXTabular::haveLTFirstHead() const
 {
 	if (endfirsthead.empty)
 		return false;
-	for (int i = 0; i < rows_; ++i)
+	for (row_type i = 0; i < rows_; ++i)
 		if (row_info[i].endfirsthead)
 			return true;
 	return false;
@@ -1714,7 +1612,7 @@ bool LyXTabular::haveLTFirstHead() const
 
 bool LyXTabular::haveLTFoot() const
 {
-	for (int i = 0; i < rows_; ++i)
+	for (row_type i = 0; i < rows_; ++i)
 		if (row_info[i].endfoot)
 			return true;
 	return false;
@@ -1725,7 +1623,7 @@ bool LyXTabular::haveLTLastFoot() const
 {
 	if (endlastfoot.empty)
 		return false;
-	for (int i = 0; i < rows_; ++i)
+	for (row_type i = 0; i < rows_; ++i)
 		if (row_info[i].endlastfoot)
 			return true;
 	return false;
@@ -1734,25 +1632,23 @@ bool LyXTabular::haveLTLastFoot() const
 
 // end longtable support functions
 
-bool LyXTabular::setAscentOfRow(int row, int height)
+void LyXTabular::setAscentOfRow(row_type row, int height)
 {
 	if (row >= rows_ || row_info[row].ascent_of_row == height)
-		return false;
+		return;
 	row_info[row].ascent_of_row = height;
-	return true;
 }
 
 
-bool LyXTabular::setDescentOfRow(int row, int height)
+void LyXTabular::setDescentOfRow(row_type row, int height)
 {
 	if (row >= rows_ || row_info[row].descent_of_row == height)
-		return false;
+		return;
 	row_info[row].descent_of_row = height;
-	return true;
 }
 
 
-int LyXTabular::getAscentOfRow(int row) const
+int LyXTabular::getAscentOfRow(row_type row) const
 {
 	if (row >= rows_)
 		return 0;
@@ -1760,10 +1656,9 @@ int LyXTabular::getAscentOfRow(int row) const
 }
 
 
-int LyXTabular::getDescentOfRow(int row) const
+int LyXTabular::getDescentOfRow(row_type row) const
 {
-	if (row >= rows_)
-		return 0;
+	BOOST_ASSERT(row < rows_);
 	return row_info[row].descent_of_row;
 }
 
@@ -1771,38 +1666,39 @@ int LyXTabular::getDescentOfRow(int row) const
 int LyXTabular::getHeightOfTabular() const
 {
 	int height = 0;
-	for (int row = 0; row < rows_; ++row)
+	for (row_type row = 0; row < rows_; ++row)
 		height += getAscentOfRow(row) + getDescentOfRow(row) +
 			getAdditionalHeight(row);
 	return height;
 }
 
 
-bool LyXTabular::isPartOfMultiColumn(int row, int column) const
+bool LyXTabular::isPartOfMultiColumn(row_type row, col_type column) const
 {
-	if (row >= rows_ || column >= columns_)
-		return false;
+	BOOST_ASSERT(row < rows_);
+	BOOST_ASSERT(column < columns_);
 	return cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN;
 }
 
 
-int LyXTabular::TeXTopHLine(ostream & os, int row) const
+int LyXTabular::TeXTopHLine(ostream & os, row_type row) const
 {
-	if (row < 0 || row >= rows_)
-		return 0;
+	// FIXME: assert or return 0 as in TeXBottomHLine()?
+	BOOST_ASSERT(row != npos);
+	BOOST_ASSERT(row < rows_);
 
-	int const fcell = getFirstCellInRow(row);
-	int const n = numberOfCellsInRow(fcell) + fcell;
-	int tmp = 0;
+	idx_type const fcell = getFirstCellInRow(row);
+	idx_type const n = numberOfCellsInRow(fcell) + fcell;
+	idx_type tmp = 0;
 
-	for (int i = fcell; i < n; ++i) {
+	for (idx_type i = fcell; i < n; ++i) {
 		if (topLine(i))
 			++tmp;
 	}
 	if (tmp == n - fcell) {
 		os << "\\hline ";
 	} else if (tmp) {
-		for (int i = fcell; i < n; ++i) {
+		for (idx_type i = fcell; i < n; ++i) {
 			if (topLine(i)) {
 				os << "\\cline{"
 				   << column_of_cell(i) + 1
@@ -1819,23 +1715,24 @@ int LyXTabular::TeXTopHLine(ostream & os, int row) const
 }
 
 
-int LyXTabular::TeXBottomHLine(ostream & os, int row) const
+int LyXTabular::TeXBottomHLine(ostream & os, row_type row) const
 {
-	if (row < 0 || row >= rows_)
+	// FIXME: return 0 or assert as in TeXTopHLine()?
+	if (row == npos || row >= rows_)
 		return 0;
 
-	int const fcell = getFirstCellInRow(row);
-	int const n = numberOfCellsInRow(fcell) + fcell;
-	int tmp = 0;
+	idx_type const fcell = getFirstCellInRow(row);
+	idx_type const n = numberOfCellsInRow(fcell) + fcell;
+	idx_type tmp = 0;
 
-	for (int i = fcell; i < n; ++i) {
+	for (idx_type i = fcell; i < n; ++i) {
 		if (bottomLine(i))
 			++tmp;
 	}
 	if (tmp == n - fcell) {
 		os << "\\hline";
 	} else if (tmp) {
-		for (int i = fcell; i < n; ++i) {
+		for (idx_type i = fcell; i < n; ++i) {
 			if (bottomLine(i)) {
 				os << "\\cline{"
 				   << column_of_cell(i) + 1
@@ -1852,7 +1749,7 @@ int LyXTabular::TeXBottomHLine(ostream & os, int row) const
 }
 
 
-int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
+int LyXTabular::TeXCellPreamble(ostream & os, idx_type cell) const
 {
 	int ret = 0;
 
@@ -1877,7 +1774,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
 				case LYX_VALIGN_TOP:
 					os << 'p';
 					break;
-				case LYX_VALIGN_CENTER:
+				case LYX_VALIGN_MIDDLE:
 					os << 'm';
 					break;
 				case LYX_VALIGN_BOTTOM:
@@ -1914,7 +1811,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
 		case LYX_VALIGN_TOP:
 			os << 't';
 			break;
-		case LYX_VALIGN_CENTER:
+		case LYX_VALIGN_MIDDLE:
 			os << 'c';
 			break;
 		case LYX_VALIGN_BOTTOM:
@@ -1928,7 +1825,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
 		case LYX_VALIGN_TOP:
 			os << 't';
 			break;
-		case LYX_VALIGN_CENTER:
+		case LYX_VALIGN_MIDDLE:
 			os << 'm';
 			break;
 		case LYX_VALIGN_BOTTOM:
@@ -1942,7 +1839,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
 }
 
 
-int LyXTabular::TeXCellPostamble(ostream & os, int cell) const
+int LyXTabular::TeXCellPostamble(ostream & os, idx_type cell) const
 {
 	int ret = 0;
 
@@ -1964,8 +1861,8 @@ int LyXTabular::TeXCellPostamble(ostream & os, int cell) const
 }
 
 
-int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
-					 LatexRunParams const & runparams) const
+int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const & buf,
+					 OutputParams const & runparams) const
 {
 	if (!is_long_tabular)
 		return 0;
@@ -1977,7 +1874,7 @@ int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
 			os << "\\hline\n";
 			++ret;
 		}
-		for (int i = 0; i < rows_; ++i) {
+		for (row_type i = 0; i < rows_; ++i) {
 			if (row_info[i].endhead) {
 				ret += TeXRow(os, i, buf, runparams);
 			}
@@ -1999,7 +1896,7 @@ int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
 			os << "\\hline\n";
 			++ret;
 		}
-		for (int i = 0; i < rows_; ++i) {
+		for (row_type i = 0; i < rows_; ++i) {
 			if (row_info[i].endfirsthead) {
 				ret += TeXRow(os, i, buf, runparams);
 			}
@@ -2017,7 +1914,7 @@ int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
 			os << "\\hline\n";
 			++ret;
 		}
-		for (int i = 0; i < rows_; ++i) {
+		for (row_type i = 0; i < rows_; ++i) {
 			if (row_info[i].endfoot) {
 				ret += TeXRow(os, i, buf, runparams);
 			}
@@ -2039,7 +1936,7 @@ int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
 			os << "\\hline\n";
 			++ret;
 		}
-		for (int i = 0; i < rows_; ++i) {
+		for (row_type i = 0; i < rows_; ++i) {
 			if (row_info[i].endlastfoot) {
 				ret += TeXRow(os, i, buf, runparams);
 			}
@@ -2055,34 +1952,35 @@ int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
 }
 
 
-bool LyXTabular::isValidRow(int const row) const
+bool LyXTabular::isValidRow(row_type row) const
 {
 	if (!is_long_tabular)
 		return true;
-	return (!row_info[row].endhead && !row_info[row].endfirsthead &&
-			!row_info[row].endfoot && !row_info[row].endlastfoot);
+	return !row_info[row].endhead && !row_info[row].endfirsthead &&
+			!row_info[row].endfoot && !row_info[row].endlastfoot;
 }
 
 
-int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf,
-		       LatexRunParams const & runparams) const
+int LyXTabular::TeXRow(ostream & os, row_type i, Buffer const & buf,
+		       OutputParams const & runparams) const
 {
-	int ret = 0;
-	int cell = getCellNumber(i, 0);
+	idx_type cell = getCellNumber(i, 0);
 
-	ret += TeXTopHLine(os, i);
-	for (int j = 0; j < columns_; ++j) {
+	int ret = TeXTopHLine(os, i);
+	for (col_type j = 0; j < columns_; ++j) {
 		if (isPartOfMultiColumn(i, j))
 			continue;
 		ret += TeXCellPreamble(os, cell);
-		InsetText & inset = getCellInset(cell);
+		shared_ptr<InsetText> inset = getCellInset(cell);
 
-		bool rtl = inset.paragraphs.begin()->isRightToLeftPar(buf->params) &&
-			!inset.paragraphs.begin()->empty() && getPWidth(cell).zero();
+		Paragraph const & par = inset->paragraphs().front();
+		bool rtl = par.isRightToLeftPar(buf.params())
+			&& !par.empty()
+			&& getPWidth(cell).zero();
 
 		if (rtl)
 			os << "\\R{";
-		ret += inset.latex(buf, os, runparams);
+		ret += inset->latex(buf, os, runparams);
 		if (rtl)
 			os << '}';
 
@@ -2100,8 +1998,8 @@ int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf,
 }
 
 
-int LyXTabular::latex(Buffer const * buf, ostream & os,
-		      LatexRunParams const & runparams) const
+int LyXTabular::latex(Buffer const & buf, ostream & os,
+		      OutputParams const & runparams) const
 {
 	int ret = 0;
 
@@ -2117,7 +2015,7 @@ int LyXTabular::latex(Buffer const * buf, ostream & os,
 		os << "\\begin{longtable}{";
 	else
 		os << "\\begin{tabular}{";
-	for (int i = 0; i < columns_; ++i) {
+	for (col_type i = 0; i < columns_; ++i) {
 		if (!column_info[i].align_special.empty()) {
 			os << column_info[i].align_special;
 		} else {
@@ -2145,7 +2043,7 @@ int LyXTabular::latex(Buffer const * buf, ostream & os,
 				case LYX_VALIGN_TOP:
 					os << 'p';
 					break;
-				case LYX_VALIGN_CENTER:
+				case LYX_VALIGN_MIDDLE:
 					os << 'm';
 					break;
 				case LYX_VALIGN_BOTTOM:
@@ -2181,7 +2079,7 @@ int LyXTabular::latex(Buffer const * buf, ostream & os,
 	//+                      the single row and columns (cells)            +
 	//+---------------------------------------------------------------------
 
-	for (int i = 0; i < rows_; ++i) {
+	for (row_type i = 0; i < rows_; ++i) {
 		if (isValidRow(i)) {
 			ret += TeXRow(os, i, buf, runparams);
 			if (is_long_tabular && row_info[i].newpage) {
@@ -2208,10 +2106,11 @@ int LyXTabular::latex(Buffer const * buf, ostream & os,
 }
 
 
-int LyXTabular::linuxdoc(Buffer const * buf, ostream & os) const
+int LyXTabular::linuxdoc(Buffer const & buf, ostream & os,
+			 const OutputParams & runparams) const
 {
 	os << "<tabular ca=\"";
-	for (int i = 0; i < columns_; ++i) {
+	for (col_type i = 0; i < columns_; ++i) {
 		switch (column_info[i].alignment) {
 		case LYX_ALIGN_LEFT:
 			os << 'l';
@@ -2225,15 +2124,15 @@ int LyXTabular::linuxdoc(Buffer const * buf, ostream & os) const
 		}
 	}
 	os << "\">\n";
-	int cell = 0;
+	idx_type cell = 0;
 	int ret = 0;
-	for (int i = 0; i < rows_; ++i) {
-		for (int j = 0; j < columns_; ++j) {
+	for (row_type i = 0; i < rows_; ++i) {
+		for (col_type j = 0; j < columns_; ++j) {
 			if (isPartOfMultiColumn(i, j))
 				continue;
-			InsetText & inset = getCellInset(cell);
-	
-			ret += inset.linuxdoc(buf, os);
+			shared_ptr<InsetText> inset = getCellInset(cell);
+
+			ret += inset->linuxdoc(buf, os, runparams);
 
 			if (isLastCellInRow(cell)) {
 				os << "@\n";
@@ -2249,13 +2148,14 @@ int LyXTabular::linuxdoc(Buffer const * buf, ostream & os) const
 }
 
 
-int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const
+int LyXTabular::docbookRow(Buffer const & buf, ostream & os, row_type row,
+			   OutputParams const & runparams) const
 {
 	int ret = 0;
-	int cell = getFirstCellInRow(row);
+	idx_type cell = getFirstCellInRow(row);
 
 	os << "<row>\n";
-	for (int j = 0; j < columns_; ++j) {
+	for (col_type j = 0; j < columns_; ++j) {
 		if (isPartOfMultiColumn(row, j))
 			continue;
 
@@ -2280,7 +2180,7 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const
 		case LYX_VALIGN_BOTTOM:
 			os << "bottom";
 			break;
-		case LYX_VALIGN_CENTER:
+		case LYX_VALIGN_MIDDLE:
 			os << "middle";
 		}
 		os << '"';
@@ -2291,7 +2191,7 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const
 		}
 
 		os << '>';
-		ret += getCellInset(cell).docbook(buf, os, true);
+		ret += getCellInset(cell)->docbook(buf, os, runparams);
 		os << "</entry>\n";
 		++cell;
 	}
@@ -2300,8 +2200,8 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const
 }
 
 
-int LyXTabular::docbook(Buffer const * buf, ostream & os,
-			bool /*mixcont*/) const
+int LyXTabular::docbook(Buffer const & buf, ostream & os,
+			OutputParams const & runparams) const
 {
 	int ret = 0;
 
@@ -2312,7 +2212,7 @@ int LyXTabular::docbook(Buffer const * buf, ostream & os,
 	os << "<tgroup cols=\"" << columns_
 	   << "\" colsep=\"1\" rowsep=\"1\">\n";
 
-	for (int i = 0; i < columns_; ++i) {
+	for (col_type i = 0; i < columns_; ++i) {
 		os << "<colspec colname=\"col" << i << "\" align=\"";
 		switch (column_info[i].alignment) {
 		case LYX_ALIGN_LEFT:
@@ -2325,7 +2225,10 @@ int LyXTabular::docbook(Buffer const * buf, ostream & os,
 			os << "center";
 			break;
 		}
-		os << "\">\n";
+		os << '"';
+		if (runparams.flavor == OutputParams::XML)
+			os << '/';
+		os << ">\n";
 		++ret;
 	}
 
@@ -2337,9 +2240,9 @@ int LyXTabular::docbook(Buffer const * buf, ostream & os,
 	if (haveLTHead() || haveLTFirstHead()) {
 		os << "<thead>\n";
 		++ret;
-		for (int i = 0; i < rows_; ++i) {
+		for (row_type i = 0; i < rows_; ++i) {
 			if (row_info[i].endhead || row_info[i].endfirsthead) {
-				ret += docbookRow(buf, os, i);
+				ret += docbookRow(buf, os, i, runparams);
 			}
 		}
 		os << "</thead>\n";
@@ -2349,9 +2252,9 @@ int LyXTabular::docbook(Buffer const * buf, ostream & os,
 	if (haveLTFoot() || haveLTLastFoot()) {
 		os << "<tfoot>\n";
 		++ret;
-		for (int i = 0; i < rows_; ++i) {
+		for (row_type i = 0; i < rows_; ++i) {
 			if (row_info[i].endfoot || row_info[i].endlastfoot) {
-				ret += docbookRow(buf, os, i);
+				ret += docbookRow(buf, os, i, runparams);
 			}
 		}
 		os << "</tfoot>\n";
@@ -2364,9 +2267,9 @@ int LyXTabular::docbook(Buffer const * buf, ostream & os,
 
 	os << "<tbody>\n";
 	++ret;
-	for (int i = 0; i < rows_; ++i) {
+	for (row_type i = 0; i < rows_; ++i) {
 		if (isValidRow(i)) {
-			ret += docbookRow(buf, os, i);
+			ret += docbookRow(buf, os, i, runparams);
 		}
 	}
 	os << "</tbody>\n";
@@ -2382,14 +2285,14 @@ int LyXTabular::docbook(Buffer const * buf, ostream & os,
 }
 
 
-int LyXTabular::asciiTopHLine(ostream & os, int row,
+int LyXTabular::asciiTopHLine(ostream & os, row_type row,
 			      vector<unsigned int> const & clen) const
 {
-	int const fcell = getFirstCellInRow(row);
-	int const n = numberOfCellsInRow(fcell) + fcell;
-	int tmp = 0;
+	idx_type const fcell = getFirstCellInRow(row);
+	idx_type const n = numberOfCellsInRow(fcell) + fcell;
+	idx_type tmp = 0;
 
-	for (int i = fcell; i < n; ++i) {
+	for (idx_type i = fcell; i < n; ++i) {
 		if (topLine(i)) {
 			++tmp;
 			break;
@@ -2399,7 +2302,7 @@ int LyXTabular::asciiTopHLine(ostream & os, int row,
 		return 0;
 
 	unsigned char ch;
-	for (int i = fcell; i < n; ++i) {
+	for (idx_type i = fcell; i < n; ++i) {
 		if (topLine(i)) {
 			if (leftLine(i))
 				os << "+-";
@@ -2410,9 +2313,10 @@ int LyXTabular::asciiTopHLine(ostream & os, int row,
 			os << "  ";
 			ch = ' ';
 		}
-		int column = column_of_cell(i);
+		col_type column = column_of_cell(i);
 		int len = clen[column];
-		while (isPartOfMultiColumn(row, ++column))
+		while (column < columns_ - 1
+		       && isPartOfMultiColumn(row, ++column))
 			len += clen[column] + 4;
 		os << string(len, ch);
 		if (topLine(i)) {
@@ -2429,14 +2333,14 @@ int LyXTabular::asciiTopHLine(ostream & os, int row,
 }
 
 
-int LyXTabular::asciiBottomHLine(ostream & os, int row,
+int LyXTabular::asciiBottomHLine(ostream & os, row_type row,
 				 vector<unsigned int> const & clen) const
 {
-	int const fcell = getFirstCellInRow(row);
-	int const n = numberOfCellsInRow(fcell) + fcell;
-	int tmp = 0;
+	idx_type const fcell = getFirstCellInRow(row);
+	idx_type const n = numberOfCellsInRow(fcell) + fcell;
+	idx_type tmp = 0;
 
-	for (int i = fcell; i < n; ++i) {
+	for (idx_type i = fcell; i < n; ++i) {
 		if (bottomLine(i)) {
 			++tmp;
 			break;
@@ -2446,7 +2350,7 @@ int LyXTabular::asciiBottomHLine(ostream & os, int row,
 		return 0;
 
 	unsigned char ch;
-	for (int i = fcell; i < n; ++i) {
+	for (idx_type i = fcell; i < n; ++i) {
 		if (bottomLine(i)) {
 			if (leftLine(i))
 				os << "+-";
@@ -2457,9 +2361,10 @@ int LyXTabular::asciiBottomHLine(ostream & os, int row,
 			os << "  ";
 			ch = ' ';
 		}
-		int column = column_of_cell(i);
+		col_type column = column_of_cell(i);
 		int len = clen[column];
-		while (isPartOfMultiColumn(row, ++column))
+		while (column < columns_ -1
+		       && isPartOfMultiColumn(row, ++column))
 			len += clen[column] + 4;
 		os << string(len, ch);
 		if (bottomLine(i)) {
@@ -2476,13 +2381,14 @@ int LyXTabular::asciiBottomHLine(ostream & os, int row,
 }
 
 
-int LyXTabular::asciiPrintCell(Buffer const * buf, ostream & os,
-			       int cell, int row, int column,
+int LyXTabular::asciiPrintCell(Buffer const & buf, ostream & os,
+			       OutputParams const & runparams,
+			       idx_type cell, row_type row, col_type column,
 			       vector<unsigned int> const & clen,
 			       bool onlydata) const
 {
 	ostringstream sstr;
-	int ret = getCellInset(cell).ascii(buf, sstr, 0);
+	int const ret = getCellInset(cell)->plaintext(buf, sstr, runparams);
 
 	if (onlydata) {
 		os << sstr.str();
@@ -2496,7 +2402,8 @@ int LyXTabular::asciiPrintCell(Buffer const * buf, ostream & os,
 
 	unsigned int len1 = sstr.str().length();
 	unsigned int len2 = clen[column];
-	while (isPartOfMultiColumn(row, ++column))
+	while (column < columns_ -1
+	       && isPartOfMultiColumn(row, ++column))
 		len2 += clen[column] + 4;
 	len2 -= len1;
 
@@ -2526,8 +2433,10 @@ int LyXTabular::asciiPrintCell(Buffer const * buf, ostream & os,
 }
 
 
-int LyXTabular::ascii(Buffer const * buf, ostream & os, int const depth,
-					  bool onlydata, unsigned char delim) const
+int LyXTabular::plaintext(Buffer const & buf, ostream & os,
+		      OutputParams const & runparams,
+		      int const depth,
+		      bool onlydata, unsigned char delim) const
 {
 	int ret = 0;
 
@@ -2536,111 +2445,94 @@ int LyXTabular::ascii(Buffer const * buf, ostream & os, int const depth,
 
 	if (!onlydata) {
 		// first all non (real) multicolumn cells!
-		for (int j = 0; j < columns_; ++j) {
+		for (col_type j = 0; j < columns_; ++j) {
 			clen[j] = 0;
-			for (int i = 0; i < rows_; ++i) {
-				int cell = getCellNumber(i, j);
-				if (isMultiColumn(cell, true))
+			for (row_type i = 0; i < rows_; ++i) {
+				idx_type cell = getCellNumber(i, j);
+				if (isMultiColumnReal(cell))
 					continue;
 				ostringstream sstr;
-				getCellInset(cell).ascii(buf, sstr, 0);
+				getCellInset(cell)->plaintext(buf, sstr, runparams);
 				if (clen[j] < sstr.str().length())
 					clen[j] = sstr.str().length();
 			}
 		}
 		// then all (real) multicolumn cells!
-		for (int j = 0; j < columns_; ++j) {
-			for (int i = 0; i < rows_; ++i) {
-				int cell = getCellNumber(i, j);
-				if (!isMultiColumn(cell, true) || isPartOfMultiColumn(i, j))
+		for (col_type j = 0; j < columns_; ++j) {
+			for (row_type i = 0; i < rows_; ++i) {
+				idx_type cell = getCellNumber(i, j);
+				if (!isMultiColumnReal(cell) || isPartOfMultiColumn(i, j))
 					continue;
 				ostringstream sstr;
-				getCellInset(cell).ascii(buf, sstr, 0);
+				getCellInset(cell)->plaintext(buf, sstr, runparams);
 				int len = int(sstr.str().length());
-				int const n = cells_in_multicolumn(cell);
-				for (int k = j; len > 0 && k < j + n - 1; ++k)
+				idx_type const n = cells_in_multicolumn(cell);
+				for (col_type k = j; len > 0 && k < j + n - 1; ++k)
 					len -= clen[k];
 				if (len > int(clen[j + n - 1]))
 					clen[j + n - 1] = len;
 			}
 		}
 	}
-	int cell = 0;
-	for (int i = 0; i < rows_; ++i) {
+	idx_type cell = 0;
+	for (row_type i = 0; i < rows_; ++i) {
 		if (!onlydata && asciiTopHLine(os, i, clen))
-			for (int j = 0; j < depth; ++j)
-				os << "  ";
-		for (int j = 0; j < columns_; ++j) {
+			os << string(depth * 2, ' ');
+		for (col_type j = 0; j < columns_; ++j) {
 			if (isPartOfMultiColumn(i, j))
 				continue;
 			if (onlydata && j > 0)
 				os << delim;
-			ret += asciiPrintCell(buf, os, cell, i, j, clen, onlydata);
+			ret += asciiPrintCell(buf, os, runparams,
+					      cell, i, j, clen, onlydata);
 			++cell;
 		}
 		os << endl;
 		if (!onlydata) {
-			for (int j = 0; j < depth; ++j)
-				os << "  ";
+			os << string(depth * 2, ' ');
 			if (asciiBottomHLine(os, i, clen))
-				for (int j = 0; j < depth; ++j)
-					os << "  ";
+				os << string(depth * 2, ' ');
 		}
 	}
 	return ret;
 }
 
 
-InsetText & LyXTabular::getCellInset(int cell) const
+shared_ptr<InsetText> LyXTabular::getCellInset(idx_type cell) const
 {
-	cur_cell = cell;
 	return cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
 }
 
 
-InsetText & LyXTabular::getCellInset(int row, int column) const
+shared_ptr<InsetText> LyXTabular::getCellInset(row_type row,
+                                               col_type column) const
 {
-	cur_cell = getCellNumber(row, column);
 	return cell_info[row][column].inset;
 }
 
 
-int LyXTabular::getCellFromInset(InsetOld const * inset, int maybe_cell) const
+LyXTabular::idx_type
+LyXTabular::getCellFromInset(InsetBase const * inset) const
 {
 	// is this inset part of the tabular?
-	if (!inset || inset->owner() != owner_) {
-		lyxerr << "this is not a cell of the tabular!" << endl;
-		Assert(0);
-	}
-
-	const int save_cur_cell = cur_cell;
-	int cell = cur_cell;
-	if (&getCellInset(cell) != inset) {
-		cell = maybe_cell;
-		if (cell == -1 || &getCellInset(cell) != inset) {
-			cell = -1;
-		}
+	if (!inset) {
+		lyxerr << "Error: this is not a cell of the tabular!" << endl;
+		BOOST_ASSERT(false);
 	}
 
-	if (cell == -1) {
-		for (cell = getNumberOfCells(); cell >= 0; --cell) {
-			if (&getCellInset(cell) == inset)
-				break;
-		}
-		lyxerr[Debug::INSETTEXT]
-			 << "LyXTabular::getCellFromInset: "
-				    << "cell=" << cell
-				    << ", cur_cell=" << save_cur_cell
-				    << ", maybe_cell=" << maybe_cell
-				    << endl;
-		// We should have found a cell at this point
-		if (cell == -1) {
-			lyxerr << "LyXTabular::getCellFromInset: "
-			       << "Cell not found!" << endl;
+	for (idx_type cell = 0, n = getNumberOfCells(); cell < n; ++cell)
+		if (getCellInset(cell).get() == inset) {
+			lyxerr[Debug::INSETTEXT] << "LyXTabular::getCellFromInset: "
+				<< "cell=" << cell << endl;
+			return cell;
 		}
-	}
 
-	return cell;
+	// We should have found a cell at this point
+	lyxerr << "LyXTabular::getCellFromInset: Cell of inset "
+		<< inset << " not found!" << endl;
+	BOOST_ASSERT(false);
+	// shut up compiler
+	return 0;
 }
 
 
@@ -2651,26 +2543,27 @@ void LyXTabular::validate(LaTeXFeatures & features) const
 		features.require("longtable");
 	if (needRotating())
 		features.require("rotating");
-	for (int cell = 0; cell < numberofcells; ++cell) {
+	for (idx_type cell = 0; cell < numberofcells; ++cell) {
 		if (getVAlignment(cell) != LYX_VALIGN_TOP ||
 		     (!getPWidth(cell).zero() && !isMultiColumn(cell)))
 			features.require("array");
-		getCellInset(cell).validate(features);
+		getCellInset(cell)->validate(features);
 	}
 }
 
 
-void LyXTabular::getLabelList(std::vector<string> & list) const
+void LyXTabular::getLabelList(Buffer const & buffer,
+			      std::vector<string> & list) const
 {
-	for (int i = 0; i < rows_; ++i)
-		for (int j = 0; j < columns_; ++j)
-			getCellInset(i, j).getLabelList(list);
+	for (row_type i = 0; i < rows_; ++i)
+		for (col_type j = 0; j < columns_; ++j)
+			getCellInset(i, j)->getLabelList(buffer, list);
 }
 
 
-LyXTabular::BoxType LyXTabular::useParbox(int cell) const
+LyXTabular::BoxType LyXTabular::useParbox(idx_type cell) const
 {
-	ParagraphList const & parlist = getCellInset(cell).paragraphs;
+	ParagraphList const & parlist = getCellInset(cell)->paragraphs();
 	ParagraphList::const_iterator cit = parlist.begin();
 	ParagraphList::const_iterator end = parlist.end();