]> git.lyx.org Git - lyx.git/blobdiff - src/tabular.C
Enable convertDefault.sh to run even if its executable bit is not set.
[lyx.git] / src / tabular.C
index 1b9090f1a9db4d57e4932c36ba5c20e2b643cde7..10e0b797ae4f84c7e10221b1a97a1c68d1d56022 100644 (file)
@@ -1,31 +1,49 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *      
- *        Copyright 2000 The LyX Team.
+/**
+ * \file tabular.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== 
+ * \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
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include <algorithm>
-#include <cstdlib>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "tabular.h"
+#include "LaTeXFeatures.h"
+#include "Lsstream.h"
+#include "buffer.h"
 #include "debug.h"
+#include "gettext.h"
+#include "lyxlex.h"
 #include "vspace.h"
-#include "layout.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 "lyx_gui_misc.h"
-#include "insets/insettext.h"
+#include "support/tostr.h"
+
+#include "frontends/Alert.h"
+#include "frontends/Painter.h"
+
+#include <algorithm>
+#include <cstdlib>
 
+using namespace lyx::support;
+
+using std::abs;
 using std::ostream;
 using std::istream;
 using std::getline;
@@ -33,2140 +51,2629 @@ using std::max;
 using std::endl;
 using std::vector;
 
-static int const WIDTH_OF_LINE = 5;
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
 
-/// Define a few methods for the inner structs
+namespace {
+
+int const WIDTH_OF_LINE = 5;
 
-LyXTabular::cellstruct::cellstruct() 
+template <class T>
+string const write_attribute(string const & name, T const & t)
 {
-    cellno = 0; //should be initilaized correctly later.
-    width_of_cell = 0;
-    multicolumn = LyXTabular::CELL_NORMAL;
-    alignment = LYX_ALIGN_CENTER;
-    top_line = true;
-    bottom_line = false;
-    rotate = false;
-    linebreaks = false;
-    inset = 0;
+       string const s = tostr(t);
+       return s.empty() ? s : " " + name + "=\"" + s + "\"";
 }
 
-LyXTabular::cellstruct::~cellstruct() 
+string const write_attribute(string const & name, string const & t)
 {
-    delete inset;
+       return t.empty() ? t : " " + name + "=\"" + t + "\"";
 }
 
-LyXTabular::cellstruct & 
-  LyXTabular::cellstruct::operator=(cellstruct const & cs)
+
+string const write_attribute(string const & name, bool const & b)
 {
-    cellno = cs.cellno;
-    width_of_cell = cs.width_of_cell;
-    multicolumn = cs.multicolumn;
-    alignment = cs.alignment;
-    top_line = cs.top_line;
-    bottom_line = cs.bottom_line;
-    rotate = cs.rotate;
-    linebreaks = cs.linebreaks;
-    return *this;
+       // 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();
 }
 
-LyXTabular::rowstruct::rowstruct() 
+
+string const write_attribute(string const & name, int const & i)
 {
-    top_line = true;
-    bottom_line = false;
-    ascent_of_row = 0;
-    descent_of_row = 0;
-    newpage = false;
+       // 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();
 }
 
-// Nothing to do, but gcc 2.7.2.3 wants one... (JMarc)
-LyXTabular::rowstruct::~rowstruct() 
+
+string const write_attribute(string const & name, LyXLength const & value)
 {
+       // we write only the value if we really have one same reson as above.
+       return value.zero() ? string() : write_attribute(name, value.asString());
 }
 
-LyXTabular::rowstruct & 
-  LyXTabular::rowstruct::operator=(rowstruct const & rs)
+
+string const tostr(LyXAlignment const & num)
 {
-    top_line = rs.top_line;
-    bottom_line = rs.bottom_line;
-    ascent_of_row = rs.ascent_of_row;
-    descent_of_row = rs.descent_of_row;
-    newpage = rs.newpage;
-    return *this;
+       switch (num) {
+       case LYX_ALIGN_NONE:
+               return "none";
+       case LYX_ALIGN_BLOCK:
+               return "block";
+       case LYX_ALIGN_LEFT:
+               return "left";
+       case LYX_ALIGN_CENTER:
+               return "center";
+       case LYX_ALIGN_RIGHT:
+               return "right";
+       case LYX_ALIGN_LAYOUT:
+               return "layout";
+       case LYX_ALIGN_SPECIAL:
+               return "special";
+       }
+       return string();
 }
 
-LyXTabular::columnstruct::columnstruct() 
+
+string const tostr(LyXTabular::VAlignment const & num)
 {
-    left_line = true;
-    right_line = false;
-    alignment = LYX_ALIGN_CENTER;
-    width_of_column = 0;
+       switch (num) {
+       case LyXTabular::LYX_VALIGN_TOP:
+               return "top";
+       case LyXTabular::LYX_VALIGN_MIDDLE:
+               return "middle";
+       case LyXTabular::LYX_VALIGN_BOTTOM:
+               return "bottom";
+       }
+       return string();
 }
 
-LyXTabular::columnstruct::~columnstruct() 
+
+string const tostr(LyXTabular::BoxType const & num)
 {
+       switch (num) {
+       case LyXTabular::BOX_NONE:
+               return "none";
+       case LyXTabular::BOX_PARBOX:
+               return "parbox";
+       case LyXTabular::BOX_MINIPAGE:
+               return "minipage";
+       }
+       return string();
+}
+
+// I would have liked a fromstr template a lot better. (Lgb)
+bool string2type(string const str, LyXAlignment & num)
+{
+       if (str == "none")
+               num = LYX_ALIGN_NONE;
+       else if (str == "block")
+               num = LYX_ALIGN_BLOCK;
+       else if (str == "left")
+               num = LYX_ALIGN_LEFT;
+       else if (str == "center")
+               num = LYX_ALIGN_CENTER;
+       else if (str == "right")
+               num = LYX_ALIGN_RIGHT;
+       else
+               return false;
+       return true;
 }
 
-LyXTabular::columnstruct & 
-  LyXTabular::columnstruct::operator=(columnstruct const & cs)
+
+bool string2type(string const str, LyXTabular::VAlignment & num)
 {
-    left_line = cs.left_line;
-    right_line = cs.right_line;
-    alignment = cs.alignment;
-    width_of_column = cs.width_of_column;
-    p_width = cs.p_width;
-    align_special = cs.align_special;
-    return *this;
+       if (str == "top")
+               num = LyXTabular::LYX_VALIGN_TOP;
+       else if (str == "middle" )
+               num = LyXTabular::LYX_VALIGN_MIDDLE;
+       else if (str == "bottom")
+               num = LyXTabular::LYX_VALIGN_BOTTOM;
+       else
+               return false;
+       return true;
 }
 
-/* konstruktor */
-LyXTabular::LyXTabular(int rows_arg, int columns_arg, Buffer *buf)
+
+bool string2type(string const str, LyXTabular::BoxType & num)
 {
-    buffer = buf;
-    Init(buf, rows_arg, columns_arg);
+       if (str == "none")
+               num = LyXTabular::BOX_NONE;
+       else if (str == "parbox")
+               num = LyXTabular::BOX_PARBOX;
+       else if (str == "minipage")
+               num = LyXTabular::BOX_MINIPAGE;
+       else
+               return false;
+       return true;
 }
 
 
-LyXTabular::LyXTabular(LyXTabular const & lt, Buffer * buf)
+bool string2type(string const str, bool & num)
 {
-    buffer = buf;
-    Init(buf, lt.rows_, lt.columns_);
-    
-    operator=(lt);
+       if (str == "true")
+               num = true;
+       else if (str == "false")
+               num = false;
+       else
+               return false;
+       return true;
 }
 
-LyXTabular::LyXTabular(LyXLex & lex, Buffer *buf)
+
+bool getTokenValue(string const & str, const char * token, string & ret)
 {
-    buffer = buf;
-    Read(lex);
+       ret.erase();
+       size_t token_length = strlen(token);
+       string::size_type pos = str.find(token);
+
+       if (pos == string::npos || pos + token_length + 1 >= str.length()
+               || str[pos + token_length] != '=')
+               return false;
+       pos += token_length + 1;
+       char ch = str[pos];
+       if ((ch != '"') && (ch != '\'')) { // only read till next space
+               ret += ch;
+               ch = ' ';
+       }
+       while ((pos < str.length() - 1) && (str[++pos] != ch))
+               ret += str[pos];
+
+       return true;
 }
 
 
-LyXTabular::~LyXTabular()
+bool getTokenValue(string const & str, const char * token, int & num)
 {
-    delete[] rowofcell;
-    delete[] columnofcell;
-//    delete[] column_info;
-//    delete[] row_info;
-//    for (int i = 0; i < rows_; ++i) {
-//     delete[] cell_info[i];
-//    }
-//    delete[] cell_info;
+       string tmp;
+       num = 0;
+       if (!getTokenValue(str, token, tmp))
+               return false;
+       num = strToInt(tmp);
+       return true;
 }
 
 
-LyXTabular & LyXTabular::operator=(LyXTabular const & lt)
+bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
 {
-    // If this and lt is not of the same size we have a serious bug
-    // So then it is ok to throw an exception, or for now
-    // call abort()
-    Assert(rows_ == lt.rows_ && columns_ == lt.columns_);
+       string tmp;
+       if (!getTokenValue(str, token, tmp))
+               return false;
+       return string2type(tmp, num);
+}
 
-    int row = 0, column = 0;
-    
-    for (row = 0; row < rows_; ++row) {
-        for (column = 0; column < columns_; ++column) {
-            cell_info[row][column] = lt.cell_info[row][column];
-        }
-    }
-    
-    for (row = 0; row < rows_; ++row) {
-        row_info[row] = lt.row_info[row];
-    }
-    
-    for (column = 0; column < columns_; ++column) {
-       column_info[column] = lt.column_info[column];
-    }
 
-    SetLongTabular(lt.is_long_tabular);
-    rotate = lt.rotate;
-    Reinit();
-    
-    return *this;
+bool getTokenValue(string const & str, const char * token,
+                                  LyXTabular::VAlignment & num)
+{
+       string tmp;
+       if (!getTokenValue(str, token, tmp))
+               return false;
+       return string2type(tmp, num);
 }
 
-LyXTabular * LyXTabular::Clone(Buffer * buf)
+
+bool getTokenValue(string const & str, const char * token,
+                                  LyXTabular::BoxType & num)
 {
-    LyXTabular * result = new LyXTabular(rows_, columns_, buf);
-    int row, column;;
+       string tmp;
+       if (!getTokenValue(str, token, tmp))
+               return false;
+       return string2type(tmp, num);
+}
+
 
-    for (row = 0; row < rows_; ++row) {
-        for (column = 0; column < columns_; ++column) {
-            result->cell_info[row][column] = cell_info[row][column];
-        }
-    }
+bool getTokenValue(string const & str, const char * 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);
+}
 
-    for (row = 0; row < rows_; ++row) {
-        result->row_info[row] = row_info[row];
-    }
 
-    for (column = 0; column < columns_; ++column) {
-        result->column_info[column].left_line = column_info[column].left_line;
-        result->column_info[column].right_line = column_info[column].right_line;
-        result->column_info[column].alignment = column_info[column].alignment;
-        result->column_info[column].p_width = column_info[column].p_width;
-        result->column_info[column].align_special = column_info[column].align_special;
-    }
-  
-    result->SetLongTabular(is_long_tabular);
-    result->rotate = rotate;
-    result->Reinit();
-    return result;
+bool getTokenValue(string const & str, const char * 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);
 }
 
 
-/* activates all lines and sets all widths to 0 */ 
-void LyXTabular::Init(Buffer * buf, int rows_arg, int columns_arg)
+void l_getline(istream & is, string & str)
 {
-    int i, j;
-    int cellno = 0;
+       str.erase();
+       while (str.empty()) {
+               getline(is, str);
+               if (!str.empty() && str[str.length() - 1] == '\r')
+                       str.erase(str.length() - 1);
+       }
+}
 
-    rows_ = rows_arg;
-    columns_ = columns_arg;
-    row_info = vector<rowstruct>(rows_, rowstruct());
-    column_info = vector<columnstruct>(columns_, columnstruct());
-    cell_info = vector<vector<cellstruct> >
-           (rows_, vector<cellstruct>(columns_, cellstruct()));
+} // namespace
 
-    for (i = 0; i < rows_; ++i) {
-        for (j = 0; j < columns_; ++j) {
-            cell_info[i][j].inset = new InsetText(buf);
-            cell_info[i][j].cellno = cellno++;
-        }
-    }
-    row_info[i-1].bottom_line = true;
-    row_info[0].bottom_line = true;
-
-    for (i = 0; i < columns_; ++i) {
-        calculate_width_of_column(i);
-    }
-    column_info[columns_-1].right_line = true;
-   
-    calculate_width_of_tabular();
-
-    rowofcell = 0;
-    columnofcell = 0;
-    set_row_column_number_info();
-    is_long_tabular = false;
-    rotate = 0;
-    endhead = -1;
-    endfirsthead = -1;
-    endfoot = -1;
-    endlastfoot = -1;
-}
-
-
-void LyXTabular::AppendRow(int /* cell */)
+/// Define a few methods for the inner structs
+
+LyXTabular::cellstruct::cellstruct(BufferParams const & bg)
+       : inset(bg)
 {
-#if 0
-    int row = row_of_cell(cell);
-    rowstruct * row_info2 = new rowstruct[rows_ + 1];
-    cellstruct ** cell_info2 = new cellstruct * [rows_ + 1];
-    int i;
-
-    for (i = 0; i <= row; ++i) {
-        cell_info2[i] = cell_info[i];
-        row_info2[i] = row_info[i];
-    }
-    for (i = rows_ - 1; i >= row; --i) {
-        cell_info2[i + 1] = cell_info[i];
-        row_info2[i + 1] = row_info[i];
-    }
-    row_info2[row + 1].top_line = row_info[i].top_line;
-    cell_info2[row + 1] = new cellstruct[columns_](buffer);
-    for (i = 0; i < columns_; ++i) {
-        cell_info2[row + 1][i].width_of_cell = 0;
-        cell_info2[row + 1][i] = cell_info2[row][i];
-    }
-   
-    delete[] cell_info;
-    cell_info = cell_info2;
-    delete[] row_info;
-    row_info = row_info2;
-   
-    ++rows_;
-   
-    Reinit();
-#endif
+       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;
 }
 
 
-void LyXTabular::DeleteRow(int /*cell*/)
+LyXTabular::rowstruct::rowstruct()
 {
-#if 0
-    int row = row_of_cell(cell);
-    rowstruct * row_info2 = new rowstruct[rows_ - 1];
-    cellstruct ** cell_info2 = new cellstruct * [rows_ - 1];
-
-    delete[] cell_info[row];
-    int i = 0;
-    for (; i < row; ++i) {
-       cell_info2[i] = cell_info[i];
-       row_info2[i] = row_info[i];
-    }
-    for (i = row; i < rows_ - 1; ++i) {
-       cell_info2[i] = cell_info[i + 1];
-       row_info2[i] = row_info[i + 1];
-    }
-
-    delete[] cell_info;
-    cell_info = cell_info2;
-    delete[] row_info;
-    row_info = row_info2;
-   
-    --rows_;
-
-    Reinit();
-#endif
+       top_line = true;
+       bottom_line = false;
+       ascent_of_row = 0;
+       descent_of_row = 0;
+       endhead = false;
+       endfirsthead = false;
+       endfoot = false;
+       endlastfoot = false;
+       newpage = false;
 }
 
 
-void LyXTabular::AppendColumn(int /*cell*/)
+LyXTabular::columnstruct::columnstruct()
 {
-#if 0
-    int j;
-    columnstruct * column_info2 = new columnstruct[columns_ + 1];
-    int column = right_column_of_cell(cell);
-
-    int i = 0;
-    for (; i <= column; ++i) {
-        column_info2[i] = column_info[i];
-    }
-    for (i = columns_ - 1; i >= column; --i) {
-        column_info2[i + 1] = column_info[i];
-    }
-    
-    delete[] column_info;
-    column_info = column_info2;
-    
-    for (i = 0; i < rows_; ++i) {
-        cellstruct * tmp = cell_info[i];
-        cell_info[i] = new cellstruct[columns_ + 1](buffer);
-        for (j = 0; j <= column; ++j) {
-            cell_info[i][j] = tmp[j];
-        }
-        for (j = column; j < columns_; ++j) {
-            cell_info[i][j + 1] = tmp[j];
-        }
-        // care about multicolumns
-        if (cell_info[i][column + 1].multicolumn
-            == LyXTabular::CELL_BEGIN_OF_MULTICOLUMN){
-            cell_info[i][column + 1].multicolumn = 
-                LyXTabular::CELL_PART_OF_MULTICOLUMN;
-        }
-        if (column + 1 == columns_
-            || cell_info[i][column + 2].multicolumn
-            != LyXTabular::CELL_PART_OF_MULTICOLUMN){
-            cell_info[i][column + 1].multicolumn = 
-                LyXTabular::CELL_NORMAL;
-        }
-        delete[] tmp;
-    }
-    
-    ++columns_;
-    Reinit();
-#endif
+       left_line = true;
+       right_line = false;
+       alignment = LYX_ALIGN_CENTER;
+       valignment = LYX_VALIGN_TOP;
+       width_of_column = 0;
 }
 
 
-void LyXTabular::DeleteColumn(int /*cell*/)
+LyXTabular::ltType::ltType()
 {
-#if 0
-    int column1 = column_of_cell(cell);
-    int column2 = right_column_of_cell(cell);
-    
-    if (column1 == 0 && column2 == columns_ - 1)
-       return;
-    
-    for (int column = column1; column <= column2; ++column) {
-       delete_column(column1);
-    }
-    Reinit();
-#endif
+       topDL = false;
+       bottomDL = false;
+       empty = false;
 }
 
 
-void LyXTabular::delete_column(int /*column*/)
+LyXTabular::LyXTabular(BufferParams const & bp,
+                      InsetTabular * inset, int rows_arg, int columns_arg)
 {
-#if 0
-    int i, j;
-    columnstruct * column_info2 = new columnstruct[columns_-1];
-   
-    for (i = 0; i < column; ++i) {
-        column_info2[i] = column_info[i];
-    }
-    for (i = column; i < columns_ - 1; ++i) {
-        column_info2[i] = column_info[i + 1];
-    }
-   
-    delete[] column_info;
-    column_info = column_info2;
-
-    for (i = 0; i < rows_; ++i) {
-        cellstruct * tmp = cell_info[i];
-        cell_info[i] = new cellstruct[columns_ - 1](buffer);
-        for (j = 0; j < column; ++j) {
-            cell_info[i][j] = tmp[j];
-        }
-        for (j = column; j < columns_ - 1; ++j) {
-            cell_info[i][j] = tmp[j + 1];
-        }
-        delete[] tmp;
-    }
-
-    --columns_;
-    Reinit();
-#endif
+       owner_ = inset;
+       cur_cell = -1;
+       init(bp, rows_arg, columns_arg);
 }
 
 
-void LyXTabular::Reinit()
-{   
-    int j;
+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)
+{
+       rows_ = rows_arg;
+       columns_ = columns_arg;
+       row_info = row_vector(rows_, rowstruct());
+       column_info = column_vector(columns_, columnstruct());
+       cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp)));
+
+       if (lt) {
+               operator=(*lt);
+               return;
+       }
 
-    int i = 0;
-    for (; i < rows_; ++i) {
-       for (j = 0; j < columns_; ++j) {
-           cell_info[i][j].width_of_cell = 0;
+       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(InsetText::LOCKED);
+                       cell_info[i][j].cellno = cellno++;
+               }
+               cell_info[i].back().right_line = true;
        }
-    }
-  
-    for (i = 0; i < columns_; ++i) {
-       calculate_width_of_column(i);
-    }
-    calculate_width_of_tabular();
+       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;
 
-    set_row_column_number_info();
+       calculate_width_of_tabular();
+
+       rowofcell.clear();
+       columnofcell.clear();
+       set_row_column_number_info();
+       is_long_tabular = false;
+       rotate = false;
 }
 
 
-void LyXTabular::set_row_column_number_info()
+void LyXTabular::appendRow(BufferParams const & bp, int cell)
 {
-    int c = 0;
-    int column = 0;
-    numberofcells = -1;
-    int row = 0;
-    for (; row < rows_; ++row) {
-       for (column = 0; column<columns_; ++column) {
-           if (cell_info[row][column].multicolumn
-               != LyXTabular::CELL_PART_OF_MULTICOLUMN)
-               ++numberofcells;
-           cell_info[row][column].cellno = numberofcells;
+       ++rows_;
+
+       int 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)));
+
+       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);
        }
-    }
-    ++numberofcells; // because this is one more than as we start from 0
-    row = 0;
-    column = 0;
+#endif
+       Reinit();
+}
+
+
+void LyXTabular::deleteRow(int row)
+{
+       // Not allowed to delete last row
+       if (rows_ == 1)
+               return;
+
+       row_info.erase(row_info.begin() + row);
+       cell_info.erase(cell_info.begin() + row);
+       --rows_;
+       Reinit();
+}
+
+
+void LyXTabular::appendColumn(BufferParams const & bp, int cell)
+{
+       ++columns_;
+
+       cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
+                                                             cellstruct(bp)));
+       int 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];
 
-    delete [] rowofcell;
-    rowofcell = new int[numberofcells];
-    delete [] columnofcell;
-    columnofcell = new int[numberofcells];
-  
-    while (c < numberofcells && row < rows_ && column < columns_) {
-       rowofcell[c] = row;
-       columnofcell[c] = column;
-       ++c;
-       do {
-           ++column;
-       } while (column < columns_ &&
-                cell_info[row][column].multicolumn
-                == LyXTabular::CELL_PART_OF_MULTICOLUMN);
-       if (column == columns_) {
-           column = 0;
-           ++row;
+       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];
+
+               // 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;
+       }
+       cell_info = c_info;
+       //++column;
+       for (int 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);
        }
-    }
+       Reinit();
 }
 
-int LyXTabular::GetNumberOfCells() const
+
+void LyXTabular::deleteColumn(int column)
 {
-    return numberofcells;
+       // Not allowed to delete last column
+       if (columns_ == 1)
+               return;
+
+       column_info.erase(column_info.begin() + column);
+       for (int i = 0; i < rows_; ++i)
+               cell_info[i].erase(cell_info[i].begin() + column);
+       --columns_;
+       Reinit();
 }
 
 
-int LyXTabular::NumberOfCellsInRow(int cell) const
+void LyXTabular::reinit()
 {
-    int row = row_of_cell(cell);
-    int result = 0;
-    for (int i = 0; i < columns_; ++i) {
-       if (cell_info[row][i].multicolumn != LyXTabular::CELL_PART_OF_MULTICOLUMN)
-           ++result;
-    }
-    return result;
+       Reinit(false);
 }
 
 
-int LyXTabular::AppendCellAfterCell(int append_cell, int question_cell)
+void LyXTabular::Reinit(bool reset_widths)
 {
-    return (right_column_of_cell(append_cell) ==
-           right_column_of_cell(question_cell));
+       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();
 }
 
 
-int LyXTabular::DeleteCellIfColumnIsDeleted(int cell, int delete_column_cell)
+void LyXTabular::set_row_column_number_info(bool oldformat)
 {
-    if (column_of_cell(delete_column_cell) == 0 && 
-        right_column_of_cell(delete_column_cell) == columns_ - 1)
-        return 0;
-    else
-        return
-            (column_of_cell(cell) >= column_of_cell(delete_column_cell) &&
-             column_of_cell(cell) <= right_column_of_cell(delete_column_cell));
+       numberofcells = -1;
+       for (int row = 0; row < rows_; ++row) {
+               for (int column = 0; column < columns_; ++column) {
+                       if (cell_info[row][column].multicolumn
+                               != LyXTabular::CELL_PART_OF_MULTICOLUMN)
+                               ++numberofcells;
+                       cell_info[row][column].cellno = numberofcells;
+               }
+       }
+       ++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;
+                c < numberofcells && row < rows_ && column < columns_;) {
+               rowofcell[c] = row;
+               columnofcell[c] = column;
+               ++c;
+               do {
+                       ++column;
+               } 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) {
+                       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(
+                               !getPWidth(getCellNumber(row, column)).zero());
+               }
+       }
 }
 
 
-/* returns 1 if there is a topline, returns 0 if not */ 
-bool LyXTabular::TopLine(int cell) const
+int LyXTabular::getNumberOfCells() const
 {
-    int row = row_of_cell(cell);
-    
-    if (IsMultiColumn(cell))
-        return cellinfo_of_cell(cell)->top_line;
-    return row_info[row].top_line;
+       return numberofcells;
 }
 
 
-bool LyXTabular::BottomLine(int cell) const
+int LyXTabular::numberOfCellsInRow(int cell) const
 {
-    //no bottom line underneath non-existent cells if you please
-    if(cell >= numberofcells)
-       return false;
+       int const row = row_of_cell(cell);
+       int result = 0;
+       for (int i = 0; i < columns_; ++i)
+               if (cell_info[row][i].multicolumn != LyXTabular::CELL_PART_OF_MULTICOLUMN)
+                       ++result;
+       return result;
+}
+
 
-    if (IsMultiColumn(cell))
-        return cellinfo_of_cell(cell)->bottom_line;
-    return row_info[row_of_cell(cell)].bottom_line;
+// returns 1 if there is a topline, returns 0 if not
+bool LyXTabular::topLine(int cell, bool onlycolumn) const
+{
+       if (!onlycolumn && isMultiColumn(cell))
+               return cellinfo_of_cell(cell).top_line;
+       return row_info[row_of_cell(cell)].top_line;
 }
 
 
-bool LyXTabular::LeftLine(int cell) const
+bool LyXTabular::bottomLine(int cell, bool onlycolumn) const
 {
-    return column_info[column_of_cell(cell)].left_line;
+       if (!onlycolumn && isMultiColumn(cell))
+               return cellinfo_of_cell(cell).bottom_line;
+       return row_info[row_of_cell(cell)].bottom_line;
 }
 
 
-bool LyXTabular::RightLine(int cell) const
+bool LyXTabular::leftLine(int cell, bool onlycolumn) const
 {
-    return column_info[right_column_of_cell(cell)].right_line;
+       if (!onlycolumn && isMultiColumn(cell) &&
+               (isFirstCellInRow(cell) || isMultiColumn(cell-1)))
+       {
+               if (cellinfo_of_cell(cell).align_special.empty())
+                       return cellinfo_of_cell(cell).left_line;
+               return prefixIs(ltrim(cellinfo_of_cell(cell).align_special), "|");
+       }
+       if (column_info[column_of_cell(cell)].align_special.empty())
+               return column_info[column_of_cell(cell)].left_line;
+       return prefixIs(ltrim(column_info[column_of_cell(cell)].align_special), "|");
 }
 
 
-bool LyXTabular::TopAlreadyDrawed(int cell) const
+bool LyXTabular::rightLine(int cell, bool onlycolumn) const
 {
-    if (GetAdditionalHeight(cell))
-       return false;
-    int row = row_of_cell(cell);
-    if (row > 0) {
-       int column = column_of_cell(cell);
-       --row;
-       while (column
-              && cell_info[row][column].multicolumn
-              == LyXTabular::CELL_PART_OF_MULTICOLUMN)
-           --column;
-       if (cell_info[row][column].multicolumn == LyXTabular::CELL_NORMAL)
-           return row_info[row].bottom_line;
-       else
-           return cell_info[row][column].bottom_line;
-    }
-    return false;
+       if (!onlycolumn && isMultiColumn(cell) &&
+               (isLastCellInRow(cell) || isMultiColumn(cell+1)))
+       {
+               if (cellinfo_of_cell(cell).align_special.empty())
+                       return cellinfo_of_cell(cell).right_line;
+               return suffixIs(rtrim(cellinfo_of_cell(cell).align_special), "|");
+       }
+       if (column_info[column_of_cell(cell)].align_special.empty())
+               return column_info[right_column_of_cell(cell)].right_line;
+       return suffixIs(rtrim(column_info[column_of_cell(cell)].align_special), "|");
 }
 
 
-bool LyXTabular::LeftAlreadyDrawed(int cell) const
+bool LyXTabular::topAlreadyDrawn(int cell) const
 {
-    int column = column_of_cell(cell);
-    if (column > 0) {
        int row = row_of_cell(cell);
-       while (--column &&
-              (cell_info[row][column].multicolumn ==
-               LyXTabular::CELL_PART_OF_MULTICOLUMN));
-       if (GetAdditionalWidth(cell_info[row][column].cellno))
-           return false;
-       return column_info[column].right_line;
-    }
-    return false;
+       if (row > 0 && !getAdditionalHeight(row)) {
+               int column = column_of_cell(cell);
+               --row;
+               while (column
+                          && cell_info[row][column].multicolumn
+                          == LyXTabular::CELL_PART_OF_MULTICOLUMN)
+                       --column;
+               if (cell_info[row][column].multicolumn == LyXTabular::CELL_NORMAL)
+                       return row_info[row].bottom_line;
+               else
+                       return cell_info[row][column].bottom_line;
+       }
+       return false;
 }
 
 
-bool LyXTabular::IsLastRow(int cell) const
+bool LyXTabular::leftAlreadyDrawn(int cell) const
 {
-    return (row_of_cell(cell) == rows_ - 1);
+       int column = column_of_cell(cell);
+       if (column > 0) {
+               int row = row_of_cell(cell);
+               while (--column &&
+                          (cell_info[row][column].multicolumn ==
+                               LyXTabular::CELL_PART_OF_MULTICOLUMN));
+               if (getAdditionalWidth(cell_info[row][column].cellno))
+                       return false;
+               return rightLine(cell_info[row][column].cellno);
+       }
+       return false;
 }
 
 
-int LyXTabular::GetAdditionalHeight(int cell) const
+bool LyXTabular::isLastRow(int cell) const
 {
-    int row = row_of_cell(cell);
-    if (!row) return 0;
-       
-    int top = 1; // bool top = true; ??
-    int bottom = 1; // bool bottom = true; ??
-    int column;
+       return (row_of_cell(cell) == rows_ - 1);
+}
+
+
+int LyXTabular::getAdditionalHeight(int row) const
+{
+       if (!row || row >= rows_)
+               return 0;
 
-    for (column = 0; column < columns_ - 1 && bottom; ++column) {
-       switch (cell_info[row - 1][column].multicolumn) {
-       case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
-           bottom = cell_info[row - 1][column].bottom_line;
-           break;
-       case LyXTabular::CELL_NORMAL:
-           bottom = row_info[row - 1].bottom_line;
+       bool top = true;
+       bool bottom = true;
+
+       for (int 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;
+                       break;
+               case LyXTabular::CELL_NORMAL:
+                       bottom = row_info[row - 1].bottom_line;
+               }
        }
-    }
-    for (column = 0; column < columns_ - 1 && top; ++column) {
-       switch (cell_info[row][column].multicolumn){
-       case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
-           top = cell_info[row][column].top_line;
-           break;
-       case LyXTabular::CELL_NORMAL:
-           top = row_info[row].top_line;
+       for (int 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;
+                       break;
+               case LyXTabular::CELL_NORMAL:
+                       top = row_info[row].top_line;
+               }
        }
-    }
-    if (top && bottom)
-       return WIDTH_OF_LINE;
-    return 0;
+       if (top && bottom)
+               return WIDTH_OF_LINE;
+       return 0;
 }
 
 
-int LyXTabular::GetAdditionalWidth(int cell) const
+int LyXTabular::getAdditionalWidth(int cell) const
 {
-    // internally already set in SetWidthOfCell
-    // used to get it back in text.C
-    int col = right_column_of_cell(cell);
-    if (col < columns_ - 1 && column_info[col].right_line &&
-       column_info[col+1].left_line)
-       return WIDTH_OF_LINE;
-    else
+       // 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);
+       if (col < columns_ - 1 && rightLine(cell) &&
+               leftLine(cell_info[row][col+1].cellno)) // column_info[col+1].left_line)
+       {
+               return WIDTH_OF_LINE;
+       }
        return 0;
 }
 
 
-// returns the maximum over all rows 
-int LyXTabular::GetWidthOfColumn(int cell) const
+// returns the maximum over all rows
+int LyXTabular::getWidthOfColumn(int cell) const
 {
-    int column1 = column_of_cell(cell);
-    int column2 = right_column_of_cell(cell);
-    int result = 0;
-    int i = column1;
-    for (; i <= column2; ++i) {
-       result += column_info[i].width_of_column;
-    }
-    return result;
+       int const column1 = column_of_cell(cell);
+       int const column2 = right_column_of_cell(cell);
+       int result = 0;
+       for (int i = column1; i <= column2; ++i)
+               result += column_info[i].width_of_column;
+       return result;
 }
 
 
-int LyXTabular::GetWidthOfTabular() const
+int LyXTabular::getWidthOfTabular() const
 {
-    return width_of_tabular;
-}
+       return width_of_tabular;
+}
+
 
-/* returns 1 if a complete update is necessary, otherwise 0 */ 
-bool LyXTabular::SetWidthOfMulticolCell(int cell, int new_width)
+// returns true if a complete update is necessary, otherwise false
+bool LyXTabular::setWidthOfMulticolCell(int cell, int new_width)
 {
-    if (!IsMultiColumn(cell))
-        return false;
-    
-    int row = row_of_cell(cell);
-    int column1 = column_of_cell(cell);
-    int column2 = right_column_of_cell(cell);
+       if (!isMultiColumn(cell))
+               return false;
 
-    // first set columns to 0 so we can calculate the right width
-    int i = column1;
-    for (; 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);
-    for (i = column1; (i < column2) && (width > 0); ++i) {
-        cell_info[row][i].width_of_cell = column_info[i].width_of_column;
-        width -= column_info[i].width_of_column;
-    }
-    if (i == column2) {
-        cell_info[row][i].width_of_cell = width;
-    }
-    return true;
+       int const row = row_of_cell(cell);
+       int const column1 = column_of_cell(cell);
+       int 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) {
+               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;
+       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;
+       }
+       if (width > 0) {
+               cell_info[row][i].width_of_cell = width;
+       }
+       if (old_val != cell_info[row][column2].width_of_cell) {
+               // in this case we have to recalculate all multicolumn cells which
+               // have this column as one of theirs but not as last one
+               calculate_width_of_column_NMC(i);
+               recalculateMulticolumnsOfColumn(i);
+               calculate_width_of_column(i);
+       }
+       return true;
 }
 
 
-void LyXTabular::recalculateMulticolCells(int cell, int new_width)
+void LyXTabular::recalculateMulticolumnsOfColumn(int column)
 {
-    int row = row_of_cell(cell);
-    int column1 = column_of_cell(cell);
-    int column2 = right_column_of_cell(cell);
-
-    // first set columns to 0 so we can calculate the right width
-    int i = column1;
-    for (; i <= column2; ++i)
-        cell_info[row][i].width_of_cell = 0;
-    for(i = cell + 1; (i < numberofcells) && (!IsMultiColumn(i)); ++i)
-        ;
-    if (i < numberofcells)
-        recalculateMulticolCells(i, GetWidthOfCell(i) - (2 * WIDTH_OF_LINE));
-    SetWidthOfMulticolCell(cell, new_width);
+       // 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) {
+               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
+               // column as their last column!
+               if (mc == CELL_BEGIN_OF_MULTICOLUMN ||
+                         (mc == CELL_PART_OF_MULTICOLUMN &&
+                          nmc == CELL_PART_OF_MULTICOLUMN))
+               {
+                       int const cellno = cell_info[row][column].cellno;
+                       setWidthOfMulticolCell(cellno,
+                                              getWidthOfCell(cellno) - 2 * WIDTH_OF_LINE);
+               }
+       }
 }
 
 
-/* returns 1 if a complete update is necessary, otherwise 0 */ 
-bool LyXTabular::SetWidthOfCell(int cell, int new_width)
+// returns 1 if a complete update is necessary, otherwise 0
+void LyXTabular::setWidthOfCell(int cell, int new_width)
 {
-    int row = row_of_cell(cell);
-    int column1 = column_of_cell(cell);
-    int tmp = 0;
-    int width = 0;
+       int const row = row_of_cell(cell);
+       int const column1 = column_of_cell(cell);
+       bool tmp = false;
+       int width = 0;
+       int add_width = 0;
+
+       if (rightLine(cell_info[row][column1].cellno, true) &&
+               column1 < columns_ - 1 &&
+               leftLine(cell_info[row][column1+1].cellno, true))
+       {
+               add_width = WIDTH_OF_LINE;
+       }
+
+       if (getWidthOfCell(cell) == new_width + 2 * WIDTH_OF_LINE + add_width)
+               return;
+
+       if (isMultiColumn(cell, true)) {
+               tmp = setWidthOfMulticolCell(cell, new_width);
+       } else {
+               width = new_width + 2 * WIDTH_OF_LINE + add_width;
+               cell_info[row][column1].width_of_cell = width;
+               tmp = calculate_width_of_column_NMC(column1);
+               if (tmp)
+                       recalculateMulticolumnsOfColumn(column1);
+       }
+       if (tmp) {
+               for (int i = 0; i < columns_; ++i)
+                       calculate_width_of_column(i);
+               calculate_width_of_tabular();
+       }
+}
+
 
-    if (IsMultiColumn(cell)) {
-        tmp = SetWidthOfMulticolCell(cell, new_width);
-    } else {
-       width = (new_width + 2*WIDTH_OF_LINE);
-        cell_info[row][column1].width_of_cell = width;
-        if (column_info[column1].right_line && (column1 < columns_-1) &&
-            column_info[column1+1].left_line) // additional width
-            cell_info[row][column1].width_of_cell += WIDTH_OF_LINE;
-        tmp = calculate_width_of_column_NMC(column1);
-    }
-    if (tmp) {
-        int i;
-        for(i = 0; i<columns_;++i)
-            calculate_width_of_column_NMC(i);
-        for(i = 0; (i<numberofcells) && !IsMultiColumn(i); ++i)
-            ;
-        if (i<numberofcells)
-            recalculateMulticolCells(i, GetWidthOfCell(i)-(2*WIDTH_OF_LINE));
-        for(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)
+{
+       if (!isMultiColumn(cell) || onlycolumn)
+               column_info[column_of_cell(cell)].alignment = align;
+       if (!onlycolumn)
+               cellinfo_of_cell(cell).alignment = align;
 }
 
 
-bool LyXTabular::SetAlignment(int cell, char align)
+void LyXTabular::setVAlignment(int cell, VAlignment align, bool onlycolumn)
 {
-    if (!IsMultiColumn(cell))
-        column_info[column_of_cell(cell)].alignment = align;
-    cellinfo_of_cell(cell)->alignment = align;
-    return true;
+       if (!isMultiColumn(cell) || onlycolumn)
+               column_info[column_of_cell(cell)].valignment = align;
+       if (!onlycolumn)
+               cellinfo_of_cell(cell).valignment = align;
 }
 
-bool LyXTabular::SetPWidth(int cell, string width)
+
+void LyXTabular::setColumnPWidth(int cell, LyXLength const & width)
 {
-    if (IsMultiColumn(cell)) {
-        cellinfo_of_cell(cell)->p_width = width;
-    } else {
-        column_info[column_of_cell(cell)].p_width = width;
-       if (!width.empty()) // do this only if there is a width
-               SetAlignment(cell, LYX_ALIGN_LEFT);
-    }
-    return true;
+       int 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);
+               // because of multicolumns
+               getCellInset(cell).setAutoBreakRows(!getPWidth(cell).zero());
+       }
 }
 
-bool LyXTabular::SetAlignSpecial(int cell, string special, int what)
+
+bool LyXTabular::setMColumnPWidth(int cell, LyXLength const & width)
 {
-    if (what == SET_SPECIAL_MULTI)
-        cellinfo_of_cell(cell)->align_special = special;
-    else
-        column_info[column_of_cell(cell)].align_special = special;
-    return true;
+       bool const flag = !width.zero();
+
+       cellinfo_of_cell(cell).p_width = width;
+       if (isMultiColumn(cell)) {
+               getCellInset(cell).setAutoBreakRows(flag);
+               return true;
+       }
+       return false;
 }
 
-bool LyXTabular::SetAllLines(int cell, bool line)
+
+void LyXTabular::setAlignSpecial(int cell, string const & special,
+                                LyXTabular::Feature what)
 {
-    SetTopLine(cell, line);
-    SetBottomLine(cell, line);
-    SetRightLine(cell, line);
-    SetLeftLine(cell, line);
-    return true;
+       if (what == SET_SPECIAL_MULTI)
+               cellinfo_of_cell(cell).align_special = special;
+       else
+               column_info[column_of_cell(cell)].align_special = special;
 }
 
-bool LyXTabular::SetTopLine(int cell, bool line)
+
+void LyXTabular::setAllLines(int cell, bool line)
 {
-    int row = row_of_cell(cell);
+       setTopLine(cell, line);
+       setBottomLine(cell, line);
+       setRightLine(cell, line);
+       setLeftLine(cell, line);
+}
+
 
-    if (!IsMultiColumn(cell))
-        row_info[row].top_line = line;
-    else
-        cellinfo_of_cell(cell)->top_line = line;
-    return true;
+void LyXTabular::setTopLine(int cell, bool line, bool onlycolumn)
+{
+       int const row = row_of_cell(cell);
+       if (onlycolumn || !isMultiColumn(cell))
+               row_info[row].top_line = line;
+       else
+               cellinfo_of_cell(cell).top_line = line;
 }
 
 
-bool LyXTabular::SetBottomLine(int cell, bool line)
+void LyXTabular::setBottomLine(int cell, bool line, bool onlycolumn)
 {
-    if (!IsMultiColumn(cell))
-        row_info[row_of_cell(cell)].bottom_line = line;
-    else
-        cellinfo_of_cell(cell)->bottom_line = line;
-    return true;
+       if (onlycolumn || !isMultiColumn(cell))
+               row_info[row_of_cell(cell)].bottom_line = line;
+       else
+               cellinfo_of_cell(cell).bottom_line = line;
 }
 
 
-bool LyXTabular::SetLeftLine(int cell, bool line)
+void LyXTabular::setLeftLine(int cell, bool line, bool onlycolumn)
 {
-    column_info[column_of_cell(cell)].left_line = line;
-    return true;
+       if (onlycolumn || !isMultiColumn(cell))
+               column_info[column_of_cell(cell)].left_line = line;
+       else
+               cellinfo_of_cell(cell).left_line = line;
 }
 
 
-bool LyXTabular::SetRightLine(int cell, bool line)
+void LyXTabular::setRightLine(int cell, bool line, bool onlycolumn)
 {
-    column_info[right_column_of_cell(cell)].right_line = line;
-    return true;
+       if (onlycolumn || !isMultiColumn(cell))
+               column_info[right_column_of_cell(cell)].right_line = line;
+       else
+               cellinfo_of_cell(cell).right_line = line;
 }
 
 
-char LyXTabular::GetAlignment(int cell) const
+LyXAlignment LyXTabular::getAlignment(int cell, bool onlycolumn) const
 {
-    if (IsMultiColumn(cell))
-       return cellinfo_of_cell(cell)->alignment;
-    else
+       if (!onlycolumn && isMultiColumn(cell))
+               return cellinfo_of_cell(cell).alignment;
        return column_info[column_of_cell(cell)].alignment;
 }
 
-string LyXTabular::GetPWidth(int cell) const
+
+LyXTabular::VAlignment
+LyXTabular::getVAlignment(int cell, bool onlycolumn) const
 {
-    if (IsMultiColumn(cell))
-       return cellinfo_of_cell(cell)->p_width;
-    return column_info[column_of_cell(cell)].p_width;
+       if (!onlycolumn && isMultiColumn(cell))
+               return cellinfo_of_cell(cell).valignment;
+       return column_info[column_of_cell(cell)].valignment;
 }
 
-string LyXTabular::GetAlignSpecial(int cell, int what) const
+
+LyXLength const LyXTabular::getPWidth(int cell) const
 {
-    if (what == SET_SPECIAL_MULTI)
-        return cellinfo_of_cell(cell)->align_special;
-    return column_info[column_of_cell(cell)].align_special;
+       if (isMultiColumn(cell))
+               return cellinfo_of_cell(cell).p_width;
+       return column_info[column_of_cell(cell)].p_width;
 }
 
-int LyXTabular::GetWidthOfCell(int cell) const
+
+LyXLength const LyXTabular::getColumnPWidth(int cell) const
 {
-    int row = row_of_cell(cell);
-    int column1 = column_of_cell(cell);
-    int column2 = right_column_of_cell(cell);
-    int result = 0;
-    int i = column1;
-    for (; i <= column2; ++i) {
-       result += cell_info[row][i].width_of_cell;
-    }
-    
-//    result += GetAdditionalWidth(cell);
-    
-    return result;
+       return column_info[column_of_cell(cell)].p_width;
 }
 
 
-int LyXTabular::GetBeginningOfTextInCell(int cell) const
+LyXLength const LyXTabular::getMColumnPWidth(int cell) const
 {
-    int x = 0;
-   
-    switch (GetAlignment(cell)){
-    case LYX_ALIGN_CENTER:
-       x += (GetWidthOfColumn(cell) - GetWidthOfCell(cell)) / 2;
-       break;
-    case LYX_ALIGN_RIGHT:
-       x += GetWidthOfColumn(cell) - GetWidthOfCell(cell);
-       // + GetAdditionalWidth(cell);
-       break;
-    default: /* LYX_ALIGN_LEFT: nothing :-) */ 
-       break;
-    }
-    
-    // the LaTeX Way :-(
-    x += WIDTH_OF_LINE;
-    return x;
+       if (isMultiColumn(cell))
+               return cellinfo_of_cell(cell).p_width;
+       return LyXLength();
 }
 
 
-bool LyXTabular::IsFirstCellInRow(int cell) const
+string const LyXTabular::getAlignSpecial(int cell, int what) const
 {
-    return (column_of_cell(cell) == 0);
+       if (what == SET_SPECIAL_MULTI)
+               return cellinfo_of_cell(cell).align_special;
+       return column_info[column_of_cell(cell)].align_special;
 }
 
-bool LyXTabular::IsLastCellInRow(int cell) const
+
+int LyXTabular::getWidthOfCell(int cell) const
 {
-    return (right_column_of_cell(cell) == (columns_ - 1));
+       int const row = row_of_cell(cell);
+       int const column1 = column_of_cell(cell);
+       int const column2 = right_column_of_cell(cell);
+       int result = 0;
+       for (int i = column1; i <= column2; ++i)
+               result += cell_info[row][i].width_of_cell;
+       return result;
 }
 
 
-bool LyXTabular::calculate_width_of_column(int column)
+int LyXTabular::getBeginningOfTextInCell(int cell) const
 {
-    int old_column_width = column_info[column].width_of_column;
-    int maximum = 0;
-    
-    for (int i = 0; i < rows_; ++i) {
-       maximum = max(cell_info[i][column].width_of_cell, maximum);
-    }
-    column_info[column].width_of_column = maximum;
-    return (column_info[column].width_of_column != old_column_width);
+       int x = 0;
+
+       switch (getAlignment(cell)) {
+       case LYX_ALIGN_CENTER:
+               x += (getWidthOfColumn(cell) - getWidthOfCell(cell)) / 2;
+               break;
+       case LYX_ALIGN_RIGHT:
+               x += getWidthOfColumn(cell) - getWidthOfCell(cell);
+               // + getAdditionalWidth(cell);
+               break;
+       default:
+               // LYX_ALIGN_LEFT: nothing :-)
+               break;
+       }
+
+       // the LaTeX Way :-(
+       x += WIDTH_OF_LINE;
+       return x;
 }
 
-bool LyXTabular::calculate_width_of_column_NMC(int column)
+
+bool LyXTabular::isFirstCellInRow(int cell) const
 {
-    int old_column_width = column_info[column].width_of_column;
-    int max = 0;
-    for (int i = 0; i < rows_; ++i) {
-        if (!IsMultiColumn(GetCellNumber(column, i)) &&
-            (cell_info[i][column].width_of_cell > max)) {
-            max = cell_info[i][column].width_of_cell;
-        }
-    }
-    column_info[column].width_of_column = max;
-    return (column_info[column].width_of_column != old_column_width);
+       return column_of_cell(cell) == 0;
 }
 
-void LyXTabular::calculate_width_of_tabular()
+
+int LyXTabular::getFirstCellInRow(int row) const
 {
-    width_of_tabular = 0;
-    for (int i = 0; i < columns_; ++i) {
-       width_of_tabular += column_info[i].width_of_column;
-    }
+       if (row > rows_ - 1)
+               row = rows_ - 1;
+       return cell_info[row][0].cellno;
 }
 
 
-int LyXTabular::row_of_cell(int cell) const
+bool LyXTabular::isLastCellInRow(int cell) const
 {
-    if (cell >= numberofcells)
-        return rows_-1;
-    else if (cell < 0)
-        return 0;
-    return rowofcell[cell];
+       return right_column_of_cell(cell) == columns_ - 1;
 }
 
 
-int LyXTabular::column_of_cell(int cell) const
+int LyXTabular::getLastCellInRow(int row) const
 {
-    if (cell >= numberofcells)
-        return columns_-1;
-    else if (cell < 0)
-        return 0;
-    return columnofcell[cell];
+       if (row > rows_ - 1)
+               row = rows_ - 1;
+       return cell_info[row][columns_-1].cellno;
 }
 
 
-int LyXTabular::right_column_of_cell(int cell) const
+void LyXTabular::calculate_width_of_column(int column)
 {
-    int row = row_of_cell(cell);
-    int column = column_of_cell(cell);
-    while (column < (columns_ - 1) &&
-          cell_info[row][column+1].multicolumn == LyXTabular::CELL_PART_OF_MULTICOLUMN)
-       ++column;
-    return column;
-}
-
-
-void LyXTabular::Write(ostream & os) const
-{
-    int i, j;
-
-    // header line
-    os << "<LyXTabular version=1 rows=" << rows_ << " columns=" << columns_ <<
-       ">" << endl;
-    // global longtable options
-    os << "<Features rotate=" << rotate <<
-       " islongtable=" << is_long_tabular <<
-       " endhead=" << endhead << " endfirsthead=" << endfirsthead <<
-       " endfoot=" << endfoot << " endlastfoot=" << endlastfoot <<
-       ">" << endl << endl;
-    for (i = 0; i < rows_; ++i) {
-       os << "<Row topline=" << row_info[i].top_line <<
-           " bottomline=" << row_info[i].bottom_line <<
-           " newpage=" << row_info[i].newpage <<
-           ">" << endl;
-       for (j = 0; j < columns_; ++j) {
-           if (!i) {
-               os << "<Column alignment=" << column_info[j].alignment <<
-                   " leftline=" << column_info[j].left_line <<
-                   " rightline=" << column_info[j].right_line <<
-                   " width=\"" << VSpace(column_info[j].p_width).asLyXCommand() <<
-                   "\" special=\"" << column_info[j].align_special <<
-                   "\">" << endl;
-           } else {
-               os << "<Column>" << endl;
-           }
-           os << "<Cell multicolumn=" << cell_info[i][j].multicolumn <<
-               " alignment=" << cell_info[i][j].alignment <<
-               " topline=" << cell_info[i][j].top_line <<
-               " bottomline=" << cell_info[i][j].bottom_line <<
-               " rotate=" << cell_info[i][j].rotate <<
-               " linebreaks=" << cell_info[i][j].linebreaks <<
-               " width=\"" << cell_info[i][j].p_width <<
-               "\" special=\"" << cell_info[i][j].align_special <<
-               "\">" << endl;
-           os << "\\begin_inset ";
-           cell_info[i][j].inset->Write(os);
-           os << "\n\\end_inset " << endl;
-           os << "</Cell>" << endl;
-           os << "</Column>" << endl;
-       }
-       os << "</Row>" << endl;
-    }
-    os << "</LyXTabular>" << endl;
-}
-
-static bool getTokenValue(string const str, const char * token, string & ret)
-{
-    int pos = str.find(token);
-    char ch = str[pos+strlen(token)];
-
-    if ((pos < 0) || (ch != '='))
-       return false;
-    ret.erase();
-    pos += strlen(token)+1;
-    ch = str[pos];
-    if ((ch != '"') && (ch != '\'')) { // only read till next space
-       ret += ch;
-       ch = ' ';
-    }
-    while((pos < int(str.length()-1)) && (str[++pos] != ch))
-       ret += str[pos];
+       int maximum = 0;
+       for (int i = 0; i < rows_; ++i)
+               maximum = max(cell_info[i][column].width_of_cell, maximum);
+       column_info[column].width_of_column = maximum;
+}
+
 
-    return true;
+//
+// Calculate the columns regarding ONLY the normal cells and if this
+// column is inside a multicolumn cell then use it only if its the last
+// 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)
+{
+       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);
+               if ((!ismulti || column == right_column_of_cell(cell)) &&
+                       cell_info[i][column].width_of_cell > max)
+               {
+                       max = cell_info[i][column].width_of_cell;
+               }
+       }
+       column_info[column].width_of_column = max;
+       return column_info[column].width_of_column != old_column_width;
 }
 
-static bool getTokenValue(string const str, const char * token, int & num)
+
+void LyXTabular::calculate_width_of_tabular()
 {
-    string ret;
-    int pos = str.find(token);
-    char ch = str[pos+strlen(token)];
+       width_of_tabular = 0;
+       for (int i = 0; i < columns_; ++i)
+               width_of_tabular += column_info[i].width_of_column;
+}
 
-    if ((pos < 0) || (ch != '='))
-       return false;
-    ret.erase();
-    pos += strlen(token)+1;
-    ch = str[pos];
-    if ((ch != '"') && (ch != '\'')) { // only read till next space
-       if (!isdigit(ch))
-           return false;
-       ret += ch;
-    }
-    ++pos;
-    while((pos < int(str.length()-1)) && isdigit(str[pos]))
-       ret += str[pos++];
 
-    num = strToInt(ret);
-    return true;
+int LyXTabular::row_of_cell(int cell) const
+{
+       if (cell >= numberofcells)
+               return rows_ - 1;
+       if (cell < 0)
+               return 0;
+       return rowofcell[cell];
 }
 
-static bool getTokenValue(string const str, const char * token, bool & flag)
+
+int LyXTabular::column_of_cell(int cell) const
 {
-    string ret;
-    int pos = str.find(token);
-    char ch = str[pos+strlen(token)];
+       if (cell >= numberofcells)
+               return columns_ - 1;
+       if (cell < 0)
+               return 0;
+       return columnofcell[cell];
+}
 
-    if ((pos < 0) || (ch != '='))
-       return false;
-    ret.erase();
-    pos += strlen(token)+1;
-    ch = str[pos];
-    if ((ch != '"') && (ch != '\'')) { // only read till next space
-       if (!isdigit(ch))
-           return false;
-       ret += ch;
-    }
-    ++pos;
-    while((pos < int(str.length()-1)) && isdigit(str[pos]))
-       ret += str[pos++];
-
-    flag = strToInt(ret);
-    return true;
+
+int LyXTabular::right_column_of_cell(int cell) const
+{
+       int const row = row_of_cell(cell);
+       int column = column_of_cell(cell);
+       while (column < columns_ - 1 &&
+                  cell_info[row][column + 1].multicolumn == LyXTabular::CELL_PART_OF_MULTICOLUMN)
+               ++column;
+       return column;
+}
+
+
+void LyXTabular::write(Buffer const & buf, ostream & os) const
+{
+       // header line
+       os << "<lyxtabular"
+          << write_attribute("version", 3)
+          << write_attribute("rows", rows_)
+          << write_attribute("columns", columns_)
+          << ">\n";
+       // global longtable options
+       os << "<features"
+          << write_attribute("rotate", rotate)
+          << write_attribute("islongtable", is_long_tabular)
+          << write_attribute("firstHeadTopDL", endfirsthead.topDL)
+          << write_attribute("firstHeadBottomDL", endfirsthead.bottomDL)
+          << write_attribute("firstHeadEmpty", endfirsthead.empty)
+          << write_attribute("headTopDL", endhead.topDL)
+          << write_attribute("headBottomDL", endhead.bottomDL)
+          << write_attribute("footTopDL", endfoot.topDL)
+          << write_attribute("footBottomDL", endfoot.bottomDL)
+          << write_attribute("lastFootTopDL", endlastfoot.topDL)
+          << write_attribute("lastFootBottomDL", endlastfoot.bottomDL)
+          << write_attribute("lastFootEmpty", endlastfoot.empty)
+          << ">\n";
+       for (int j = 0; j < columns_; ++j) {
+               os << "<column"
+                  << write_attribute("alignment", column_info[j].alignment)
+                  << write_attribute("valignment", column_info[j].valignment)
+                  << write_attribute("leftline", column_info[j].left_line)
+                  << write_attribute("rightline", column_info[j].right_line)
+                  << write_attribute("width", column_info[j].p_width.asString())
+                  << write_attribute("special", column_info[j].align_special)
+                  << ">\n";
+       }
+       for (int i = 0; i < rows_; ++i) {
+               os << "<row"
+                  << write_attribute("topline", row_info[i].top_line)
+                  << write_attribute("bottomline", row_info[i].bottom_line)
+                  << write_attribute("endhead", row_info[i].endhead)
+                  << write_attribute("endfirsthead", row_info[i].endfirsthead)
+                  << write_attribute("endfoot", row_info[i].endfoot)
+                  << write_attribute("endlastfoot", row_info[i].endlastfoot)
+                  << write_attribute("newpage", row_info[i].newpage)
+                  << ">\n";
+               for (int j = 0; j < columns_; ++j) {
+                       os << "<cell"
+                          << write_attribute("multicolumn", cell_info[i][j].multicolumn)
+                          << write_attribute("alignment", cell_info[i][j].alignment)
+                          << write_attribute("valignment", cell_info[i][j].valignment)
+                          << write_attribute("topline", cell_info[i][j].top_line)
+                          << write_attribute("bottomline", cell_info[i][j].bottom_line)
+                          << write_attribute("leftline", cell_info[i][j].left_line)
+                          << write_attribute("rightline", cell_info[i][j].right_line)
+                          << write_attribute("rotate", cell_info[i][j].rotate)
+                          << write_attribute("usebox", cell_info[i][j].usebox)
+                          << write_attribute("width", cell_info[i][j].p_width)
+                          << 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>\n";
+               }
+               os << "</row>\n";
+       }
+       os << "</lyxtabular>\n";
 }
 
-void l_getline(istream & is, string & str)
+
+void LyXTabular::setHeaderFooterRows(int hr, int fhr, int fr, int lfr)
 {
-    getline(is, str);
-    while(str.empty())
-       getline(is, str);
-}
-
-void LyXTabular::Read(LyXLex & lex)
-{
-    string line;
-    istream & is = lex.getStream();
-
-    l_getline(is, line);
-    if (!prefixIs(line, "<LyXTabular ")) {
-       OldFormatRead(is, line);
-       return;
-    }
-
-    int version;
-    int rows_arg;
-    int columns_arg;
-    if (!getTokenValue(line, "version", version))
-       return;
-    if (!getTokenValue(line, "rows", rows_arg))
-       return;
-    if (!getTokenValue(line, "columns", columns_arg))
-       return;
-    Init(buffer, rows_arg, columns_arg);
-    l_getline(is, line);
-    if (!prefixIs(line, "<Features ")) {
-       lyxerr << "Wrong tabular format (expected <Feture ...> got" <<
-           line << ")" << endl;
-       return;
-    }
-    (void)getTokenValue(line, "islongtable", is_long_tabular);
-    (void)getTokenValue(line, "endhead", endhead);
-    (void)getTokenValue(line, "endfirsthead", endfirsthead);
-    (void)getTokenValue(line, "endfoot", endfoot);
-    (void)getTokenValue(line, "endlastfoot", endlastfoot);
-    int i, j;
-    for(i = 0; i < rows_; ++i) {
+       // 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)
+{
+       string line;
+       istream & is = lex.getStream();
+
        l_getline(is, line);
-       if (!prefixIs(line, "<Row ")) {
-           lyxerr << "Wrong tabular format (expected <Row ...> got" <<
-               line << ")" << endl;
-           return;
-       }
-       (void)getTokenValue(line, "topline", row_info[i].top_line);
-       (void)getTokenValue(line, "bottomline", row_info[i].bottom_line);
-       (void)getTokenValue(line, "newpage", row_info[i].newpage);
-       for (j = 0; j < columns_; ++j) {
-           l_getline(is,line);
-           if (!prefixIs(line,"<Column")) {
-               lyxerr << "Wrong tabular format (expected <Column ...> got" <<
-                   line << ")" << endl;
+       if (!prefixIs(line, "<lyxtabular ")
+               && !prefixIs(line, "<LyXTabular ")) {
+               Assert(false);
                return;
-           }
-           if (!i) {
-               (void)getTokenValue(line, "alignment", column_info[j].alignment);
-               (void)getTokenValue(line, "leftline", column_info[j].left_line);
-               (void)getTokenValue(line, "rightline", column_info[j].right_line);
-               (void)getTokenValue(line, "width", column_info[j].p_width);
-               (void)getTokenValue(line, "special", column_info[j].align_special);
-           }
-           l_getline(is, line);
-           if (!prefixIs(line, "<Cell")) {
-               lyxerr << "Wrong tabular format (expected <Cell ...> got" <<
-                   line << ")" << endl;
+       }
+
+       int version;
+       if (!getTokenValue(line, "version", version))
                return;
-           }
-           (void)getTokenValue(line, "multicolumn", cell_info[i][j].multicolumn);
-           (void)getTokenValue(line, "alignment", cell_info[i][j].alignment);
-           (void)getTokenValue(line, "topline", cell_info[i][j].top_line);
-           (void)getTokenValue(line, "bottomline", cell_info[i][j].bottom_line);
-           (void)getTokenValue(line, "rotate", cell_info[i][j].rotate);
-           (void)getTokenValue(line, "linebreaks", cell_info[i][j].linebreaks);
-           (void)getTokenValue(line, "width", cell_info[i][j].p_width);
-           (void)getTokenValue(line, "special", cell_info[i][j].align_special);
-           l_getline(is, line);
-           if (prefixIs(line, "\\begin_inset")) {
-               cell_info[i][j].inset->Read(lex);
-               l_getline(is, line);
-           }
-           if (line != "</Cell>") {
-               lyxerr << "Wrong tabular format (expected </Cell> got" <<
-                   line << ")" << endl;
+       Assert(version >= 2);
+
+       int rows_arg;
+       if (!getTokenValue(line, "rows", rows_arg))
                return;
-           }
-           l_getline(is, line);
-           if (line != "</Column>") {
-               lyxerr << "Wrong tabular format (expected </Column> got" <<
-                   line << ")" << endl;
+       int columns_arg;
+       if (!getTokenValue(line, "columns", columns_arg))
                return;
-           }
-       }
+       init(buf.params, rows_arg, columns_arg);
        l_getline(is, line);
-       if (line != "</Row>") {
-           lyxerr << "Wrong tabular format (expected </Row> got" <<
-               line << ")" << endl;
-           return;
+       if (!prefixIs(line, "<features")) {
+               lyxerr << "Wrong tabular format (expected <features ...> got"
+                      << line << ')' << endl;
+               return;
        }
-    }
-    while (line != "</LyXTabular>") {
-       l_getline(is, line);
-    }
-    set_row_column_number_info();
-}
-
-void LyXTabular::OldFormatRead(istream & is, string fl)
-{
-    int version;
-    int i, j;
-    int rows_arg = 0;
-    int columns_arg = 0;
-    int is_long_tabular_arg = false;
-    int rotate_arg = false;
-    int a = -1;
-    int b = -1;
-    int c = -1;
-    int d = -1;
-    int e = 0;
-    int f = 0;
-    int g = 0;
-    int h = 0;
-       
-    string s;
-    s = fl;
-    if (s.length() > 8)
-       version = atoi(s.c_str() + 8);
-    else
-       version = 1;
-    if (version < 5) {
-       lyxerr << "Tabular format < 5 is not supported anymore\n"
-           "Get an older version of LyX (< 1.1.x) for conversion!"
-              << endl;
-       WriteAlert(_("Warning:"),
-                  _("Tabular format < 5 is not supported anymore\n"),
-                  _("Get an older version of LyX (< 1.1.x) for conversion!"));
-       if (version > 2) {
-           is >> rows_arg >> columns_arg >> is_long_tabular_arg
-              >> rotate_arg >> a >> b >> c >> d;
-       } else
-           is >> rows_arg >> columns_arg;
-       Init(buffer, rows_arg, columns_arg);
-       SetLongTabular(is_long_tabular_arg);
-       SetRotateTabular(rotate_arg);
-       string tmp;
-       for (i = 0; i < rows_; ++i) {
-           getline(is, tmp);
+       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) {
+               l_getline(is,line);
+               if (!prefixIs(line,"<column")) {
+                       lyxerr << "Wrong tabular format (expected <column ...> got"
+                              << line << ')' << endl;
+                       return;
+               }
+               getTokenValue(line, "alignment", column_info[j].alignment);
+               getTokenValue(line, "valignment", column_info[j].valignment);
+               getTokenValue(line, "leftline", column_info[j].left_line);
+               getTokenValue(line, "rightline", column_info[j].right_line);
+               getTokenValue(line, "width", column_info[j].p_width);
+               getTokenValue(line, "special", column_info[j].align_special);
        }
-       for (i = 0; i < columns_; ++i) {
-           getline(is, tmp);
+
+       for (int i = 0; i < rows_; ++i) {
+               l_getline(is, line);
+               if (!prefixIs(line, "<row")) {
+                       lyxerr << "Wrong tabular format (expected <row ...> got"
+                              << line << ')' << endl;
+                       return;
+               }
+               getTokenValue(line, "topline", row_info[i].top_line);
+               getTokenValue(line, "bottomline", row_info[i].bottom_line);
+               getTokenValue(line, "endfirsthead", row_info[i].endfirsthead);
+               getTokenValue(line, "endhead", row_info[i].endhead);
+               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) {
+                       l_getline(is, line);
+                       if (!prefixIs(line, "<cell")) {
+                               lyxerr << "Wrong tabular format (expected <cell ...> got"
+                                      << line << ')' << endl;
+                               return;
+                       }
+                       getTokenValue(line, "multicolumn", cell_info[i][j].multicolumn);
+                       getTokenValue(line, "alignment", cell_info[i][j].alignment);
+                       getTokenValue(line, "valignment", cell_info[i][j].valignment);
+                       getTokenValue(line, "topline", cell_info[i][j].top_line);
+                       getTokenValue(line, "bottomline", cell_info[i][j].bottom_line);
+                       getTokenValue(line, "leftline", cell_info[i][j].left_line);
+                       getTokenValue(line, "rightline", cell_info[i][j].right_line);
+                       getTokenValue(line, "rotate", cell_info[i][j].rotate);
+                       getTokenValue(line, "usebox", cell_info[i][j].usebox);
+                       getTokenValue(line, "width", cell_info[i][j].p_width);
+                       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);
+                               l_getline(is, line);
+                       }
+                       if (!prefixIs(line, "</cell>")) {
+                               lyxerr << "Wrong tabular format (expected </cell> got"
+                                      << line << ')' << endl;
+                               return;
+                       }
+               }
+               l_getline(is, line);
+               if (!prefixIs(line, "</row>")) {
+                       lyxerr << "Wrong tabular format (expected </row> got"
+                              << line << ')' << endl;
+                       return;
+               }
        }
-       for (i = 0; i < rows_; ++i) {
-           for (j = 0; j < columns_; ++j) {
-               getline(is, tmp);
-           }
+       while (!prefixIs(line, "</lyxtabular>")) {
+               l_getline(is, line);
        }
        set_row_column_number_info();
-       return;
-    }
-    is >> rows_arg >> columns_arg >> is_long_tabular_arg
-       >> rotate_arg >> a >> b >> c >> d;
-    Init(buffer, rows_arg, columns_arg);
-    SetLongTabular(is_long_tabular_arg);
-    SetRotateTabular(rotate_arg);
-    endhead = a;
-    endfirsthead = b;
-    endfoot = c;
-    endlastfoot = d;
-    for (i = 0; i < rows_; ++i) {
-       a = b = c = d = e = f = g = h = 0;
-       is >> a >> b >> c >> d;
-       row_info[i].top_line = a;
-       row_info[i].bottom_line = b;
-//     row_info[i].is_cont_row = c;
-       row_info[i].newpage = d;
-    }
-    for (i = 0; i < columns_; ++i) {
-       string s1;
-       string s2;
-       is >> a >> b >> c;
-       char ch; // skip '"'
-       is >> ch;
-       getline(is, s1, '"');
-       is >> ch; // skip '"'
-       getline(is, s2, '"');
-       column_info[i].alignment = static_cast<char>(a);
-       column_info[i].left_line = b;
-       column_info[i].right_line = c;
-       column_info[i].p_width = s1;
-       column_info[i].align_special = s2;
-    }
-    for (i = 0; i < rows_; ++i) {
-       for (j = 0; j < columns_; ++j) {
-           string s1;
-           string s2;
-           is >> a >> b >> c >> d >> e >> f >> g;
-           char ch;
-           is >> ch; // skip '"'
-           getline(is, s1, '"');
-           is >> ch; // skip '"'
-           getline(is, s2, '"');
-           cell_info[i][j].multicolumn = static_cast<char>(a);
-           cell_info[i][j].alignment = static_cast<char>(b);
-           cell_info[i][j].top_line = static_cast<char>(c);
-           cell_info[i][j].bottom_line = static_cast<char>(d);
-//                     cell_info[i][j].has_cont_row = static_cast<bool>(e);
-           cell_info[i][j].rotate = static_cast<bool>(f);
-           cell_info[i][j].linebreaks = static_cast<bool>(g);
-           cell_info[i][j].align_special = s1;
-           cell_info[i][j].p_width = s2;
-       }
-    }
-    set_row_column_number_info();
-}
-
-
-// cell < 0 will tex the preamble
-// returns the number of printed newlines
-int LyXTabular::TexEndOfCell(ostream & os, int cell) const
-{
-    int i;
-    int ret = 0;
-    int tmp; // tmp2;
-    int fcell, nvcell;
-    if (IsLastCell(cell)) {
-        // the very end at the very beginning
-        if (GetLinebreaks(cell))
-               os << "\\smallskip{}}";
-        if (IsMultiColumn(cell))
-               os << '}';
-        if (GetRotateCell(cell)) {
-               os << "\n\\end{sideways}";
-            ++ret;
-        }
-        os << "\\\\\n";
-        ++ret;
-    
-        tmp = 0;
-        fcell = cell; 
-        while (!IsFirstCellInRow(fcell)) --fcell;
-        for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
-            if (BottomLine(fcell + i))
-                ++tmp;
-        }
-        if (tmp == NumberOfCellsInRow(fcell)) {
-               os << "\\hline ";
-        } else {
-            tmp = 0;
-            for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
-                if (BottomLine(fcell + i)) {
-                       os << "\\cline{"
-                          << column_of_cell(fcell + i) + 1
-                          << '-'
-                          << right_column_of_cell(fcell + i) + 1
-                          << "} ";
-                    tmp = 1;
-                }
-            }
-        }
-        if (tmp){
-               os << '\n';
-            ++ret;
-        }
-        if (is_long_tabular)
-               os << "\\end{longtable}";
-        else
-               os << "\\end{tabular}";
-        if (rotate) {
-               os << "\n\\end{sideways}";
-            ++ret;
-        }
-    } else {
-        nvcell = cell + 1;
-        if (cell < 0){
-            // preamble
-            if (rotate) {
-                   os << "\\begin{sideways}\n";
-                ++ret;
-            }
-            if (is_long_tabular)
-                   os << "\\begin{longtable}{";
-            else
-                   os << "\\begin{tabular}{";
-            for (i = 0; i < columns_; ++i) {
-                if (column_info[i].left_line)
-                       os << '|';
-                if (!column_info[i].align_special.empty()) {
-                       os << column_info[i].align_special;
-                } else if (!column_info[i].p_width.empty()) {
-                       os << "p{"
-                          << column_info[i].p_width
-                          << '}';
-                } else {
-                    switch (column_info[i].alignment) {
-                      case LYX_ALIGN_LEFT:
-                             os << 'l';
-                          break;
-                      case LYX_ALIGN_RIGHT:
-                             os << 'r';
-                          break;
-                      default:
-                             os << 'c';
-                          break;
-                    }
-                }
-                if (column_info[i].right_line)
-                       os << '|';
-            }
-            os << "}\n";
-            ++ret;
-            tmp = 0;
-            if (GetNumberOfCells()) {
-                fcell = 0;
-                for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
-                    if (TopLine(fcell + i))
-                        ++tmp;
-                }
-                if (tmp == NumberOfCellsInRow(fcell)){
-                       os << "\\hline ";
-                } else {
-                    tmp = 0;
-                    for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
-                        if (TopLine(fcell + i)) {
-                               os << "\\cline{"
-                                  << column_of_cell(fcell + i) + 1
-                                  << '-'
-                                  << right_column_of_cell(fcell + i) + 1
-                                  << "} ";
-                               tmp = 1;
-                        }
-                    }
-                }
-                if (tmp){
-                       os << '\n';
-                    ++ret;
-                }
-            }
-            if (GetRotateCell(0)) {
-                   os << "\\begin{sideways}\n";
-                ++ret;
-            }
-        } else {
-            // usual cells
-            if (GetLinebreaks(cell))
-                   os << "\\smallskip{}}";
-            if (IsMultiColumn(cell)){
-                   os << '}';
-            }
-            if (GetRotateCell(cell)) {
-                   os << "\n\\end{sideways}";
-                ++ret;
-            }
-            if (IsLastCellInRow(cell)) {
-                int row = row_of_cell(cell);
-                string hline1, hline2;
-                bool print_hline = true;
-                bool flag1 = IsLongTabular() &&
-                    ((row == endhead) || (row == endfirsthead) ||
-                     (row == endfoot) || (row == endlastfoot));
-                ++row;
-                bool flag2 = IsLongTabular() &&
-                    ((row <= endhead) || (row <= endfirsthead) ||
-                     (row <= endfoot) || (row <= endlastfoot));
-                --row;
-                // print the bottom hline only if (otherwise it is doubled):
-                // - is no LongTabular
-                // - there IS a first-header
-                // - the next row is no special header/footer
-                //   & this row is no special header/footer
-                // - the next row is a special header/footer
-                //   & this row is a special header/footer
-                bool pr_top_hline = (flag1 && flag2) || (!flag1 && !flag2) ||
-                    (endfirsthead == endhead);
-                os << "\\\\\n";
-                ++ret;
-                tmp = 0;
-                fcell = cell;
-                while (!IsFirstCellInRow(fcell))
-                    --fcell;
-                for (i = 0; i < NumberOfCellsInRow(cell); ++i) {
-                    if (BottomLine(fcell + i))
-                        ++tmp;
-                }
-                if (tmp == NumberOfCellsInRow(cell)){
-                       os << "\\hline ";
-                    hline1 = "\\hline ";
-                } else {
-                    tmp = 0;
-                    for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
-                        if (BottomLine(fcell + i)){
-                               os << "\\cline{"
-                                  << column_of_cell(fcell + i) + 1
-                                  << '-'
-                                  << right_column_of_cell(fcell + i) + 1
-                                  << "} ";
-                            hline1 += "\\cline{";
-                            hline1 += tostr(column_of_cell(fcell + i) + 1);
-                            hline1 += '-';
-                            hline1 += tostr(right_column_of_cell(fcell + i) + 1);
-                            hline1 += "} ";
-                            tmp = 1;
-                        }
-                    }
-                }
-                if (tmp){
-                       os << '\n';
-                    ++ret;
-                }
-                if (IsLongTabular() && (row == endfoot)) {
-                       os << "\\endfoot\n";
-                    ++ret;
-                    print_hline = false; // no double line below footer
-                }
-                if (IsLongTabular() && (row == endlastfoot)) {
-                       os << "\\endlastfoot\n";
-                    ++ret;
-                    print_hline = false; // no double line below footer
-                }
-                if (IsLongTabular() && row_info[row].newpage) {
-                       os << "\\newpage\n";
-                    ++ret;
-                    print_hline = false; // no line below a \\newpage-command
-                }
-                tmp = 0;
-                if ((nvcell < numberofcells) &&
-                   (cell < GetNumberOfCells() - 1) && !IsLastCell(cell)) {
-                    fcell = nvcell;
-                    for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
-                        if (TopLine(fcell + i))
-                            ++tmp;
-                    }
-                    if (tmp == NumberOfCellsInRow(fcell)) {
-                        if (print_hline)
-                               os << "\\hline ";
-                        hline2 = "\\hline ";
-                    } else {
-                        tmp = 0;
-                        for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
-                            if (TopLine(fcell + i)) {
-                                if (print_hline) {
-                                       os << "\\cline{"
-                                          << column_of_cell(fcell + i) + 1
-                                          << '-'
-                                          << right_column_of_cell(fcell + i) + 1
-                                          << "} ";
-                               }
-                                hline2 += "\\cline{";
-                                hline2 += tostr(column_of_cell(fcell+i)+1);
-                                hline2 += '-';
-                                hline2 += tostr(right_column_of_cell(fcell+i)+1);
-                                hline2 += "} ";
-                                tmp = 1;
-                            }
-                        }
-                    }
-                    if (tmp && print_hline){
-                           os << '\n';
-                        ++ret;
-                    }
-                }
-                // the order here is important as if one defines two
-                // or more things in one line only the first entry is
-                // displayed the other are set to an empty-row. This
-                // is important if I have a footer and want that the
-                // lastfooter is NOT displayed!!!
-                bool sflag2 = (row == endhead) || (row == endfirsthead) ||
-                    (row == endfoot) || (row == endlastfoot);
-                --row;
-                row += 2;
-                bool sflag1 = IsLongTabular() && (row != endhead) &&
-                    (row != endfirsthead) &&
-                    ((row == endfoot) || (row == endlastfoot));
-                --row;
-                if (IsLongTabular() && (row == endhead)) {
-                       os << "\\endhead\n";
-                    ++ret;
-                }
-                if (IsLongTabular() && (row == endfirsthead)) {
-                       os << "\\endfirsthead\n";
-                    ++ret;
-                }
-                if (sflag1) { // add the \hline for next foot row
-                    if (!hline1.empty()) {
-                           os << hline1 + '\n';
-                        ++ret;
-                    }
-                }
-                // add the \hline for the first row
-                if (pr_top_hline && sflag2) {
-                    if (!hline2.empty()) {
-                           os << hline2 + '\n';
-                        ++ret;
-                    }
-                }
-                if (nvcell < numberofcells && GetRotateCell(nvcell)) {
-                       os << "\\begin{sideways}\n";
-                    ++ret;
-                }
-            } else {
-                   os << "&\n";
-                ++ret;
-                if (nvcell < numberofcells && GetRotateCell(nvcell)) {
-                       os << "\\begin{sideways}\n";
-                    ++ret;
-                }
-            }
-        }
-        if (nvcell < numberofcells && IsMultiColumn(nvcell)) {
-               os << "\\multicolumn{"
-                  << cells_in_multicolumn(nvcell)
-                  << "}{";
-            if (!cellinfo_of_cell(cell+1)->align_special.empty()) {
-                   os << cellinfo_of_cell(cell+1)->align_special
-                      << "}{";
-            } else {
-                if (LeftLine(nvcell))
-                       os << '|';
-                if (!GetPWidth(nvcell).empty()) {
-                       os << "p{"
-                          << GetPWidth(nvcell)
-                          << '}';
-                } else {
-                    switch (GetAlignment(nvcell)) {
-                   case LYX_ALIGN_LEFT: os << 'l'; break;
-                   case LYX_ALIGN_RIGHT: os << 'r'; break;
-                   default:  os << 'c'; break;
-                    }
-                }
-                if (RightLine(nvcell))
-                       os << '|';
-                //if (column_of_cell(cell+2)!= 0 && LeftLine(cell+2))
-                if (((nvcell + 1) < numberofcells) &&
-                    ((nvcell+1) < numberofcells) &&
-                    (column_of_cell(nvcell+1)!= 0) &&
-                    LeftLine(nvcell+1))
-                       os << '|';
-               
-               os << "}{";
-            }
-        }
-        if (nvcell < numberofcells && GetLinebreaks(nvcell)) {
-               os << "\\parbox[t]{"
-                  << GetPWidth(nvcell)
-                  << "}{\\smallskip{}";
-       }
-    }
-    return ret;
 }
 
 
-#if 0
-// cell <0 will tex the preamble
-// returns the number of printed newlines
-int LyXTabular::RoffEndOfCell(ostream & os, int cell)
-{
-    int ret = 0;
-
-    if (cell == GetNumberOfCells() - 1){
-        // the very end at the very beginning
-//        if (CellHasContRow(cell) >= 0) {
-//             os << "\nT}";
-//           ++ret;
-//        }
-        os << "\n";
-        ++ret;
-        if (row_info[row_of_cell(cell)].bottom_line) {
-               os << "_\n";
-            ++ret;
-        }
-        os << ".TE\n.pl 1c";
-    } else {  
-        if (cell < 0) {
-            int fcell = 0;
-            // preamble
-            os << "\n.pl 500c\n.TS\n";
-            for (int j = 0; j < rows_; ++j) {
-                for (int i = 0; i < columns_; ++i, ++fcell) {
-                    if (column_info[i].left_line)
-                           os << " | ";
-                    if (cell_info[j][i].multicolumn == CELL_PART_OF_MULTICOLUMN)
-                           os << "s";
-                    else {
-                        switch (column_info[i].alignment) {
-                          case LYX_ALIGN_LEFT:
-                                 os << "l";
-                              break;
-                          case LYX_ALIGN_RIGHT:
-                                 os << "r";
-                              break;
-                          default:
-                                 os << "c";
-                              break;
-                        }
-                    }
-                    if (!column_info[i].p_width.empty())
-                           os << "w(" << column_info[i].p_width << ")";
-                    if (column_info[i].right_line)
-                           os << " | ";
-                }
-                if ((j + 1) < rows_) {
-                       os << "\n";
-                    ++ret;
-                }
-            }
-            os << ".\n";
-            ++ret;
-            if (row_info[0].top_line) {
-                   os << "_\n";
-                ++ret;
-            }
-//            if (CellHasContRow(0) >= 0) {
-//                 os << "T{\n";
-//                ++ret;
-//            }
-        } else {
-            // usual cells
-//            if (CellHasContRow(cell) >= 0) {
-//                 os << "\nT}";
-//                ++ret;
-//            }
-            if (right_column_of_cell(cell) == columns_ -1){
-                   os << "\n";
-                ++ret;
-                int row = row_of_cell(cell);
-                if (row_info[row++].bottom_line) {
-                       os << "_\n";
-                    ++ret;
-                }
-                if ((row < rows_) && row_info[row].top_line) {
-                       os << "_\n";
-                    ++ret;
-                }
-            } else
-                   os << "\t";
-//            if ((cell < GetNumberOfCells() - 1) &&
-//                (CellHasContRow(cell+1) >= 0)) {
-//                 os << "T{\n";
-//                ++ret;
-//            }
-        }
-    }
-    return ret;
+bool LyXTabular::isMultiColumn(int cell, bool real) const
+{
+       return (!real || column_of_cell(cell) != right_column_of_cell(cell)) &&
+                       cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
 }
-#endif
 
 
-char const *LyXTabular::GetDocBookAlign(int cell, bool isColumn) const
-{
-    int i;
-    if (isColumn)
-       i = cell;
-    else
-       i = column_of_cell(cell);
-    if (!isColumn && IsMultiColumn(cell)) {
-       if (!cellinfo_of_cell(cell)->align_special.empty()) {
-           return cellinfo_of_cell(cell)->align_special.c_str();
-       } else {
-           switch (GetAlignment(cell)) {
-           case LYX_ALIGN_LEFT:
-               return "left";
-           case LYX_ALIGN_RIGHT:
-               return "right";
-           default:
-               return "center";
-           }
-       }
-    } else {
-       if (!column_info[i].align_special.empty()) {
-           return column_info[i].align_special.c_str();
-       }
-#ifdef IGNORE_THIS_FOR_NOW
-       else if (!column_info[i].p_width.empty()) {
-           file += "p{";
-           file += column_info[i].p_width;
-           file += '}';
-       }
-#endif
-       else {
-           switch (column_info[i].alignment) {
-           case LYX_ALIGN_LEFT:
-               return "left";
-           case LYX_ALIGN_RIGHT:
-               return "right";
-           default:
-               return "center";
-           }
-       }
-    }
-}
-
-
-// cell <0 will tex the preamble
-// returns the number of printed newlines
-int LyXTabular::DocBookEndOfCell(ostream & os, int cell, int & depth) const
-{
-    int i;
-    int ret = 0;
-    //int tmp; // tmp2; // unused
-    int nvcell; // fcell; // unused
-    if (IsLastCell(cell)) {
-           os << newlineAndDepth(--depth)
-              << "</ENTRY>"
-              << newlineAndDepth(--depth)
-              << "</ROW>"
-              << newlineAndDepth(--depth)
-              << "</TBODY>"
-              << newlineAndDepth(--depth);
-        if (is_long_tabular)
-               os << "</TGROUP>";
-        else
-               os << "</TGROUP>"
-                  << newlineAndDepth(--depth);
-        ret += 4;
-    } else {
-        nvcell = cell + 1;
-        if (cell < 0) {
-            // preamble
-            if (is_long_tabular)
-                   os << "<TGROUP ";
-            else
-                   os << "<TGROUP ";
-            os << "COLS='"
-              << columns_
-              << "' COLSEP='1' ROWSEP='1'>"
-              << newlineAndDepth(++depth);
-            ++ret;
-            for (i = 0; i < columns_; ++i) {
-                   os << "<COLSPEC ALIGN='"
-                      << GetDocBookAlign(i, true)
-                      << "' COLNAME='col"
-                      << i + 1
-                      << "' COLNUM='"
-                      << i + 1
-                      << "' COLSEP='";
-               if (i == (columns_-1)) {
-                      os << '1';
-               } else {
-                   if (column_info[i].right_line ||
-                       column_info[i+1].left_line)
-                          os << '1';
-                   else
-                          os << '0';
-               }
-               os << "'>"
-                 << newlineAndDepth(depth);
-                ++ret;
-#ifdef NOT_HANDLED_YET_AS_I_DONT_KNOW_HOW
-                if (column_info[i].left_line)
-                       os << '|';
-#endif
-            }
-            os << "<TBODY>"
-              << newlineAndDepth(++depth)
-              << "<ROW>"
-              << newlineAndDepth(++depth)
-              << "<ENTRY ALIGN='"
-              << GetDocBookAlign(0)
-              << "'";
-           if (IsMultiColumn(0)) {
-                  os << " NAMEST='col1' NAMEEND='col"
-                     << cells_in_multicolumn(0)
-                     << "'";
-           }
-          os << ">"
-             << newlineAndDepth(++depth);
-            ret += 3;
-        } else {
-            if (IsLastCellInRow(cell)) {
-                   os << newlineAndDepth(--depth)
-                      << "</ENTRY>"
-                      << newlineAndDepth(--depth)
-                      << "</ROW>"
-                      << newlineAndDepth(depth)
-                      << "<ROW>"
-                      << newlineAndDepth(++depth)
-                      << "<ENTRY ALIGN='"
-                      << GetDocBookAlign(cell + 1)
-                      << "' VALIGN='middle'";
-               if (IsMultiColumn(cell + 1)) {
-                      os << " NAMEST='col"
-                         << column_of_cell(cell+1) + 1
-                         << "' NAMEEND='col"
-                         << column_of_cell(cell + 1) +
-                              cells_in_multicolumn(cell + 1)
-                         << "'";
-               }
-               os << ">"
-                 << newlineAndDepth(++depth);
-                ret += 4;
-            } else {
-                   os << newlineAndDepth(--depth)
-                      << "</ENTRY>"
-                      << newlineAndDepth(depth)
-                      << "<ENTRY ALIGN='"
-                      << GetDocBookAlign(cell + 1)
-                      << "' VALIGN='middle'";
-               if (IsMultiColumn(cell + 1)) {
-                      os << " NAMEST='col"
-                         << column_of_cell(cell+1) + 1
-                         << "' NAMEEND='col"
-                         << column_of_cell(cell+1) +
-                              cells_in_multicolumn(cell+1)
-                         << "'";
-               }
-               os << ">"
-                 << newlineAndDepth(++depth);
-                ret += 3;
-            }
-        }
-    }
-    return ret;
-}
-
-
-bool LyXTabular::IsMultiColumn(int cell) const
-{
-    return (cellinfo_of_cell(cell)->multicolumn != LyXTabular::CELL_NORMAL);
-}
-
-
-LyXTabular::cellstruct* LyXTabular::cellinfo_of_cell(int cell) const
-{
-    int row = row_of_cell(cell);
-    int column = column_of_cell(cell);
-    return  &cell_info[row][column];
-}
-   
-
-void LyXTabular::SetMultiColumn(int cell, int number)
-{
-    int new_width = cellinfo_of_cell(cell)->width_of_cell;
-    
-    cellinfo_of_cell(cell)->multicolumn = LyXTabular::CELL_BEGIN_OF_MULTICOLUMN;
-    cellinfo_of_cell(cell)->alignment = column_info[column_of_cell(cell)].alignment;
-    cellinfo_of_cell(cell)->top_line = row_info[row_of_cell(cell)].top_line;
-    cellinfo_of_cell(cell)->bottom_line = row_info[row_of_cell(cell)].bottom_line;
-    for (number--; number > 0; --number) {
-        cellinfo_of_cell(cell+number)->multicolumn = 
-            LyXTabular::CELL_PART_OF_MULTICOLUMN;
-        new_width += cellinfo_of_cell(cell+number)->width_of_cell;
-    }
-    set_row_column_number_info();
-    SetWidthOfCell(cell, new_width);
+LyXTabular::cellstruct & LyXTabular::cellinfo_of_cell(int cell) const
+{
+       return cell_info[row_of_cell(cell)][column_of_cell(cell)];
+}
+
+
+void LyXTabular::setMultiColumn(Buffer * buffer, int cell, int number)
+{
+       cellstruct & cs = cellinfo_of_cell(cell);
+       cs.multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
+       cs.alignment = column_info[column_of_cell(cell)].alignment;
+       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) {
+               cellstruct & cs1 = cellinfo_of_cell(cell + i);
+               cs1.multicolumn = CELL_PART_OF_MULTICOLUMN;
+               cs.inset.appendParagraphs(buffer, cs1.inset.paragraphs);
+               cs1.inset.clear(false);
+       }
+       set_row_column_number_info();
 }
 
 
 int LyXTabular::cells_in_multicolumn(int cell) const
 {
-    int row = row_of_cell(cell);
-    int column = column_of_cell(cell);
-    int result = 1;
-    ++column;
-    while (column < columns_ && cell_info[row][column].multicolumn
-           == LyXTabular::CELL_PART_OF_MULTICOLUMN){
-        ++result;
-        ++column;
-    }
-    return result;
+       int const row = row_of_cell(cell);
+       int column = column_of_cell(cell);
+       int result = 1;
+       ++column;
+       while (column < columns_ &&
+                  cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN)
+       {
+               ++result;
+               ++column;
+       }
+       return result;
 }
 
 
-int  LyXTabular::UnsetMultiColumn(int cell)
+int LyXTabular::unsetMultiColumn(int cell)
 {
-    int row = row_of_cell(cell);
-    int column = column_of_cell(cell);
-    
-    int result = 0;
-    
-    if (cell_info[row][column].multicolumn
-        == LyXTabular::CELL_BEGIN_OF_MULTICOLUMN){
-        cell_info[row][column].multicolumn = LyXTabular::CELL_NORMAL;
-        ++column;
-        while (column < columns_ &&
-               cell_info[row][column].multicolumn
-               == LyXTabular::CELL_PART_OF_MULTICOLUMN){
-            cell_info[row][column].multicolumn = 
-                LyXTabular::CELL_NORMAL;
-            ++column;
-            ++result;
-        }
-    }
-    set_row_column_number_info();
-    return result;
+       int const row = row_of_cell(cell);
+       int column = column_of_cell(cell);
+
+       int result = 0;
+
+       if (cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN) {
+               cell_info[row][column].multicolumn = CELL_NORMAL;
+               ++column;
+               while (column < columns_ &&
+                          cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN)
+               {
+                       cell_info[row][column].multicolumn = CELL_NORMAL;
+                       ++column;
+                       ++result;
+               }
+       }
+       set_row_column_number_info();
+       return result;
 }
 
 
-void LyXTabular::SetLongTabular(int what)
+void LyXTabular::setLongTabular(bool what)
 {
-    is_long_tabular = what;
+       is_long_tabular = what;
 }
 
 
-bool LyXTabular::IsLongTabular() const
+bool LyXTabular::isLongTabular() const
 {
-    return is_long_tabular;
+       return is_long_tabular;
 }
 
-void LyXTabular::SetRotateTabular(int what)
+
+void LyXTabular::setRotateTabular(bool flag)
 {
-    rotate = what;
+       rotate = flag;
 }
 
-bool LyXTabular::GetRotateTabular() const
+
+bool LyXTabular::getRotateTabular() const
 {
-    return rotate;
+       return rotate;
 }
 
-void LyXTabular::SetRotateCell(int cell, int what)
+
+void LyXTabular::setRotateCell(int cell, bool flag)
 {
-    cellinfo_of_cell(cell)->rotate = what;
+       cellinfo_of_cell(cell).rotate = flag;
 }
 
-bool LyXTabular::GetRotateCell(int cell) const
+
+bool LyXTabular::getRotateCell(int cell) const
 {
-    return cellinfo_of_cell(cell)->rotate;
+       return cellinfo_of_cell(cell).rotate;
 }
 
-bool LyXTabular::NeedRotating() const
+
+bool LyXTabular::needRotating() const
 {
-    if (rotate)
-        return true;
-    for (int i = 0; i < rows_; ++i) {
-        for (int j = 0; j < columns_; ++j) {
-            if (cell_info[i][j].rotate)
-                return true;
-        }
-    }
-    return false;
+       if (rotate)
+               return true;
+       for (int i = 0; i < rows_; ++i)
+               for (int j = 0; j < columns_; ++j)
+                       if (cell_info[i][j].rotate)
+                               return true;
+       return false;
 }
 
 
-bool LyXTabular::IsLastCell(int cell) const
+bool LyXTabular::isLastCell(int cell) const
 {
-    if (cell < GetNumberOfCells())
-        return false;
-    return true;
+       if (cell + 1 < numberofcells)
+               return false;
+       return true;
 }
 
-int LyXTabular::GetCellAbove(int cell) const
+
+int LyXTabular::getCellAbove(int cell) const
 {
-    if (row_of_cell(cell) > 0)
-        return cell_info[row_of_cell(cell)-1][column_of_cell(cell)].cellno;
-    return cell;
+       if (row_of_cell(cell) > 0)
+               return cell_info[row_of_cell(cell)-1][column_of_cell(cell)].cellno;
+       return cell;
 }
 
-int LyXTabular::GetCellNumber(int column, int row) const
+
+int LyXTabular::getCellBelow(int cell) const
 {
-    if (column >= columns_)
-        column = columns_ - 1;
-    else if (column < 0)
-        column = 0;
-    if (row >= rows_)
-        row = rows_ - 1;
-    else if (row < 0)
-        row = 0;
-    
-    return cell_info[row][column].cellno;
+       if (row_of_cell(cell) + 1 < rows_)
+               return cell_info[row_of_cell(cell)+1][column_of_cell(cell)].cellno;
+       return cell;
 }
 
-void LyXTabular::SetLinebreaks(int cell, bool what)
+
+int LyXTabular::getLastCellAbove(int cell) const
 {
-    cellinfo_of_cell(cell)->linebreaks = what;
+       if (row_of_cell(cell) <= 0)
+               return cell;
+       if (!isMultiColumn(cell))
+               return getCellAbove(cell);
+       return cell_info[row_of_cell(cell) - 1][right_column_of_cell(cell)].cellno;
 }
 
-bool LyXTabular::GetLinebreaks(int cell) const
+
+int LyXTabular::getLastCellBelow(int cell) const
 {
-    if (column_info[column_of_cell(cell)].p_width.empty() &&
-        !(IsMultiColumn(cell) && !cellinfo_of_cell(cell)->p_width.empty()))
-        return false;
-    return cellinfo_of_cell(cell)->linebreaks;
+       if (row_of_cell(cell) + 1 >= rows_)
+               return cell;
+       if (!isMultiColumn(cell))
+               return getCellBelow(cell);
+       return cell_info[row_of_cell(cell) + 1][right_column_of_cell(cell)].cellno;
 }
 
-void LyXTabular::SetLTHead(int cell, bool first)
+
+int LyXTabular::getCellNumber(int row, int column) const
 {
-    int row = row_of_cell(cell);
+       Assert(column >= 0 || column < columns_ || row >= 0 || row < rows_);
+       return cell_info[row][column].cellno;
+}
+
 
-    if (first) {
-        if (row == endfirsthead)
-            endfirsthead = -1;
-        else
-            endfirsthead = row;
-    } else {
-        if (row == endhead)
-            endhead = -1;
-        else
-            endhead = row;
-    }
+void LyXTabular::setUsebox(int cell, BoxType type)
+{
+       cellinfo_of_cell(cell).usebox = type;
 }
 
-bool LyXTabular::GetRowOfLTHead(int cell) const
+
+LyXTabular::BoxType LyXTabular::getUsebox(int cell) const
 {
-    if ((endhead+1) > rows_)
-        return false;
-    return (row_of_cell(cell) == endhead);
+       if (column_info[column_of_cell(cell)].p_width.zero() &&
+               !(isMultiColumn(cell) && !cellinfo_of_cell(cell).p_width.zero()))
+               return BOX_NONE;
+       if (cellinfo_of_cell(cell).usebox > 1)
+               return cellinfo_of_cell(cell).usebox;
+       return useParbox(cell);
 }
 
-bool LyXTabular::GetRowOfLTFirstHead(int cell) const
+
+///
+//  This are functions used for the longtable support
+///
+void LyXTabular::setLTHead(int row, bool flag, ltType const & hd, bool first)
 {
-    if ((endfirsthead+1) > rows_)
-        return false;
-    return (row_of_cell(cell) == endfirsthead);
+       if (first) {
+               endfirsthead = hd;
+               if (hd.set)
+                       row_info[row].endfirsthead = flag;
+       } else {
+               endhead = hd;
+               if (hd.set)
+                       row_info[row].endhead = flag;
+       }
 }
 
-void LyXTabular::SetLTFoot(int cell, bool last)
+
+bool LyXTabular::getRowOfLTHead(int row, ltType & hd) const
 {
-    int row = row_of_cell(cell);
+       hd = endhead;
+       hd.set = haveLTHead();
+       return row_info[row].endhead;
+}
+
 
-    if (last) {
-        if (row == endlastfoot)
-            endlastfoot = -1;
-        else
-            endlastfoot = row;
-    } else {
-        if (row == endfoot)
-            endfoot = -1;
-        else
-            endfoot = row;
-    }
+bool LyXTabular::getRowOfLTFirstHead(int row, ltType & hd) const
+{
+       hd = endfirsthead;
+       hd.set = haveLTFirstHead();
+       return row_info[row].endfirsthead;
 }
 
-bool LyXTabular::GetRowOfLTFoot(int cell) const
+
+void LyXTabular::setLTFoot(int row, bool flag, ltType const & fd, bool last)
 {
-    if ((endfoot+1) > rows_)
-        return false;
-    return (row_of_cell(cell) == endfoot);
+       if (last) {
+               endlastfoot = fd;
+               if (fd.set)
+                       row_info[row].endlastfoot = flag;
+       } else {
+               endfoot = fd;
+               if (fd.set)
+                       row_info[row].endfoot = flag;
+       }
 }
 
-bool LyXTabular::GetRowOfLTLastFoot(int cell) const
+
+bool LyXTabular::getRowOfLTFoot(int row, ltType & fd) const
 {
-    if ((endlastfoot+1) > rows_)
-        return false;
-    return (row_of_cell(cell) == endlastfoot);
+       fd = endfoot;
+       fd.set = haveLTFoot();
+       return row_info[row].endfoot;
 }
 
-void LyXTabular::SetLTNewPage(int cell, bool what)
+
+bool LyXTabular::getRowOfLTLastFoot(int row, ltType & fd) const
 {
-    row_info[row_of_cell(cell)].newpage = what;
+       fd = endlastfoot;
+       fd.set = haveLTLastFoot();
+       return row_info[row].endlastfoot;
 }
 
-bool LyXTabular::GetLTNewPage(int cell) const
+
+void LyXTabular::setLTNewPage(int row, bool what)
 {
-    return row_info[row_of_cell(cell)].newpage;
+       row_info[row].newpage = what;
 }
 
-void LyXTabular::SetAscentOfRow(int row, int height)
+
+bool LyXTabular::getLTNewPage(int row) const
 {
-    if (row >= rows_)
-        return;
-    row_info[row].ascent_of_row = height;
+       return row_info[row].newpage;
 }
 
-void LyXTabular::SetDescentOfRow(int row, int height)
+
+bool LyXTabular::haveLTHead() const
 {
-    if (row >= rows_)
-        return;
-    row_info[row].descent_of_row = height;
+       for (int i = 0; i < rows_; ++i)
+               if (row_info[i].endhead)
+                       return true;
+       return false;
 }
 
-int LyXTabular::GetAscentOfRow(int row) const
+
+bool LyXTabular::haveLTFirstHead() const
 {
-    if (row >= rows_)
-        return 0;
-    return row_info[row].ascent_of_row;
+       if (endfirsthead.empty)
+               return false;
+       for (int i = 0; i < rows_; ++i)
+               if (row_info[i].endfirsthead)
+                       return true;
+       return false;
 }
 
-int LyXTabular::GetDescentOfRow(int row) const
+
+bool LyXTabular::haveLTFoot() const
 {
-    if (row >= rows_)
-        return 0;
-    return row_info[row].descent_of_row;
+       for (int i = 0; i < rows_; ++i)
+               if (row_info[i].endfoot)
+                       return true;
+       return false;
 }
 
-int LyXTabular::GetHeightOfTabular() const
+
+bool LyXTabular::haveLTLastFoot() const
+{
+       if (endlastfoot.empty)
+               return false;
+       for (int i = 0; i < rows_; ++i)
+               if (row_info[i].endlastfoot)
+                       return true;
+       return false;
+}
+
+
+// end longtable support functions
+
+void LyXTabular::setAscentOfRow(int row, int height)
+{
+       if (row >= rows_ || row_info[row].ascent_of_row == height)
+               return;
+       row_info[row].ascent_of_row = height;
+}
+
+
+void LyXTabular::setDescentOfRow(int row, int height)
+{
+       if (row >= rows_ || row_info[row].descent_of_row == height)
+               return;
+       row_info[row].descent_of_row = height;
+}
+
+
+int LyXTabular::getAscentOfRow(int row) const
+{
+       if (row >= rows_)
+               return 0;
+       return row_info[row].ascent_of_row;
+}
+
+
+int LyXTabular::getDescentOfRow(int row) const
+{
+       if (row >= rows_)
+               return 0;
+       return row_info[row].descent_of_row;
+}
+
+
+int LyXTabular::getHeightOfTabular() const
+{
+       int height = 0;
+       for (int row = 0; row < rows_; ++row)
+               height += getAscentOfRow(row) + getDescentOfRow(row) +
+                       getAdditionalHeight(row);
+       return height;
+}
+
+
+bool LyXTabular::isPartOfMultiColumn(int row, int column) const
+{
+       if (row >= rows_ || column >= columns_)
+               return false;
+       return cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN;
+}
+
+
+int LyXTabular::TeXTopHLine(ostream & os, int row) const
 {
-    int
-        height,
-        row;
+       if (row < 0 || row >= rows_)
+               return 0;
+
+       int const fcell = getFirstCellInRow(row);
+       int const n = numberOfCellsInRow(fcell) + fcell;
+       int tmp = 0;
 
-    for(row=0,height=0;(row<rows_); ++row)
-        height += GetAscentOfRow(row) + GetDescentOfRow(row) +
-           GetAdditionalHeight(GetCellNumber(0,row));
-    return height;
+       for (int 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) {
+                       if (topLine(i)) {
+                               os << "\\cline{"
+                                  << column_of_cell(i) + 1
+                                  << '-'
+                                  << right_column_of_cell(i) + 1
+                                  << "} ";
+                       }
+               }
+       } else {
+               return 0;
+       }
+       os << "\n";
+       return 1;
 }
 
-bool LyXTabular::IsPartOfMultiColumn(int row, int column) const
+
+int LyXTabular::TeXBottomHLine(ostream & os, int row) const
 {
-    if ((row >= rows_) || (column >= columns_))
-        return false;
-    return (cell_info[row][column].multicolumn==CELL_PART_OF_MULTICOLUMN);
+       if (row < 0 || row >= rows_)
+               return 0;
+
+       int const fcell = getFirstCellInRow(row);
+       int const n = numberOfCellsInRow(fcell) + fcell;
+       int tmp = 0;
+
+       for (int 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) {
+                       if (bottomLine(i)) {
+                               os << "\\cline{"
+                                  << column_of_cell(i) + 1
+                                  << '-'
+                                  << right_column_of_cell(i) + 1
+                                  << "} ";
+                       }
+               }
+       } else {
+               return 0;
+       }
+       os << "\n";
+       return 1;
 }
 
-int LyXTabular::Latex(ostream &) const
+
+int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
 {
-    return 0;
+       int ret = 0;
+
+       if (getRotateCell(cell)) {
+               os << "\\begin{sideways}\n";
+               ++ret;
+       }
+       if (isMultiColumn(cell)) {
+               os << "\\multicolumn{" << cells_in_multicolumn(cell) << "}{";
+               if (!cellinfo_of_cell(cell).align_special.empty()) {
+                       os << cellinfo_of_cell(cell).align_special << "}{";
+               } else {
+                       if (leftLine(cell) &&
+                               (isFirstCellInRow(cell) ||
+                                (!isMultiColumn(cell - 1) && !leftLine(cell, true) &&
+                                 !rightLine(cell - 1, true))))
+                       {
+                               os << '|';
+                       }
+                       if (!getPWidth(cell).zero()) {
+                               switch (getVAlignment(cell)) {
+                               case LYX_VALIGN_TOP:
+                                       os << 'p';
+                                       break;
+                               case LYX_VALIGN_MIDDLE:
+                                       os << 'm';
+                                       break;
+                               case LYX_VALIGN_BOTTOM:
+                                       os << 'b';
+                                       break;
+                               }
+                               os << '{'
+                                  << getPWidth(cell).asLatexString()
+                                  << '}';
+                       } else {
+                               switch (getAlignment(cell)) {
+                               case LYX_ALIGN_LEFT:
+                                       os << 'l';
+                                       break;
+                               case LYX_ALIGN_RIGHT:
+                                       os << 'r';
+                                       break;
+                               default:
+                                       os << 'c';
+                                       break;
+                               }
+                       }
+                       if (rightLine(cell))
+                               os << '|';
+                       if (((cell + 1) < numberofcells) && !isFirstCellInRow(cell+1) &&
+                               leftLine(cell+1))
+                               os << '|';
+                       os << "}{";
+               }
+       }
+       if (getUsebox(cell) == BOX_PARBOX) {
+               os << "\\parbox[";
+               switch (getVAlignment(cell)) {
+               case LYX_VALIGN_TOP:
+                       os << 't';
+                       break;
+               case LYX_VALIGN_MIDDLE:
+                       os << 'c';
+                       break;
+               case LYX_VALIGN_BOTTOM:
+                       os << 'b';
+                       break;
+               }
+               os << "]{" << getPWidth(cell).asLatexString() << "}{";
+       } else if (getUsebox(cell) == BOX_MINIPAGE) {
+               os << "\\begin{minipage}[";
+               switch (getVAlignment(cell)) {
+               case LYX_VALIGN_TOP:
+                       os << 't';
+                       break;
+               case LYX_VALIGN_MIDDLE:
+                       os << 'm';
+                       break;
+               case LYX_VALIGN_BOTTOM:
+                       os << 'b';
+                       break;
+               }
+               os << "]{" << getPWidth(cell).asLatexString() << "}\n";
+               ++ret;
+       }
+       return ret;
 }
 
-InsetText * LyXTabular::GetCellInset(int cell) const
+
+int LyXTabular::TeXCellPostamble(ostream & os, int cell) const
 {
-    return cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
+       int ret = 0;
+
+       // usual cells
+       if (getUsebox(cell) == BOX_PARBOX)
+               os << '}';
+       else if (getUsebox(cell) == BOX_MINIPAGE) {
+               os << "%\n\\end{minipage}";
+               ret += 2;
+       }
+       if (isMultiColumn(cell)) {
+               os << '}';
+       }
+       if (getRotateCell(cell)) {
+               os << "%\n\\end{sideways}";
+               ++ret;
+       }
+       return ret;
+}
+
+
+int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const & buf,
+                                        LatexRunParams const & runparams) const
+{
+       if (!is_long_tabular)
+               return 0;
+
+       int ret = 0;
+       // output header info
+       if (haveLTHead()) {
+               if (endhead.topDL) {
+                       os << "\\hline\n";
+                       ++ret;
+               }
+               for (int i = 0; i < rows_; ++i) {
+                       if (row_info[i].endhead) {
+                               ret += TeXRow(os, i, buf, runparams);
+                       }
+               }
+               if (endhead.bottomDL) {
+                       os << "\\hline\n";
+                       ++ret;
+               }
+               os << "\\endhead\n";
+               ++ret;
+               if (endfirsthead.empty) {
+                       os << "\\endfirsthead\n";
+                       ++ret;
+               }
+       }
+       // output firstheader info
+       if (haveLTFirstHead()) {
+               if (endfirsthead.topDL) {
+                       os << "\\hline\n";
+                       ++ret;
+               }
+               for (int i = 0; i < rows_; ++i) {
+                       if (row_info[i].endfirsthead) {
+                               ret += TeXRow(os, i, buf, runparams);
+                       }
+               }
+               if (endfirsthead.bottomDL) {
+                       os << "\\hline\n";
+                       ++ret;
+               }
+               os << "\\endfirsthead\n";
+               ++ret;
+       }
+       // output footer info
+       if (haveLTFoot()) {
+               if (endfoot.topDL) {
+                       os << "\\hline\n";
+                       ++ret;
+               }
+               for (int i = 0; i < rows_; ++i) {
+                       if (row_info[i].endfoot) {
+                               ret += TeXRow(os, i, buf, runparams);
+                       }
+               }
+               if (endfoot.bottomDL) {
+                       os << "\\hline\n";
+                       ++ret;
+               }
+               os << "\\endfoot\n";
+               ++ret;
+               if (endlastfoot.empty) {
+                       os << "\\endlastfoot\n";
+                       ++ret;
+               }
+       }
+       // output lastfooter info
+       if (haveLTLastFoot()) {
+               if (endlastfoot.topDL) {
+                       os << "\\hline\n";
+                       ++ret;
+               }
+               for (int i = 0; i < rows_; ++i) {
+                       if (row_info[i].endlastfoot) {
+                               ret += TeXRow(os, i, buf, runparams);
+                       }
+               }
+               if (endlastfoot.bottomDL) {
+                       os << "\\hline\n";
+                       ++ret;
+               }
+               os << "\\endlastfoot\n";
+               ++ret;
+       }
+       return ret;
+}
+
+
+bool LyXTabular::isValidRow(int const 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);
+}
+
+
+int LyXTabular::TeXRow(ostream & os, int const i, Buffer const & buf,
+                      LatexRunParams const & runparams) const
+{
+       int ret = 0;
+       int cell = getCellNumber(i, 0);
+
+       ret += TeXTopHLine(os, i);
+       for (int j = 0; j < columns_; ++j) {
+               if (isPartOfMultiColumn(i, j))
+                       continue;
+               ret += TeXCellPreamble(os, cell);
+               InsetText & inset = getCellInset(cell);
+
+               bool rtl = inset.paragraphs.begin()->isRightToLeftPar(buf.params) &&
+                       !inset.paragraphs.begin()->empty() && getPWidth(cell).zero();
+
+               if (rtl)
+                       os << "\\R{";
+               ret += inset.latex(buf, os, runparams);
+               if (rtl)
+                       os << '}';
+
+               ret += TeXCellPostamble(os, cell);
+               if (!isLastCellInRow(cell)) { // not last cell in row
+                       os << "&\n";
+                       ++ret;
+               }
+               ++cell;
+       }
+       os << "\\tabularnewline\n";
+       ++ret;
+       ret += TeXBottomHLine(os, i);
+       return ret;
+}
+
+
+int LyXTabular::latex(Buffer const & buf, ostream & os,
+                     LatexRunParams const & runparams) const
+{
+       int ret = 0;
+
+       //+---------------------------------------------------------------------
+       //+                      first the opening preamble                    +
+       //+---------------------------------------------------------------------
+
+       if (rotate) {
+               os << "\\begin{sideways}\n";
+               ++ret;
+       }
+       if (is_long_tabular)
+               os << "\\begin{longtable}{";
+       else
+               os << "\\begin{tabular}{";
+       for (int i = 0; i < columns_; ++i) {
+               if (!column_info[i].align_special.empty()) {
+                       os << column_info[i].align_special;
+               } else {
+                       if (column_info[i].left_line)
+                               os << '|';
+                       if (!column_info[i].p_width.zero()) {
+                               switch (column_info[i].alignment) {
+                               case LYX_ALIGN_LEFT:
+                                       os << ">{\\raggedright}";
+                                       break;
+                               case LYX_ALIGN_RIGHT:
+                                       os << ">{\\raggedleft}";
+                                       break;
+                               case LYX_ALIGN_CENTER:
+                                       os << ">{\\centering}";
+                                       break;
+                               case LYX_ALIGN_NONE:
+                               case LYX_ALIGN_BLOCK:
+                               case LYX_ALIGN_LAYOUT:
+                               case LYX_ALIGN_SPECIAL:
+                                       break;
+                               }
+
+                               switch (column_info[i].valignment) {
+                               case LYX_VALIGN_TOP:
+                                       os << 'p';
+                                       break;
+                               case LYX_VALIGN_MIDDLE:
+                                       os << 'm';
+                                       break;
+                               case LYX_VALIGN_BOTTOM:
+                                       os << 'b';
+                                       break;
+                       }
+                               os << '{'
+                                  << column_info[i].p_width.asLatexString()
+                                  << '}';
+                       } else {
+                               switch (column_info[i].alignment) {
+                               case LYX_ALIGN_LEFT:
+                                       os << 'l';
+                                       break;
+                               case LYX_ALIGN_RIGHT:
+                                       os << 'r';
+                                       break;
+                               default:
+                                       os << 'c';
+                                       break;
+                               }
+                       }
+                       if (column_info[i].right_line)
+                               os << '|';
+               }
+       }
+       os << "}\n";
+       ++ret;
+
+       ret += TeXLongtableHeaderFooter(os, buf, runparams);
+
+       //+---------------------------------------------------------------------
+       //+                      the single row and columns (cells)            +
+       //+---------------------------------------------------------------------
+
+       for (int i = 0; i < rows_; ++i) {
+               if (isValidRow(i)) {
+                       ret += TeXRow(os, i, buf, runparams);
+                       if (is_long_tabular && row_info[i].newpage) {
+                               os << "\\newpage\n";
+                               ++ret;
+                       }
+               }
+       }
+
+       //+---------------------------------------------------------------------
+       //+                      the closing of the tabular                    +
+       //+---------------------------------------------------------------------
+
+       if (is_long_tabular)
+               os << "\\end{longtable}";
+       else
+               os << "\\end{tabular}";
+       if (rotate) {
+               os << "\n\\end{sideways}";
+               ++ret;
+       }
+
+       return ret;
+}
+
+
+int LyXTabular::linuxdoc(Buffer const & buf, ostream & os) const
+{
+       os << "<tabular ca=\"";
+       for (int i = 0; i < columns_; ++i) {
+               switch (column_info[i].alignment) {
+               case LYX_ALIGN_LEFT:
+                       os << 'l';
+                       break;
+               case LYX_ALIGN_RIGHT:
+                       os << 'r';
+                       break;
+               default:
+                       os << 'c';
+                       break;
+               }
+       }
+       os << "\">\n";
+       int cell = 0;
+       int ret = 0;
+       for (int i = 0; i < rows_; ++i) {
+               for (int j = 0; j < columns_; ++j) {
+                       if (isPartOfMultiColumn(i, j))
+                               continue;
+                       InsetText & inset = getCellInset(cell);
+
+                       ret += inset.linuxdoc(buf, os);
+
+                       if (isLastCellInRow(cell)) {
+                               os << "@\n";
+                               ++ret;
+                       } else {
+                               os << "|";
+                       }
+                       ++cell;
+               }
+       }
+       os << "</tabular>\n";
+       return ret;
+}
+
+
+int LyXTabular::docbookRow(Buffer const & buf, ostream & os, int row) const
+{
+       int ret = 0;
+       int cell = getFirstCellInRow(row);
+
+       os << "<row>\n";
+       for (int j = 0; j < columns_; ++j) {
+               if (isPartOfMultiColumn(row, j))
+                       continue;
+
+               os << "<entry align=\"";
+               switch (getAlignment(cell)) {
+               case LYX_ALIGN_LEFT:
+                       os << "left";
+                       break;
+               case LYX_ALIGN_RIGHT:
+                       os << "right";
+                       break;
+               default:
+                       os << "center";
+                       break;
+               }
+
+               os << "\" valign=\"";
+               switch (getVAlignment(cell)) {
+               case LYX_VALIGN_TOP:
+                       os << "top";
+                       break;
+               case LYX_VALIGN_BOTTOM:
+                       os << "bottom";
+                       break;
+               case LYX_VALIGN_MIDDLE:
+                       os << "middle";
+               }
+               os << '"';
+
+               if (isMultiColumn(cell)) {
+                       os << " namest=\"col" << j << "\" ";
+                       os << "nameend=\"col" << j + cells_in_multicolumn(cell) - 1<< '"';
+               }
+
+               os << '>';
+               ret += getCellInset(cell).docbook(buf, os, true);
+               os << "</entry>\n";
+               ++cell;
+       }
+       os << "</row>\n";
+       return ret;
+}
+
+
+int LyXTabular::docbook(Buffer const & buf, ostream & os,
+                       bool /*mixcont*/) const
+{
+       int ret = 0;
+
+       //+---------------------------------------------------------------------
+       //+                      first the opening preamble                    +
+       //+---------------------------------------------------------------------
+
+       os << "<tgroup cols=\"" << columns_
+          << "\" colsep=\"1\" rowsep=\"1\">\n";
+
+       for (int i = 0; i < columns_; ++i) {
+               os << "<colspec colname=\"col" << i << "\" align=\"";
+               switch (column_info[i].alignment) {
+               case LYX_ALIGN_LEFT:
+                       os << "left";
+                       break;
+               case LYX_ALIGN_RIGHT:
+                       os << "right";
+                       break;
+               default:
+                       os << "center";
+                       break;
+               }
+               os << "\">\n";
+               ++ret;
+       }
+
+       //+---------------------------------------------------------------------
+       //+                      Long Tabular case                             +
+       //+---------------------------------------------------------------------
+
+       // output header info
+       if (haveLTHead() || haveLTFirstHead()) {
+               os << "<thead>\n";
+               ++ret;
+               for (int i = 0; i < rows_; ++i) {
+                       if (row_info[i].endhead || row_info[i].endfirsthead) {
+                               ret += docbookRow(buf, os, i);
+                       }
+               }
+               os << "</thead>\n";
+               ++ret;
+       }
+       // output footer info
+       if (haveLTFoot() || haveLTLastFoot()) {
+               os << "<tfoot>\n";
+               ++ret;
+               for (int i = 0; i < rows_; ++i) {
+                       if (row_info[i].endfoot || row_info[i].endlastfoot) {
+                               ret += docbookRow(buf, os, i);
+                       }
+               }
+               os << "</tfoot>\n";
+               ++ret;
+       }
+
+       //+---------------------------------------------------------------------
+       //+                      the single row and columns (cells)            +
+       //+---------------------------------------------------------------------
+
+       os << "<tbody>\n";
+       ++ret;
+       for (int i = 0; i < rows_; ++i) {
+               if (isValidRow(i)) {
+                       ret += docbookRow(buf, os, i);
+               }
+       }
+       os << "</tbody>\n";
+       ++ret;
+       //+---------------------------------------------------------------------
+       //+                      the closing of the tabular                    +
+       //+---------------------------------------------------------------------
+
+       os << "</tgroup>";
+       ++ret;
+
+       return ret;
+}
+
+
+int LyXTabular::asciiTopHLine(ostream & os, int row,
+                             vector<unsigned int> const & clen) const
+{
+       int const fcell = getFirstCellInRow(row);
+       int const n = numberOfCellsInRow(fcell) + fcell;
+       int tmp = 0;
+
+       for (int i = fcell; i < n; ++i) {
+               if (topLine(i)) {
+                       ++tmp;
+                       break;
+               }
+       }
+       if (!tmp)
+               return 0;
+
+       unsigned char ch;
+       for (int i = fcell; i < n; ++i) {
+               if (topLine(i)) {
+                       if (leftLine(i))
+                               os << "+-";
+                       else
+                               os << "--";
+                       ch = '-';
+               } else {
+                       os << "  ";
+                       ch = ' ';
+               }
+               int column = column_of_cell(i);
+               int len = clen[column];
+               while (isPartOfMultiColumn(row, ++column))
+                       len += clen[column] + 4;
+               os << string(len, ch);
+               if (topLine(i)) {
+                       if (rightLine(i))
+                               os << "-+";
+                       else
+                               os << "--";
+               } else {
+                       os << "  ";
+               }
+       }
+       os << endl;
+       return 1;
+}
+
+
+int LyXTabular::asciiBottomHLine(ostream & os, int row,
+                                vector<unsigned int> const & clen) const
+{
+       int const fcell = getFirstCellInRow(row);
+       int const n = numberOfCellsInRow(fcell) + fcell;
+       int tmp = 0;
+
+       for (int i = fcell; i < n; ++i) {
+               if (bottomLine(i)) {
+                       ++tmp;
+                       break;
+               }
+       }
+       if (!tmp)
+               return 0;
+
+       unsigned char ch;
+       for (int i = fcell; i < n; ++i) {
+               if (bottomLine(i)) {
+                       if (leftLine(i))
+                               os << "+-";
+                       else
+                               os << "--";
+                       ch = '-';
+               } else {
+                       os << "  ";
+                       ch = ' ';
+               }
+               int column = column_of_cell(i);
+               int len = clen[column];
+               while (isPartOfMultiColumn(row, ++column))
+                       len += clen[column] + 4;
+               os << string(len, ch);
+               if (bottomLine(i)) {
+                       if (rightLine(i))
+                               os << "-+";
+                       else
+                               os << "--";
+               } else {
+                       os << "  ";
+               }
+       }
+       os << endl;
+       return 1;
+}
+
+
+int LyXTabular::asciiPrintCell(Buffer const & buf, ostream & os,
+                              int cell, int row, int column,
+                              vector<unsigned int> const & clen,
+                              bool onlydata) const
+{
+       ostringstream sstr;
+       int ret = getCellInset(cell).ascii(buf, sstr, 0);
+
+       if (onlydata) {
+               os << sstr.str();
+               return ret;
+       }
+
+       if (leftLine(cell))
+               os << "| ";
+       else
+               os << "  ";
+
+       unsigned int len1 = sstr.str().length();
+       unsigned int len2 = clen[column];
+       while (isPartOfMultiColumn(row, ++column))
+               len2 += clen[column] + 4;
+       len2 -= len1;
+
+       switch (getAlignment(cell)) {
+       default:
+       case LYX_ALIGN_LEFT:
+               len1 = 0;
+               break;
+       case LYX_ALIGN_RIGHT:
+               len1 = len2;
+               len2 = 0;
+               break;
+       case LYX_ALIGN_CENTER:
+               len1 = len2 / 2;
+               len2 -= len1;
+               break;
+       }
+
+       os << string(len1, ' ') << sstr.str() << string(len2, ' ');
+
+       if (rightLine(cell))
+               os << " |";
+       else
+               os << "  ";
+
+       return ret;
+}
+
+
+int LyXTabular::ascii(Buffer const & buf, ostream & os, int const depth,
+                                         bool onlydata, unsigned char delim) const
+{
+       int ret = 0;
+
+       // first calculate the width of the single columns
+       vector<unsigned int> clen(columns_);
+
+       if (!onlydata) {
+               // first all non (real) multicolumn cells!
+               for (int j = 0; j < columns_; ++j) {
+                       clen[j] = 0;
+                       for (int i = 0; i < rows_; ++i) {
+                               int cell = getCellNumber(i, j);
+                               if (isMultiColumn(cell, true))
+                                       continue;
+                               ostringstream sstr;
+                               getCellInset(cell).ascii(buf, sstr, 0);
+                               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))
+                                       continue;
+                               ostringstream sstr;
+                               getCellInset(cell).ascii(buf, sstr, 0);
+                               int len = int(sstr.str().length());
+                               int const n = cells_in_multicolumn(cell);
+                               for (int 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) {
+               if (!onlydata && asciiTopHLine(os, i, clen))
+                       for (int j = 0; j < depth; ++j)
+                               os << "  ";
+               for (int 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);
+                       ++cell;
+               }
+               os << endl;
+               if (!onlydata) {
+                       for (int j = 0; j < depth; ++j)
+                               os << "  ";
+                       if (asciiBottomHLine(os, i, clen))
+                               for (int j = 0; j < depth; ++j)
+                                       os << "  ";
+               }
+       }
+       return ret;
+}
+
+
+InsetText & LyXTabular::getCellInset(int 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
+{
+       cur_cell = getCellNumber(row, column);
+       return cell_info[row][column].inset;
+}
+
+
+int LyXTabular::getCellFromInset(InsetOld const * inset, int maybe_cell) const
+{
+       // is this inset part of the tabular?
+       if (!inset || inset->owner() != owner_) {
+               lyxerr << "Error: this is not a cell of the tabular!" << endl;
+               return -1;
+       }
+
+       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 (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;
+               }
+       }
+
+       return cell;
+}
+
+
+void LyXTabular::validate(LaTeXFeatures & features) const
+{
+       features.require("NeedTabularnewline");
+       if (isLongTabular())
+               features.require("longtable");
+       if (needRotating())
+               features.require("rotating");
+       for (int cell = 0; cell < numberofcells; ++cell) {
+               if (getVAlignment(cell) != LYX_VALIGN_TOP ||
+                    (!getPWidth(cell).zero() && !isMultiColumn(cell)))
+                       features.require("array");
+               getCellInset(cell).validate(features);
+       }
+}
+
+
+void LyXTabular::getLabelList(std::vector<string> & list) const
+{
+       for (int i = 0; i < rows_; ++i)
+               for (int j = 0; j < columns_; ++j)
+                       getCellInset(i, j).getLabelList(list);
+}
+
+
+LyXTabular::BoxType LyXTabular::useParbox(int cell) const
+{
+       ParagraphList const & parlist = getCellInset(cell).paragraphs;
+       ParagraphList::const_iterator cit = parlist.begin();
+       ParagraphList::const_iterator end = parlist.end();
+
+       for (; cit != end; ++cit)
+               for (int i = 0; i < cit->size(); ++i)
+                       if (cit->isNewline(i))
+                               return BOX_PARBOX;
+
+       return BOX_NONE;
 }