]> git.lyx.org Git - lyx.git/blobdiff - src/tabular.C
Applied Angus patch to compile on DEC C++ and to avoid name clashes
[lyx.git] / src / tabular.C
index 7639f1c3a08506a5dfb538e979baaab3c76ed8da..5f149ce2660bc1ca72a7eee90ba8133aefd410f0 100644 (file)
  * 
  *           LyX, The Document Processor
  *      
- *        Copyright 2000 The LyX Team.
+ *           Copyright 2000 The LyX Team.
+ *
+ *           @author: Jürgen Vigna
  *
  * ====================================================== 
  */
 
 #include <config.h>
 
-#include <algorithm>
-#include <cstdlib>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
+#include <algorithm>
+#include <cstdlib>
+
 #include "tabular.h"
 #include "debug.h"
 #include "vspace.h"
 #include "layout.h"
+#include "lyx_gui_misc.h"
+#include "buffer.h"
+#include "BufferView.h"
+#include "Painter.h"
+#include "LaTeXFeatures.h"
 #include "support/lstrings.h"
 #include "support/lyxmanip.h"
-#include "lyx_gui_misc.h"
+#include "insets/insettabular.h"
 #include "insets/insettext.h"
 
 using std::ostream;
 using std::istream;
+using std::getline;
 using std::max;
 using std::endl;
+using std::vector;
 
-static int const WIDTH_OF_LINE = 5;
+namespace {
 
-/// Define a few methods for the inner structs
+int const WIDTH_OF_LINE = 5;
 
-LyXTabular::cellstruct::cellstruct(Buffer * buf) 
-{
-       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;
-       buf ? inset = new InsetText(buf): inset = 0;
-       
-}
+} // namespace
 
-LyXTabular::cellstruct::~cellstruct() 
-{
-    if (inset)
-       delete inset;
-}
+/// Define a few methods for the inner structs
 
-LyXTabular::cellstruct & 
-  LyXTabular::cellstruct::operator=(cellstruct const & cs)
+LyXTabular::cellstruct::cellstruct() 
 {
-       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;
+    cellno = 0;
+    width_of_cell = 0;
+    multicolumn = LyXTabular::CELL_NORMAL;
+    alignment = LYX_ALIGN_CENTER;
+    valignment = LYX_VALIGN_TOP;
+    top_line = true;
+    bottom_line = false;
+    left_line = true;
+    right_line = false;
+    usebox = BOX_NONE;
+    rotate = false;
 }
 
-LyXTabular::rowstruct::rowstruct() 
-{
-       top_line = true;
-       bottom_line = false;
-       ascent_of_row = 0;
-       descent_of_row = 0;
-       newpage = false;
-}
 
-// Nothing to do, but gcc 2.7.2.3 wants one... (JMarc)
-LyXTabular::rowstruct::~rowstruct() 
+LyXTabular::rowstruct::rowstruct() 
 {
+    top_line = true;
+    bottom_line = false;
+    ascent_of_row = 0;
+    descent_of_row = 0;
+    newpage = false;
 }
 
-LyXTabular::rowstruct & 
-  LyXTabular::rowstruct::operator=(rowstruct const & rs)
-{
-       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;
-}
 
 LyXTabular::columnstruct::columnstruct() 
 {
-        left_line = true;
-        right_line = false;
-        alignment = LYX_ALIGN_CENTER;
-        width_of_column = 0;
-}
-
-LyXTabular::columnstruct::~columnstruct() 
-{
+    left_line = true;
+    right_line = false;
+    alignment = LYX_ALIGN_CENTER;
+    valignment = LYX_VALIGN_TOP;
+    width_of_column = 0;
 }
 
-LyXTabular::columnstruct & 
-  LyXTabular::columnstruct::operator=(columnstruct const & cs)
-{
-        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;
-}
 
 /* konstruktor */
-LyXTabular::LyXTabular(int rows_arg, int columns_arg, Buffer *buf)
+LyXTabular::LyXTabular(InsetTabular * inset, int rows_arg, int columns_arg)
 {
-    buffer = buf;
+    owner_ = inset;
     Init(rows_arg, columns_arg);
 }
 
 
-LyXTabular::LyXTabular(LyXTabular const & lt, Buffer * buf)
+LyXTabular::LyXTabular(InsetTabular * inset, LyXTabular const & lt)
 {
-    buffer = buf;
+    owner_ = inset;
     Init(lt.rows_, lt.columns_);
-    
+#ifdef WITH_WARNINGS
+#warning Jürgen, can you make it the other way round. So that copy assignment depends on the copy constructor and not the other way. (Lgb)
+#endif
     operator=(lt);
 }
 
-LyXTabular::LyXTabular(LyXLex & lex, Buffer *buf)
-{
-    istream & is = lex.getStream();
-    buffer = buf;
-    Read(is);
-}
-
 
-LyXTabular::~LyXTabular()
+LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex)
 {
-    delete[] rowofcell;
-    delete[] columnofcell;
-    delete[] column_info;
-    delete[] row_info;
-    for (int i = 0; i < rows_; ++i) {
-       delete[] cell_info[i];
-    }
-    delete[] cell_info;
+    owner_ = inset;
+    Read(buf, lex);
 }
 
 
@@ -162,55 +117,36 @@ LyXTabular & LyXTabular::operator=(LyXTabular const & lt)
     // call abort()
     Assert(rows_ == lt.rows_ && columns_ == lt.columns_);
 
-    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];
-    }
+    cell_info = lt.cell_info;
+    row_info = lt.row_info;
+    column_info = lt.column_info;
 
+    // long tabular stuff
     SetLongTabular(lt.is_long_tabular);
+    endhead = lt.endhead;
+    endfoot = lt.endfoot;
+    endfirsthead = lt.endfirsthead;
+    endlastfoot = lt.endlastfoot;
+
     rotate = lt.rotate;
+
     Reinit();
     
     return *this;
 }
 
-LyXTabular * LyXTabular::Clone()
-{
-    LyXTabular * result = new LyXTabular(rows_, columns_);
-    int row, column;;
-
-    for (row = 0; row < rows_; ++row) {
-        for (column = 0; column < columns_; ++column) {
-            result->cell_info[row][column] = cell_info[row][column];
-        }
-    }
-
-    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;
+LyXTabular * LyXTabular::Clone(InsetTabular * inset)
+{
+    LyXTabular * result = new LyXTabular(inset, *this);
+    // don't know if this is good but I need to Clone also
+    // the text-insets here, this is for the Undo-facility!
+    for (int i = 0; i < rows_; ++i) {
+       for (int j = 0; j < columns_; ++j) {
+           result->cell_info[i][j].inset = cell_info[i][j].inset;
+           result->cell_info[i][j].inset.setOwner(inset);
+       }
     }
-  
-    result->SetLongTabular(is_long_tabular);
-    result->rotate = rotate;
-    result->Reinit();
     return result;
 }
 
@@ -218,410 +154,407 @@ LyXTabular * LyXTabular::Clone()
 /* activates all lines and sets all widths to 0 */ 
 void LyXTabular::Init(int rows_arg, int columns_arg)
 {
-    int i, j;
     rows_ = rows_arg;
     columns_ = columns_arg;
-    column_info = new columnstruct[columns_];
-    row_info = new rowstruct[rows_];
-    cell_info = new cellstruct*[rows_];
+    row_info = row_vector(rows_, rowstruct());
+    column_info = column_vector(columns_, columnstruct());
+    cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct()));
 
     int cellno = 0;
-    for (i = 0; i < rows_; ++i) {
-        cell_info[i] = new cellstruct[columns_](buffer);
-        for (j = 0; j < columns_; ++j) {
+    for (int i = 0; i < rows_; ++i) {
+        for (int j = 0; j < columns_; ++j) {
+           cell_info[i][j].inset.setOwner(owner_);
+           cell_info[i][j].inset.SetDrawFrame(0, InsetText::LOCKED);
             cell_info[i][j].cellno = cellno++;
         }
+       cell_info[i].back().right_line = true;
     }
-    row_info[i-1].bottom_line = true;
-    row_info[0].bottom_line = true;
+    row_info.back().bottom_line = true;
+    row_info.front().bottom_line = true;
 
-    for (i = 0; i < columns_; ++i) {
+    for (int i = 0; i < columns_; ++i) {
         calculate_width_of_column(i);
     }
-    column_info[columns_-1].right_line = true;
+    column_info.back().right_line = true;
    
     calculate_width_of_tabular();
 
-    rowofcell = 0;
-    columnofcell = 0;
+    rowofcell = vector<int>();
+    columnofcell = vector<int>();
     set_row_column_number_info();
     is_long_tabular = false;
-    rotate = 0;
-    endhead = -1;
-    endfirsthead = -1;
-    endfoot = -1;
-    endlastfoot = -1;
+    rotate = false;
+    endhead = 0;
+    endfirsthead = 0;
+    endfoot = 0;
+    endlastfoot = 0;
 }
 
 
 void LyXTabular::AppendRow(int cell)
 {
+    ++rows_;
+   
     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];
+    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()));
+#else
+    cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
+                                                         cellstruct()));
+
+    for (int i = 0; i <= row; ++i) {
+       for (int j = 0; j < columns_; ++j) {
+           c_info[i][j] = cell_info[i][j];
+       }
     }
-    for (i = rows_ - 1; i >= row; --i) {
-        cell_info2[i + 1] = cell_info[i];
-        row_info2[i + 1] = row_info[i];
+    for (int i = row + 1; i < rows_; ++i) {
+       for (int j = 0; j < columns_; ++j) {
+           c_info[i][j] = cell_info[i-1][j];
+       }
     }
-    row_info2[row + 1].top_line = row_info[i].top_line;
-    cell_info2[row + 1] = new cellstruct[columns_];
-    for (i = 0; i < columns_; ++i) {
-        cell_info2[row + 1][i].width_of_cell = 0;
-        cell_info2[row + 1][i] = cell_info2[row][i];
+    cell_info = c_info;
+    ++row;
+    for (int j = 0; j < columns_; ++j) {
+       cell_info[row][j].inset.clear();
     }
-   
-    delete[] cell_info;
-    cell_info = cell_info2;
-    delete[] row_info;
-    row_info = row_info2;
-   
-    ++rows_;
-   
+#endif
     Reinit();
 }
 
 
-void LyXTabular::DeleteRow(int cell)
+void LyXTabular::DeleteRow(int row)
 {
-       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();
+    // Why make it so hard? (Lgb)
+    //if (!(rows_ - 1))
+    //return;
+    if (rows_ == 1) return; // Not allowed to delete last row
+       
+    row_info.erase(row_info.begin() + row); //&row_info[row]);
+    cell_info.erase(cell_info.begin() + row); //&cell_info[row]);
+    --rows_;
+    Reinit();
 }
 
 
 void LyXTabular::AppendColumn(int cell)
 {
-    int j;
-    columnstruct * column_info2 = new columnstruct[columns_ + 1];
-    int column = right_column_of_cell(cell);
+    ++columns_;
+   
+    cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
+                                                         cellstruct()));
+    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];
 
-    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];
-        for (j = 0; j <= column; ++j) {
-            cell_info[i][j] = tmp[j];
+    for (int i = 0; i < rows_; ++i) {
+        for (int j = 0; j <= column; ++j) {
+            c_info[i][j] = cell_info[i][j];
         }
-        for (j = column; j < columns_; ++j) {
-            cell_info[i][j + 1] = tmp[j];
+        for (int j = column + 1; j < columns_; ++j) {
+            c_info[i][j] = cell_info[i][j - 1];
         }
         // 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 (cell_info[i][column + 1].multicolumn == CELL_BEGIN_OF_MULTICOLUMN) {
+            cell_info[i][column + 1].multicolumn = 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;
+        if ((column + 1) == columns_ ||
+            cell_info[i][column + 2].multicolumn != CELL_PART_OF_MULTICOLUMN) {
+            cell_info[i][column + 1].multicolumn = LyXTabular::CELL_NORMAL;
         }
-        delete[] tmp;
     }
-    
-    ++columns_;
+    cell_info = c_info;
+    //++column;
+    for (int i = 0; i < rows_; ++i) {
+       //cell_info[i][column].inset.clear();
+       cell_info[i][column + 1].inset.clear();
+    }
+    Reinit();
+}
+
+
+void LyXTabular::DeleteColumn(int column)
+{
+    // Similar to DeleteRow
+    //if (!(columns_ - 1))
+    //return;
+    if (columns_ == 1) return; // Not allowed to delete last column
+        
+    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();
 }
 
 
 void LyXTabular::Reinit()
 {   
-       int j;
-
-       int i = 0;
-       for (; i < rows_; ++i) {
-               for (j = 0; j < columns_; ++j) {
-                       cell_info[i][j].width_of_cell = 0;
-               }
+    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 (i = 0; i < columns_; ++i) {
-               calculate_width_of_column(i);
-       }
-       calculate_width_of_tabular();
+    for (int i = 0; i < columns_; ++i) {
+       calculate_width_of_column(i);
+    }
+    calculate_width_of_tabular();
 
-       set_row_column_number_info();
+    set_row_column_number_info();
 }
 
 
-void LyXTabular::set_row_column_number_info()
+void LyXTabular::set_row_column_number_info(bool oldformat)
 {
-       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;
-               }
-       }
-       ++numberofcells; // because this is one more than as we start from 0
-       row = 0;
-       column = 0;
-
-       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;
-               }
+    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;
        }
-}
-
-
-void LyXTabular::DeleteColumn(int cell)
-{
-       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);
+    }
+    ++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;
        }
-       Reinit();
-}
-
-
-int LyXTabular::GetNumberOfCells()
-{
-       return numberofcells;
-}
-
+    }
 
-int LyXTabular::NumberOfCellsInRow(int cell)
-{
-       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;
+    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)).empty());
        }
-       return result;
+    }
 }
 
 
-int LyXTabular::AppendCellAfterCell(int append_cell, int question_cell)
+int LyXTabular::GetNumberOfCells() const
 {
-       return (right_column_of_cell(append_cell) == 
-               right_column_of_cell(question_cell));
+    return numberofcells;
 }
 
 
-int LyXTabular::DeleteCellIfColumnIsDeleted(int cell, int delete_column_cell)
+int LyXTabular::NumberOfCellsInRow(int cell) const
 {
-    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));
+    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;
 }
 
 
 /* returns 1 if there is a topline, returns 0 if not */ 
-bool LyXTabular::TopLine(int cell)
+bool LyXTabular::TopLine(int cell, bool onlycolumn) const
 {
-    int row = row_of_cell(cell);
+    int const row = row_of_cell(cell);
     
-    if (IsMultiColumn(cell))
+    if (!onlycolumn && IsMultiColumn(cell))
         return cellinfo_of_cell(cell)->top_line;
     return row_info[row].top_line;
 }
 
 
-bool LyXTabular::BottomLine(int cell)
+bool LyXTabular::BottomLine(int cell, bool onlycolumn) const
 {
-    //no bottom line underneath non-existent cells if you please
-    if(cell >= numberofcells)
+    // no bottom line underneath non-existent cells if you please
+    // Isn't that a programming error? Is so this should
+    // be an Assert instead. (Lgb)
+    if (cell >= numberofcells)
        return false;
 
-    if (IsMultiColumn(cell))
+    if (!onlycolumn && IsMultiColumn(cell))
         return cellinfo_of_cell(cell)->bottom_line;
     return row_info[row_of_cell(cell)].bottom_line;
 }
 
 
-bool LyXTabular::LeftLine(int cell)
+bool LyXTabular::LeftLine(int cell, bool onlycolumn) const
 {
-       return column_info[column_of_cell(cell)].left_line;
+    if (!onlycolumn && IsMultiColumn(cell))
+        return cellinfo_of_cell(cell)->left_line;
+    return column_info[column_of_cell(cell)].left_line;
 }
 
 
-bool LyXTabular::RightLine(int cell)
+bool LyXTabular::RightLine(int cell, bool onlycolumn) const
 {
-       return column_info[right_column_of_cell(cell)].right_line;
+    if (!onlycolumn && IsMultiColumn(cell))
+        return cellinfo_of_cell(cell)->right_line;
+    return column_info[right_column_of_cell(cell)].right_line;
 }
 
 
-bool LyXTabular::TopAlreadyDrawed(int cell)
+bool LyXTabular::TopAlreadyDrawed(int cell) const
 {
-       if (AdditionalHeight(cell))
-               return false;
-       int row = row_of_cell(cell);
-       if (row > 0){
-               int column = column_of_cell(cell);
-               while (column
-                      && cell_info[row-1][column].multicolumn
-                      == LyXTabular::CELL_PART_OF_MULTICOLUMN)
-                       --column;
-               if (cell_info[row-1][column].multicolumn
-                   == LyXTabular::CELL_NORMAL)
-                       return row_info[row-1].bottom_line;
-               else
-                       return cell_info[row-1][column].bottom_line;
-       }
+    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;
+}
+
+
+bool LyXTabular::LeftAlreadyDrawed(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;
 }
 
 
-bool LyXTabular::VeryLastRow(int cell)
+bool LyXTabular::IsLastRow(int cell) const
 {
-       return (row_of_cell(cell) == rows_ - 1);
+    return (row_of_cell(cell) == rows_ - 1);
 }
 
 
-int LyXTabular::AdditionalHeight(int cell)
+int LyXTabular::GetAdditionalHeight(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;
-
-       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;
-               }
+    int const row = row_of_cell(cell);
+    if (!row) return 0;
+
+    bool top = true;
+    bool bottom = true;
+
+    for (int 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;
        }
-       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_ - 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;
        }
-       if (top && bottom)
-               return WIDTH_OF_LINE;
-       return 0;
+    }
+    if (top && bottom)
+       return WIDTH_OF_LINE;
+    return 0;
 }
 
 
-int LyXTabular::AdditionalWidth(int cell)
+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
-               return 0;
+    // internally already set in SetWidthOfCell
+    // used to get it back in text.C
+    int const 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
+       return 0;
 }
 
 
 // returns the maximum over all rows 
-int LyXTabular::WidthOfColumn(int 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 += column_info[i].width_of_column;
-       }
-       return result;
+int LyXTabular::GetWidthOfColumn(int cell) const
+{
+    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::WidthOfTabular()
+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)
 {
     if (!IsMultiColumn(cell))
         return false;
     
-    int row = row_of_cell(cell);
-    int column1 = column_of_cell(cell);
-    int column2 = right_column_of_cell(cell);
+    int const row = row_of_cell(cell);
+    int const column1 = column_of_cell(cell);
+    int const 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) {
+    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);
-    for (i = column1; (i < column2) && (width > 0); ++i) {
+
+    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 (i == column2) {
+    if (width > 0) {
         cell_info[row][i].width_of_cell = width;
     }
     return true;
@@ -630,15 +563,15 @@ bool LyXTabular::SetWidthOfMulticolCell(int cell, int new_width)
 
 void LyXTabular::recalculateMulticolCells(int cell, int new_width)
 {
-       int row = row_of_cell(cell);
-       int column1 = column_of_cell(cell);
-        int column2 = right_column_of_cell(cell);
+    int const row = row_of_cell(cell);
+    int const column1 = column_of_cell(cell);
+    int const column2 = right_column_of_cell(cell);
 
     // first set columns to 0 so we can calculate the right width
-        int i = column1;
+    int i = column1;
     for (; i <= column2; ++i)
         cell_info[row][i].width_of_cell = 0;
-    for(i = cell + 1; (i < numberofcells) && (!IsMultiColumn(i)); ++i)
+    for (i = cell + 1; (i < numberofcells) && (!IsMultiColumn(i)); ++i)
         ;
     if (i < numberofcells)
         recalculateMulticolCells(i, GetWidthOfCell(i) - (2 * WIDTH_OF_LINE));
@@ -649,12 +582,14 @@ void LyXTabular::recalculateMulticolCells(int cell, int new_width)
 /* returns 1 if a complete update is necessary, otherwise 0 */ 
 bool LyXTabular::SetWidthOfCell(int cell, int new_width)
 {
-    int row = row_of_cell(cell);
-    int column1 = column_of_cell(cell);
-    int tmp = 0;
+    int const row = row_of_cell(cell);
+    int const column1 = column_of_cell(cell);
+    bool tmp = false;
     int width = 0;
 
-    if (IsMultiColumn(cell)) {
+    if (GetWidthOfCell(cell) == (new_width+2*WIDTH_OF_LINE))
+       return false;
+    if (IsMultiColumn(cell, true)) {
         tmp = SetWidthOfMulticolCell(cell, new_width);
     } else {
        width = (new_width + 2*WIDTH_OF_LINE);
@@ -665,14 +600,14 @@ bool LyXTabular::SetWidthOfCell(int cell, int new_width)
         tmp = calculate_width_of_column_NMC(column1);
     }
     if (tmp) {
-        int i;
-        for(i = 0; i<columns_;++i)
+        int i = 0;
+        for (; i<columns_; ++i)
             calculate_width_of_column_NMC(i);
-        for(i = 0; (i<numberofcells) && !IsMultiColumn(i); ++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)
+        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;
@@ -681,29 +616,58 @@ bool LyXTabular::SetWidthOfCell(int cell, int new_width)
 }
 
 
-bool LyXTabular::SetAlignment(int cell, char align)
+bool LyXTabular::SetAlignment(int cell, LyXAlignment align, bool onlycolumn)
 {
-    if (!IsMultiColumn(cell))
+    if (!IsMultiColumn(cell) || onlycolumn)
         column_info[column_of_cell(cell)].alignment = align;
-    cellinfo_of_cell(cell)->alignment = align;
+    if (!onlycolumn)
+       cellinfo_of_cell(cell)->alignment = align;
     return true;
 }
 
-bool LyXTabular::SetPWidth(int cell, string width)
+
+bool LyXTabular::SetVAlignment(int cell, VAlignment align, bool onlycolumn)
 {
-    if (IsMultiColumn(cell)) {
-//        if (column_info[column_of_cell(cell)].p_width.empty())
-//            column_info[column_of_cell(cell)].p_width = width;
-        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);
+    if (!IsMultiColumn(cell) || onlycolumn)
+        column_info[column_of_cell(cell)].valignment = align;
+    if (!onlycolumn)
+       cellinfo_of_cell(cell)->valignment = align;
+    return true;
+}
+
+
+bool LyXTabular::SetColumnPWidth(int cell, string const & width)
+{
+    bool flag = !width.empty();
+    int const j = column_of_cell(cell);
+
+    column_info[j].p_width = width;
+    if (flag) // do this only if there is a width
+       SetAlignment(cell, LYX_ALIGN_LEFT);
+    for (int i = 0; i < rows_; ++i) {
+       int c = GetCellNumber(i, j);
+       flag = !GetPWidth(c).empty(); // because of multicolumns!
+       GetCellInset(c)->SetAutoBreakRows(flag);
     }
     return true;
 }
 
-bool LyXTabular::SetAlignSpecial(int cell, string special, int what)
+
+bool LyXTabular::SetMColumnPWidth(int cell, string const & width)
+{
+    bool const flag = !width.empty();
+
+    cellinfo_of_cell(cell)->p_width = width;
+    if (IsMultiColumn(cell)) {
+       GetCellInset(cell)->SetAutoBreakRows(flag);
+       return true;
+    }
+    return false;
+}
+
+
+bool LyXTabular::SetAlignSpecial(int cell, string const & special,
+                                LyXTabular::Feature what)
 {
     if (what == SET_SPECIAL_MULTI)
         cellinfo_of_cell(cell)->align_special = special;
@@ -712,6 +676,7 @@ bool LyXTabular::SetAlignSpecial(int cell, string special, int what)
     return true;
 }
 
+
 bool LyXTabular::SetAllLines(int cell, bool line)
 {
     SetTopLine(cell, line);
@@ -721,11 +686,12 @@ bool LyXTabular::SetAllLines(int cell, bool line)
     return true;
 }
 
-bool LyXTabular::SetTopLine(int cell, bool line)
+
+bool LyXTabular::SetTopLine(int cell, bool line, bool onlycolumn)
 {
-    int row = row_of_cell(cell);
+    int const row = row_of_cell(cell);
 
-    if (!IsMultiColumn(cell))
+    if (onlycolumn || !IsMultiColumn(cell))
         row_info[row].top_line = line;
     else
         cellinfo_of_cell(cell)->top_line = line;
@@ -733,9 +699,9 @@ bool LyXTabular::SetTopLine(int cell, bool line)
 }
 
 
-bool LyXTabular::SetBottomLine(int cell, bool line)
+bool LyXTabular::SetBottomLine(int cell, bool line, bool onlycolumn)
 {
-    if (!IsMultiColumn(cell))
+    if (onlycolumn || !IsMultiColumn(cell))
         row_info[row_of_cell(cell)].bottom_line = line;
     else
         cellinfo_of_cell(cell)->bottom_line = line;
@@ -743,109 +709,160 @@ bool LyXTabular::SetBottomLine(int cell, bool line)
 }
 
 
-bool LyXTabular::SetLeftLine(int cell, bool line)
+bool LyXTabular::SetLeftLine(int cell, bool line, bool onlycolumn)
 {
+    if (onlycolumn || !IsMultiColumn(cell))
        column_info[column_of_cell(cell)].left_line = line;
-       return true;
+    else
+        cellinfo_of_cell(cell)->left_line = line;
+    return true;
 }
 
 
-bool LyXTabular::SetRightLine(int cell, bool line)
+bool LyXTabular::SetRightLine(int cell, bool line, bool onlycolumn)
 {
+    if (onlycolumn || !IsMultiColumn(cell))
        column_info[right_column_of_cell(cell)].right_line = line;
-       return true;
+    else
+        cellinfo_of_cell(cell)->right_line = line;
+    return true;
 }
 
 
-char LyXTabular::GetAlignment(int cell)
+LyXAlignment LyXTabular::GetAlignment(int cell, bool onlycolumn) const
 {
-       if (IsMultiColumn(cell))
-               return cellinfo_of_cell(cell)->alignment;
-       else
-               return column_info[column_of_cell(cell)].alignment;
+    if (!onlycolumn && IsMultiColumn(cell))
+       return cellinfo_of_cell(cell)->alignment;
+    else
+       return column_info[column_of_cell(cell)].alignment;
+}
+
+
+LyXTabular::VAlignment
+LyXTabular::GetVAlignment(int cell, bool onlycolumn) const
+{
+    if (!onlycolumn && IsMultiColumn(cell))
+       return cellinfo_of_cell(cell)->valignment;
+    else
+       return column_info[column_of_cell(cell)].valignment;
+}
+
+
+string const LyXTabular::GetPWidth(int cell) const
+{
+    if (IsMultiColumn(cell))
+       return cellinfo_of_cell(cell)->p_width;
+    return column_info[column_of_cell(cell)].p_width;
 }
 
-string LyXTabular::GetPWidth(int cell)
+
+string const LyXTabular::GetColumnPWidth(int cell) const
+{
+    return column_info[column_of_cell(cell)].p_width;
+}
+
+
+string const LyXTabular::GetMColumnPWidth(int cell) const
 {
-       if (IsMultiColumn(cell))
-               return cellinfo_of_cell(cell)->p_width;
-       return column_info[column_of_cell(cell)].p_width;
+    if (IsMultiColumn(cell))
+       return cellinfo_of_cell(cell)->p_width;
+    return string();
 }
 
-string LyXTabular::GetAlignSpecial(int cell, int what)
+
+string const LyXTabular::GetAlignSpecial(int cell, int what) const
 {
     if (what == SET_SPECIAL_MULTI)
         return cellinfo_of_cell(cell)->align_special;
     return column_info[column_of_cell(cell)].align_special;
 }
 
-int LyXTabular::GetWidthOfCell(int cell)
+
+int LyXTabular::GetWidthOfCell(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 += AdditionalWidth(cell);
-  
-       return result;
+    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;
 }
 
 
-int LyXTabular::GetBeginningOfTextInCell(int cell)
+int LyXTabular::GetBeginningOfTextInCell(int cell) const
 {
-       int x = 0;
+    int x = 0;
    
-       switch (GetAlignment(cell)){
-       case LYX_ALIGN_CENTER:
-               x += (WidthOfColumn(cell) - GetWidthOfCell(cell)) / 2;
-               break;
-       case LYX_ALIGN_RIGHT:
-               x += WidthOfColumn(cell) - GetWidthOfCell(cell) + AdditionalWidth(cell);
-               break;
-       default: /* LYX_ALIGN_LEFT: nothing :-) */ 
-               break;
-       }
+    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;
+}
+
 
-       // the LaTeX Way :-(
-       x += WIDTH_OF_LINE;
-       return x;
+bool LyXTabular::IsFirstCellInRow(int cell) const
+{
+    return column_of_cell(cell) == 0;
 }
 
 
-bool LyXTabular::IsFirstCellInRow(int cell)
+int LyXTabular::GetFirstCellInRow(int row) const
 {
-       return (column_of_cell(cell) == 0);
+    if (row > (rows_-1))
+       row = rows_ - 1;
+    return cell_info[row][0].cellno;
 }
 
-bool LyXTabular::IsLastCellInRow(int cell)
+bool LyXTabular::IsLastCellInRow(int cell) const
 {
-       return (right_column_of_cell(cell) == (columns_ - 1));
+    return (right_column_of_cell(cell) == (columns_ - 1));
 }
 
 
-bool LyXTabular::calculate_width_of_column(int column)
+int LyXTabular::GetLastCellInRow(int row) 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);
+    if (row > (rows_-1))
+       row = rows_ - 1;
+    return cell_info[row][columns_-1].cellno;
 }
 
-bool LyXTabular::calculate_width_of_column_NMC(int column)
+
+bool LyXTabular::calculate_width_of_column(int column)
 {
-    int old_column_width = column_info[column].width_of_column;
+    int const 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);
+}
+
+
+//
+// calculate the with of the column without regarding REAL MultiColumn
+// cells. This means MultiColumn-cells spanning more than 1 column.
+//
+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) {
-        if (!IsMultiColumn(GetCellNumber(column, i)) &&
+        if (!IsMultiColumn(GetCellNumber(i, column), true) &&
             (cell_info[i][column].width_of_cell > max)) {
             max = cell_info[i][column].width_of_cell;
         }
@@ -854,19 +871,20 @@ bool LyXTabular::calculate_width_of_column_NMC(int column)
     return (column_info[column].width_of_column != old_column_width);
 }
 
+
 void LyXTabular::calculate_width_of_tabular()
 {
-       width_of_tabular = 0;
-       for (int i = 0; i < columns_; ++i) {
-               width_of_tabular += column_info[i].width_of_column;
-       }
+    width_of_tabular = 0;
+    for (int i = 0; i < columns_; ++i) {
+       width_of_tabular += column_info[i].width_of_column;
+    }
 }
 
 
 int LyXTabular::row_of_cell(int cell) const
 {
     if (cell >= numberofcells)
-        return rows_-1;
+        return rows_ - 1;
     else if (cell < 0)
         return 0;
     return rowofcell[cell];
@@ -876,1101 +894,1700 @@ int LyXTabular::row_of_cell(int cell) const
 int LyXTabular::column_of_cell(int cell) const
 {
     if (cell >= numberofcells)
-        return columns_-1;
+        return columns_ - 1;
     else if (cell < 0)
         return 0;
     return columnofcell[cell];
 }
 
 
-int LyXTabular::right_column_of_cell(int cell) 
+int LyXTabular::right_column_of_cell(int cell) const
 {
-       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;
+    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(ostream & os, bool old_format)
+// Perfect case for a template... (Lgb)
+#if 1
+template<class T>
+string const write_attribute(string const & name, T const & t)
 {
-    if (old_format) {
-       int i, j;
-       os << "multicol5\n"
-          << rows_ << " " << columns_ << " " << is_long_tabular << " "
-          << rotate << " " << endhead << " " << endfirsthead << " "
-          << endfoot << " " << endlastfoot << "\n";
-       for (i = 0; i < rows_; ++i) {
-           os << row_info[i].top_line << " "
-              << row_info[i].bottom_line << " "
-              << row_info[i].newpage << "\n";
-       }
-       for (i = 0; i < columns_; ++i) {
-           os << column_info[i].alignment << " "
-              << column_info[i].left_line << " "
-              << column_info[i].right_line << " \""
-              << VSpace(column_info[i].p_width).asLyXCommand() << "\" \""
-              << column_info[i].align_special << "\"\n";
-       }
-
-       for (i = 0; i < rows_; ++i) {
-           for (j = 0; j < columns_; ++j) {
-               os << cell_info[i][j].multicolumn << " "
-                  << cell_info[i][j].alignment << " "
-                  << cell_info[i][j].top_line << " "
-                  << cell_info[i][j].bottom_line << " "
-                  << cell_info[i][j].rotate << " "
-                  << cell_info[i][j].linebreaks << " \""
-                  << cell_info[i][j].align_special << "\" \""
-                  << cell_info[i][j].p_width << "\"\n";
-           }
-       }
-    } else {
-       lyxerr << "New format type not yet implemented!!!\n" << endl;
-    }
+     string str = " " + name + "=\"" + tostr(t) + "\"";
+     return str;
 }
 
-
-void LyXTabular::Read(istream & is)
+template <>
+string const write_attribute(string const & name, bool const & b)
 {
-       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;
-       getline(is, s);
-       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(rows_arg, columns_arg);
-               SetLongTabular(is_long_tabular_arg);
-               SetRotateTabular(rotate_arg);
-               string tmp;
-               for (i = 0; i < rows_; ++i) {
-                       getline(is, tmp);
-               }
-               for (i = 0; i < columns_; ++i) {
-                       getline(is, tmp);
-               }
-               for (i = 0; i < rows_; ++i) {
-                       for (j = 0; j < columns_; ++j) {
-                               getline(is, tmp);
-                       }
-               }
-               set_row_column_number_info();
-               return;
-       }
-       is >> rows_arg >> columns_arg >> is_long_tabular_arg
-          >> rotate_arg >> a >> b >> c >> d;
-       Init(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();
+       return write_attribute(name, int(b));
 }
 
+#else
 
-// cell <0 will tex the preamble
-// returns the number of printed newlines
-int LyXTabular::TexEndOfCell(ostream & os, int cell)
+string const write_attribute(string const & name, int value)
 {
-    int i;
-    int ret = 0;
-    int tmp; // tmp2;
-    int fcell, nvcell;
-    if (ShouldBeVeryLastCell(cell)) {
-        // the very end at the very beginning
-        if (Linebreaks(cell))
-               os << "\\smallskip{}}";
-        if (IsMultiColumn(cell))
-               os << '}';
-        if (RotateCell(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 (RotateCell(0)) {
-                   os << "\\begin{sideways}\n";
-                ++ret;
-            }
-        } else {
-            // usual cells
-            if (Linebreaks(cell))
-                   os << "\\smallskip{}}";
-            if (IsMultiColumn(cell)){
-                   os << '}';
-            }
-            if (RotateCell(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)
-                    && !ShouldBeVeryLastCell(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;
-//                sflag2 = IsLongTabular() && (row >= 0) &&
-//                    (sflag2 || (row == endhead) || (row == endfirsthead));
-                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 && RotateCell(nvcell)) {
-                       os << "\\begin{sideways}\n";
-                    ++ret;
-                }
-            } else {
-                   os << "&\n";
-                ++ret;
-                if (nvcell < numberofcells && RotateCell(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 && Linebreaks(nvcell)) {
-//            !column_info[column_of_cell(nvcell)].p_width.empty()) {
-               os << "\\parbox{"
-                  << GetPWidth(nvcell)
-                  << "}{\\smallskip{}";
-       }
-    }
-    return ret;
+    string str = " " + name + "=\"" + tostr(value) + "\"";
+    return str;
 }
 
 
-#if 0
-// cell <0 will tex the preamble
-// returns the number of printed newlines
-int LyXTabular::RoffEndOfCell(ostream & os, int cell)
+string const write_attribute(string const & name, string const & value)
 {
-    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;
+    string str = " " + name + "=\"" + value + "\"";
+    return str;
 }
-#endif
 
 
-char const *LyXTabular::getDocBookAlign(int cell, bool isColumn)
+string const write_attribute(string const & name, bool value)
 {
-    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";
-           }
-       }
-    }
+    string str = " " + name + "=\"" + tostr(static_cast<int>(value)) + "\"";
+    return str;
 }
-
-
-// cell <0 will tex the preamble
-// returns the number of printed newlines
-int LyXTabular::DocBookEndOfCell(ostream & os, int cell, int & depth)
-{
-    int i;
-    int ret = 0;
-    //int tmp; // tmp2; // unused
-    int nvcell; // fcell; // unused
-    if (ShouldBeVeryLastCell(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)
-{
-    return (cellinfo_of_cell(cell)->multicolumn != LyXTabular::CELL_NORMAL);
+template<>
+inline
+string const tostr(LyXAlignment const & num)
+{
+    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::cellstruct* LyXTabular::cellinfo_of_cell(int cell)
-{
-    int row = row_of_cell(cell);
-    int column = column_of_cell(cell);
-    return  &cell_info[row][column];
-}
-   
-
-void LyXTabular::SetMultiColumn(int cell, int number)
+template<>
+inline
+string const tostr(LyXTabular::VAlignment const & num)
 {
-    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;
+    switch(num) {
+    case LyXTabular::LYX_VALIGN_TOP:
+       return "top";
+    case LyXTabular::LYX_VALIGN_CENTER:
+       return "center";
+    case LyXTabular::LYX_VALIGN_BOTTOM:
+       return "bottom";
     }
-    set_row_column_number_info();
-    SetWidthOfCell(cell, new_width);
+    return string();
 }
 
 
-int LyXTabular::cells_in_multicolumn(int cell)
+template<>
+inline
+string const tostr(LyXTabular::BoxType const & num)
 {
-    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;
+    switch(num) {
+    case LyXTabular::BOX_NONE:
+       return "none";
+    case LyXTabular::BOX_PARBOX:
+       return "parbox";
+    case LyXTabular::BOX_MINIPAGE:
+       return "minipage";
     }
-    return result;
+    return string();
+}
+
+
+void LyXTabular::Write(Buffer const * buf, ostream & os) const
+{
+    // header line
+    os << "<lyxtabular"
+       << write_attribute("version", 2)
+       << write_attribute("rows", rows_)
+       << write_attribute("columns", columns_)
+       << ">\n";
+    // global longtable options
+    os << "<features"
+       << write_attribute("rotate", tostr(rotate))
+       << write_attribute("islongtable", tostr(is_long_tabular))
+       << write_attribute("endhead", endhead)
+       << write_attribute("endfirsthead", endfirsthead)
+       << write_attribute("endfoot", endfoot)
+       << write_attribute("endlastfoot", endlastfoot)
+       << ">\n";
+    for (int j = 0; j < columns_; ++j) {
+       os << "<column"
+          << write_attribute("alignment", tostr(column_info[j].alignment))
+          << write_attribute("valignment", tostr(column_info[j].valignment))
+          << write_attribute("leftline", tostr(column_info[j].left_line))
+          << write_attribute("rightline", tostr(column_info[j].right_line))
+          << write_attribute("width",
+                             VSpace(column_info[j].p_width)
+                             .asLyXCommand())
+          << write_attribute("special", column_info[j].align_special)
+          << ">\n";
+    }
+    for (int i = 0; i < rows_; ++i) {
+       os << "<row"
+          << write_attribute("topline", tostr(row_info[i].top_line))
+          << write_attribute("bottomline", tostr(row_info[i].bottom_line))
+          << write_attribute("newpage", tostr(row_info[i].newpage))
+          << ">\n";
+       for (int j = 0; j < columns_; ++j) {
+#if 0
+           if (!i) {
+               os << "<column"
+                  << write_attribute("alignment", tostr(column_info[j].alignment))
+                  << write_attribute("valignment", tostr(column_info[j].valignment))
+                  << write_attribute("leftline", tostr(column_info[j].left_line))
+                  << write_attribute("rightline", tostr(column_info[j].right_line))
+                  << write_attribute("width",
+                                     VSpace(column_info[j].p_width)
+                                     .asLyXCommand())
+                  << write_attribute("special", column_info[j].align_special)
+                  << ">\n";
+           } else {
+               os << "<column>\n";
+           }
+#endif
+           os << "<cell"
+              << write_attribute("multicolumn", cell_info[i][j].multicolumn)
+              << write_attribute("alignment", tostr(cell_info[i][j].alignment))
+              << write_attribute("valignment", tostr(cell_info[i][j].valignment))
+              << write_attribute("topline", tostr(cell_info[i][j].top_line))
+              << write_attribute("bottomline", tostr(cell_info[i][j].bottom_line))
+              << write_attribute("leftline", tostr(cell_info[i][j].left_line))
+              << write_attribute("rightline", tostr(cell_info[i][j].right_line))
+              << write_attribute("rotate", tostr(cell_info[i][j].rotate))
+              << write_attribute("usebox", tostr(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";
+#if 0
+              << "</column>\n";
+#endif
+       }
+       os << "</row>\n";
+    }
+    os << "</lyxtabular>\n";
 }
 
 
-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;
-}
+namespace {
 
+// I would have liked a fromstr template a lot better. (Lgb)
 
-void LyXTabular::delete_column(int column)
+inline
+bool string2type(string const str, LyXAlignment & num)
 {
-    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];
-        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();
+    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;
 }
 
 
-void LyXTabular::SetLongTabular(int what)
+inline
+bool string2type(string const str, LyXTabular::VAlignment & num)
 {
-    is_long_tabular = what;
+    if (str == "top")
+       num = LyXTabular::LYX_VALIGN_TOP;
+    else if (str == "center")
+       num = LyXTabular::LYX_VALIGN_CENTER;
+    else if (str == "bottom")
+       num = LyXTabular::LYX_VALIGN_BOTTOM;
+    else
+       return false;
+    return true;
 }
 
 
-bool LyXTabular::IsLongTabular()
+inline
+bool string2type(string const str, LyXTabular::BoxType & num)
 {
-    return is_long_tabular;
+    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;
 }
 
-void LyXTabular::SetRotateTabular(int what)
-{
-    rotate = what;
-}
 
-bool LyXTabular::RotateTabular()
+inline
+bool string2type(string const str, bool & num)
 {
-    return rotate;
+    if (str == "true")
+       num = true;
+    else if (str == "false")
+       num = false;
+    else
+       return false;
+    return true;
 }
 
-void LyXTabular::SetRotateCell(int cell, int what)
-{
-    cellinfo_of_cell(cell)->rotate = what;
-}
 
-bool LyXTabular::RotateCell(int cell)
+bool getTokenValue(string const & str, const char * token, string & ret)
 {
-    return cellinfo_of_cell(cell)->rotate;
-}
+    size_t token_length = strlen(token);
+    string::size_type pos = str.find(token);
 
-bool LyXTabular::NeedRotating()
-{
-    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;
-        }
+    if (pos == string::npos || pos+token_length+1 >= str.length()
+       || str[pos+token_length] != '=')
+       return false;
+    ret.erase();
+    pos += token_length + 1;
+    char ch = str[pos];
+    if ((ch != '"') && (ch != '\'')) { // only read till next space
+       ret += ch;
+       ch = ' ';
     }
-    return false;
-}
-
+    while((pos < str.length() - 1) && (str[++pos] != ch))
+       ret += str[pos];
 
-bool LyXTabular::ShouldBeVeryLastCell(int cell)
-// "very last cell" ..of what? the row? the tabular?
-// "Cell" in this context appears to not count `virtual' cells
-{
-    if (cell < GetNumberOfCells())
-        return false;
     return true;
 }
 
-bool LyXTabular::IsLastRow(int cell)
+
+bool getTokenValue(string const & str, const char * token, int & num)
 {
-    if (row_of_cell(cell) < rows_)
-        return false;
+    string tmp;
+    if (!getTokenValue(str, token, tmp))
+       return false;
+    num = strToInt(tmp);
     return true;
 }
 
-int LyXTabular::GetCellAbove(int 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)
+bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
 {
-    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;
+    string tmp;
+    if (!getTokenValue(str, token, tmp))
+       return false;
+    return string2type(tmp, num);
 }
 
-void LyXTabular::SetLinebreaks(int cell, bool what)
-{
-    cellinfo_of_cell(cell)->linebreaks = what;
-}
 
-bool LyXTabular::Linebreaks(int cell)
+bool getTokenValue(string const & str, const char * token,
+                  LyXTabular::VAlignment & num)
 {
-    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;
+    string tmp;
+    if (!getTokenValue(str, token, tmp))
+       return false;
+    return string2type(tmp, num);
 }
 
-void LyXTabular::SetLTHead(int cell, bool first)
-{
-    int row = row_of_cell(cell);
-
-    if (first) {
-        if (row == endfirsthead)
-            endfirsthead = -1;
-        else
-            endfirsthead = row;
-    } else {
-        if (row == endhead)
-            endhead = -1;
-        else
-            endhead = row;
-    }
-}
 
-bool LyXTabular::RowOfLTHead(int cell)
+bool getTokenValue(string const & str, const char * token,
+                  LyXTabular::BoxType & num)
 {
-    if ((endhead+1) > rows_)
-        endhead = -1;
-    return (row_of_cell(cell) == endhead);
+    string tmp;
+    if (!getTokenValue(str, token, tmp))
+       return false;
+    return string2type(tmp, num);
 }
 
-bool LyXTabular::RowOfLTFirstHead(int cell)
-{
-    if ((endfirsthead+1) > rows_)
-        endfirsthead = -1;
-    return (row_of_cell(cell) == endfirsthead);
-}
 
-void LyXTabular::SetLTFoot(int cell, bool last)
+bool getTokenValue(string const & str, const char * token, bool & flag)
 {
-    int row = row_of_cell(cell);
+    string tmp;
+    if (!getTokenValue(str, token, tmp))
+       return false;
+    return string2type(tmp, flag);
+}    
 
-    if (last) {
-        if (row == endlastfoot)
-            endlastfoot = -1;
-        else
-            endlastfoot = row;
-    } else {
-        if (row == endfoot)
-            endfoot = -1;
-        else
-            endfoot = row;
-    }
-}
 
-bool LyXTabular::RowOfLTFoot(int cell)
+inline
+void l_getline(istream & is, string & str)
 {
-    if ((endfoot+1) > rows_) {
-        endfoot = -1;
-        return false;
+    str.erase();
+    while (str.empty()) {
+       getline(is, str);
+       if (!str.empty() && str[str.length() - 1] == '\r')
+           str.erase(str.length() - 1);
     }
-    return (row_of_cell(cell) == endfoot);
 }
 
-bool LyXTabular::RowOfLTLastFoot(int cell)
-{
-    if ((endlastfoot+1) > rows_)
-        endlastfoot = -1;
-    return (row_of_cell(cell) == endlastfoot);
-}
+} // namespace anon
 
-void LyXTabular::SetLTNewPage(int cell, bool what)
-{
-    row_info[row_of_cell(cell)].newpage = what;
-}
 
-bool LyXTabular::LTNewPage(int cell)
+void LyXTabular::Read(Buffer const * buf, LyXLex & lex)
 {
-    return row_info[row_of_cell(cell)].newpage;
-}
+       string line;
+       istream & is = lex.getStream();
 
-void LyXTabular::SetAscentOfRow(int row, int height)
-{
-    if (row >= rows_)
-        return;
-    row_info[row].ascent_of_row = height;
-}
+       l_getline(is, line);
+       if (!prefixIs(line, "<lyxtabular ")
+           && !prefixIs(line, "<LyXTabular ")) {
+               OldFormatRead(lex, line);
+               return;
+       }
 
-void LyXTabular::SetDescentOfRow(int row, int height)
-{
-    if (row >= rows_)
-        return;
-    row_info[row].descent_of_row = height;
+       int version;
+       if (!getTokenValue(line, "version", version))
+               return;
+       if (version == 1)
+               ReadOld(buf, is, lex, line);
+       else if (version == 2)
+               ReadNew(buf, is, lex, line);
 }
 
-int LyXTabular::AscentOfRow(int row)
-{
-    if (row >= rows_)
-        return 0;
-    return row_info[row].ascent_of_row;
-}
 
-int LyXTabular::DescentOfRow(int row)
+void LyXTabular::ReadNew(Buffer const * buf, istream & is,
+                        LyXLex & lex, string const & l)
 {
-    if (row >= rows_)
-        return 0;
+    string line(l);
+    int rows_arg;
+    if (!getTokenValue(line, "rows", rows_arg))
+       return;
+    int columns_arg;
+    if (!getTokenValue(line, "columns", columns_arg))
+       return;
+    Init(rows_arg, columns_arg);
+    l_getline(is, line);
+    if (!prefixIs(line, "<features")) {
+       lyxerr << "Wrong tabular format (expected <features ...> got" <<
+           line << ")" << endl;
+       return;
+    }
+    getTokenValue(line, "rotate", rotate);
+    getTokenValue(line, "islongtable", is_long_tabular);
+    getTokenValue(line, "endhead", endhead);
+    getTokenValue(line, "endfirsthead", endfirsthead);
+    getTokenValue(line, "endfoot", endfoot);
+    getTokenValue(line, "endlastfoot", endlastfoot);
+
+    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 (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, "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;
+       }
+    }
+    while (!prefixIs(line, "</lyxtabular>")) {
+       l_getline(is, line);
+    }
+    set_row_column_number_info();
+}
+
+
+void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
+{
+    int version;
+    int i;
+    int 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;
+       
+    istream & is = lex.getStream();
+    string s(fl);
+    if (s.length() > 8)
+       version = lyx::atoi(s.substr(8, string::npos));
+    else
+       version = 1;
+
+    vector<int> cont_row_info;
+
+    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(rows_arg, columns_arg);
+       cont_row_info = vector<int>(rows_arg);
+       SetLongTabular(is_long_tabular_arg);
+       SetRotateTabular(rotate_arg);
+       string tmp;
+       for (i = 0; i < rows_; ++i) {
+           getline(is, tmp);
+           cont_row_info[i] = false;
+       }
+       for (i = 0; i < columns_; ++i) {
+           getline(is, tmp);
+       }
+       for (i = 0; i < rows_; ++i) {
+           for (j = 0; j < columns_; ++j) {
+               getline(is, tmp);
+           }
+       }
+    } else {
+       is >> rows_arg >> columns_arg >> is_long_tabular_arg
+          >> rotate_arg >> a >> b >> c >> d;
+       Init(rows_arg, columns_arg);
+       cont_row_info = vector<int>(rows_arg);
+       SetLongTabular(is_long_tabular_arg);
+       SetRotateTabular(rotate_arg);
+       endhead = a + 1;
+       endfirsthead = b + 1;
+       endfoot = c + 1;
+       endlastfoot = d + 1;
+       for (i = 0; i < rows_; ++i) {
+           a = b = c = d = e = f = g = 0;
+           is >> a >> b >> c >> d;
+           row_info[i].top_line = a;
+           row_info[i].bottom_line = b;
+           cont_row_info[i] = c;
+           row_info[i].newpage = d;
+       }
+       for (i = 0; i < columns_; ++i) {
+           string s1;
+           string s2;
+           is >> a >> b >> c;
+#if 1
+           char ch; // skip '"'
+           is >> ch;
+#else
+           // ignore is buggy but we will use it later (Lgb)
+           is.ignore(); // skip '"'
+#endif    
+           getline(is, s1, '"');
+#if 1
+           is >> ch; // skip '"'
+#else
+           // ignore is buggy but we will use it later (Lgb)
+           is.ignore(); // skip '"'
+#endif
+           getline(is, s2, '"');
+           column_info[i].alignment = static_cast<LyXAlignment>(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;
+#if 1
+               char ch;
+               is >> ch; // skip '"'
+#else
+               // ignore is buggy but we will use it later (Lgb)
+               is.ignore(); // skip '"'
+#endif
+               getline(is, s1, '"');
+#if 1
+               is >> ch; // skip '"'
+#else
+               // ignore is buggy but we will use it later (Lgb)
+               is.ignore(); // skip '"'
+#endif
+               getline(is, s2, '"');
+               cell_info[i][j].multicolumn = static_cast<char>(a);
+               cell_info[i][j].alignment = static_cast<LyXAlignment>(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].left_line = column_info[j].left_line;
+               cell_info[i][j].right_line = column_info[j].right_line;
+               cell_info[i][j].rotate = static_cast<bool>(f);
+               cell_info[i][j].usebox = static_cast<BoxType>(g);
+               cell_info[i][j].align_special = s1;
+               cell_info[i][j].p_width = s2;
+           }
+       }
+    }
+    set_row_column_number_info(true);
+
+    LyXParagraph * par = new LyXParagraph;
+    LyXParagraph * return_par = 0;
+#ifndef NEW_INSETS
+    LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE;
+    LyXParagraph::footnote_kind footnotekind = LyXParagraph::FOOTNOTE;
+#endif
+    string tmptok;
+    int pos = 0;
+    char depth = 0;
+    LyXFont font(LyXFont::ALL_INHERIT);
+    font.setLanguage(owner_->BufferOwner()->GetLanguage());
+
+    while (lex.IsOK()) {
+        lex.nextToken();
+        string const token = lex.GetString();
+        if (token.empty())
+            continue;
+       if (token == "\\layout"
+           || token == "\\end_float"
+           || token == "\\end_deeper") {
+           lex.pushToken(token);
+           break;
+       }
+       if (owner_->BufferOwner()->parseSingleLyXformat2Token(lex, par,
+                                                             return_par,
+                                                             token, pos,
+                                                             depth, font
+#ifndef NEW_INSETS
+                                                             ,
+                                                             footnoteflag,
+                                                             footnotekind
+#endif
+               ))
+       {
+           // the_end read
+           lex.pushToken(token);
+           break;
+       }
+       if (return_par) {
+           lex.printError("New Paragraph allocated! This should not happen!");
+           lex.pushToken(token);
+           delete par;
+           par = return_par;
+           break;
+       }
+    }
+    // now we have the par we should fill the insets with this!
+    int cell = 0;
+    InsetText * inset = GetCellInset(cell);
+    int row;
+
+#ifndef NEW_INSETS
+    for (int i = 0; i < par->Last(); ++i) {
+#else
+    for (int i = 0; i < par->size(); ++i) {
+#endif
+       if (par->IsNewline(i)) {
+           ++cell;
+           if (cell > GetNumberOfCells()) {
+               lyxerr << "Some error in reading old table format occured!" <<
+                   endl << "Terminating when reading cell[" << cell << "]!" <<
+                   endl;
+               delete par;
+               return;
+           }
+           row = row_of_cell(cell);
+           if (cont_row_info[row]) {
+               DeleteRow(row);
+               cont_row_info.erase(cont_row_info.begin() + row); //&cont_row_info[row]);
+               while(!IsFirstCellInRow(--cell));
+           } else {
+               inset = GetCellInset(cell);
+               continue;
+           }
+           inset = GetCellInset(cell);
+           row = row_of_cell(cell);
+           if (!cell_info[row_of_cell(cell)][column_of_cell(cell)].usebox)
+           {
+               // insert a space instead
+               par->Erase(i);
+               par->InsertChar(i, ' ');
+           }
+       }
+       par->CopyIntoMinibuffer(*owner_->BufferOwner(), i);
+#ifndef NEW_INSETS
+       inset->par->InsertFromMinibuffer(inset->par->Last());
+#else
+       inset->par->InsertFromMinibuffer(inset->par->size());
+#endif
+    }
+    delete par;
+    Reinit();
+}
+
+
+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));
+}
+
+
+LyXTabular::cellstruct * LyXTabular::cellinfo_of_cell(int cell) const
+{
+    int const row = row_of_cell(cell);
+    int const column = column_of_cell(cell);
+    return  &cell_info[row][column];
+}
+
+
+void LyXTabular::SetMultiColumn(int cell, int number)
+{
+    cellinfo_of_cell(cell)->multicolumn = 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 = CELL_PART_OF_MULTICOLUMN;
+    }
+    set_row_column_number_info();
+}
+
+
+int LyXTabular::cells_in_multicolumn(int cell) const
+{
+    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 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(bool what)
+{
+    is_long_tabular = what;
+}
+
+
+bool LyXTabular::IsLongTabular() const
+{
+    return is_long_tabular;
+}
+
+
+void LyXTabular::SetRotateTabular(bool flag)
+{
+    rotate = flag;
+}
+
+
+bool LyXTabular::GetRotateTabular() const
+{
+    return rotate;
+}
+
+
+void LyXTabular::SetRotateCell(int cell, bool flag)
+{
+    cellinfo_of_cell(cell)->rotate = flag;
+}
+
+
+bool LyXTabular::GetRotateCell(int cell) const
+{
+    return cellinfo_of_cell(cell)->rotate;
+}
+
+
+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;
+}
+
+
+bool LyXTabular::IsLastCell(int cell) const
+{
+    if ((cell + 1) < GetNumberOfCells())
+        return false;
+    return true;
+}
+
+
+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;
+}
+
+
+int LyXTabular::GetCellBelow(int cell) const
+{
+    if (row_of_cell(cell) + 1 < rows_)
+        return cell_info[row_of_cell(cell)+1][column_of_cell(cell)].cellno;
+    return cell;
+}
+
+
+int LyXTabular::GetLastCellAbove(int cell) const
+{
+    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;
+}
+
+
+int LyXTabular::GetLastCellBelow(int cell) const
+{
+    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;
+}
+
+
+int LyXTabular::GetCellNumber(int row, int column) 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;
+}
+
+
+void LyXTabular::SetUsebox(int cell, BoxType type)
+{
+    cellinfo_of_cell(cell)->usebox = type;
+}
+
+
+LyXTabular::BoxType LyXTabular::GetUsebox(int cell) const
+{
+    if (column_info[column_of_cell(cell)].p_width.empty() &&
+        !(IsMultiColumn(cell) && !cellinfo_of_cell(cell)->p_width.empty()))
+        return BOX_NONE;
+    if (cellinfo_of_cell(cell)->usebox > 1)
+       return cellinfo_of_cell(cell)->usebox;
+    return UseParbox(cell);
+}
+
+
+void LyXTabular::SetLTHead(int cell, bool first)
+{
+    int const row = row_of_cell(cell);
+    int const val = (row + 1) * (column_of_cell(cell) ? 1 : -1);
+
+    if (first) {
+        if (endfirsthead == val)
+            endfirsthead = 0;
+        else
+            endfirsthead = val;
+    } else {
+        if (endhead == val)
+            endhead = 0;
+        else
+            endhead = val;
+    }
+}
+
+
+bool LyXTabular::GetRowOfLTHead(int cell, int & row) const
+{
+    row = endhead;
+    if (abs(endhead) > rows_)
+        return false;
+    return (row_of_cell(cell) == abs(endhead) - 1);
+}
+
+
+bool LyXTabular::GetRowOfLTFirstHead(int cell, int & row) const
+{
+    row = endfirsthead;
+    if (abs(endfirsthead) > rows_)
+        return false;
+    return (row_of_cell(cell) == abs(endfirsthead) - 1);
+}
+
+
+void LyXTabular::SetLTFoot(int cell, bool last)
+{
+    int const row = row_of_cell(cell);
+    int const val = (row + 1) * (column_of_cell(cell) ? 1 : -1);
+
+    if (last) {
+        if (endlastfoot == val)
+            endlastfoot = 0;
+        else
+            endlastfoot = val;
+    } else {
+        if (endfoot == val)
+            endfoot = 0;
+        else
+            endfoot = val;
+    }
+}
+
+
+bool LyXTabular::GetRowOfLTFoot(int cell, int & row) const
+{
+    row = endfoot;
+    if ((endfoot + 1) > rows_)
+        return false;
+    return (row_of_cell(cell) == abs(endfoot) - 1);
+}
+
+
+bool LyXTabular::GetRowOfLTLastFoot(int cell, int & row) const
+{
+    row = endlastfoot;
+    if (abs(endlastfoot) > rows_)
+        return false;
+    return (row_of_cell(cell) == (abs(endlastfoot)-1));
+}
+
+
+void LyXTabular::SetLTNewPage(int cell, bool what)
+{
+    row_info[row_of_cell(cell)].newpage = what;
+}
+
+
+bool LyXTabular::GetLTNewPage(int cell) const
+{
+    return row_info[row_of_cell(cell)].newpage;
+}
+
+
+bool LyXTabular::SetAscentOfRow(int row, int height)
+{
+    if ((row >= rows_) || (row_info[row].ascent_of_row == height))
+        return false;
+    row_info[row].ascent_of_row = height;
+    return true;
+}
+
+
+bool LyXTabular::SetDescentOfRow(int row, int height)
+{
+    if ((row >= rows_) || (row_info[row].descent_of_row == height))
+        return false;
+    row_info[row].descent_of_row = height;
+    return true;
+}
+
+
+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::HeightOfTabular()
+
+int LyXTabular::GetHeightOfTabular() const
 {
-    int
-        height,
-        row;
+    int height = 0;
 
-    for(row=0,height=0;(row<rows_); ++row)
-        height += AscentOfRow(row) + DescentOfRow(row) +
-           AdditionalHeight(GetCellNumber(0,row));
+    for (int row = 0; row < rows_; ++row)
+        height += GetAscentOfRow(row) + GetDescentOfRow(row) +
+           GetAdditionalHeight(GetCellNumber(row, 0));
     return height;
 }
 
-bool LyXTabular::IsPartOfMultiColumn(int row, int column)
+
+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);
+    return (cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN);
 }
 
-int LyXTabular::Latex(ostream &)
+
+int LyXTabular::TeXTopHLine(ostream & os, int row) const
 {
-    return 0;
+    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 (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;
+}
+
+
+int LyXTabular::TeXBottomHLine(ostream & os, int row) const
+{
+    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::TeXCellPreamble(ostream & os, int cell) const
+{
+    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))
+               os << '|';
+           if (!GetPWidth(cell).empty()) {
+#warning Jürgen, are these alignments correct? (Lgb)
+               switch (GetVAlignment(cell)) {
+               case LYX_VALIGN_TOP:
+                   os << "p";
+                   break;
+               case LYX_VALIGN_CENTER:
+                   os << "m";
+                   break;
+               case LYX_VALIGN_BOTTOM:
+                   os << "b";
+                   break;
+               }
+               os << "{" << GetPWidth(cell) << '}';
+           } 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_CENTER:
+           os << "c";
+           break;
+       case LYX_VALIGN_BOTTOM:
+           os << "b";
+           break;
+       }
+       os << "]{" << GetPWidth(cell) << "}{";
+    } else if (GetUsebox(cell) == BOX_MINIPAGE) {
+       os << "\\begin{minipage}[";
+       switch (GetVAlignment(cell)) {
+#warning Jürgen, are these alignments correct? (Lgb)
+       case LYX_VALIGN_TOP:
+           os << "t";
+           break;
+       case LYX_VALIGN_CENTER:
+           os << "m";
+           break;
+       case LYX_VALIGN_BOTTOM:
+           os << "b";
+           break;
+       }
+       os << "]{" << GetPWidth(cell) << "}\n";
+       ++ret;
+    }
+    return ret;
+}
+
+
+int LyXTabular::TeXCellPostamble(ostream & os, int cell) const
+{
+    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::Latex(Buffer const * buf,
+                     ostream & os, bool fragile, bool fp) const
+{
+    int ret = 0;
+    int cell = 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].left_line)
+           os << '|';
+       if (!column_info[i].align_special.empty()) {
+           os << column_info[i].align_special;
+       } else if (!column_info[i].p_width.empty()) {
+           switch (column_info[i].valignment) {
+#warning Jürgen, are these alignments correct? (Lgb)
+           case LYX_VALIGN_TOP:
+               os << "p";
+               break;
+           case LYX_VALIGN_CENTER:
+               os << "m";
+               break;
+           case LYX_VALIGN_BOTTOM:
+               os << "b";
+               break;
+           }
+           os << "{"
+              << 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;
+
+    //+---------------------------------------------------------------------
+    //+                      the single row and columns (cells)            +
+    //+---------------------------------------------------------------------
+
+    for (int i = 0; i < rows_; ++i) {
+       ret += TeXTopHLine(os, i);
+       int bret = ret;
+       if (IsLongTabular()) {
+           if ((endhead < 0) && (i == (abs(endhead)-1))) {
+               os << "\\endhead\n";
+               ++ret;
+           }
+           if ((endfirsthead < 0) && (i == (abs(endfirsthead)-1))) {
+               os << "\\endfirsthead\n";
+               ++ret;
+           }
+           if ((endfoot < 0) && (i == (abs(endfoot)-1))) {
+               os << "\\endfoot\n";
+               ++ret;
+           }
+           if ((endlastfoot < 0) && (i == (abs(endlastfoot)-1))) {
+               os << "\\endlastfoot\n";
+               ++ret;
+           }
+       }
+       if (ret > bret) {
+           ret += TeXBottomHLine(os, i-1);
+           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->par->isRightToLeftPar(buf->params) &&
+#ifndef NEW_INSETS
+                   inset->par->Last() > 0 && GetPWidth(cell).empty();
+#else
+                   inset->par->size() > 0 && GetPWidth(cell).empty();
+#endif
+           if (rtl)
+               os << "\\R{";
+           ret += inset->Latex(buf, os, fragile, fp);
+           if (rtl)
+               os << "}";
+
+           ret += TeXCellPostamble(os, cell);
+           if (!IsLastCellInRow(cell)) { // not last cell in row
+               os << "&\n";
+               ++ret;
+           }
+           ++cell;
+       }
+       os << "\\\\\n";
+       ret += TeXBottomHLine(os, i);
+       bret = ret;
+       if (IsLongTabular()) {
+           if ((endhead > 0) && (i == (endhead - 1))) {
+               os << "\\endhead\n";
+               ++ret;
+           }
+           if ((endfirsthead > 0) && (i == (endfirsthead - 1))) {
+               os << "\\endfirsthead\n";
+               ++ret;
+           }
+           if ((endfoot > 0) && (i == (endfoot - 1))) {
+               os << "\\endfoot\n";
+               ++ret;
+           }
+           if ((endlastfoot > 0) && (i == (endlastfoot - 1))) {
+               os << "\\endlastfoot\n";
+               ++ret;
+           }
+//         if (ret > bret)
+//             ret += TeXBottomHLine(os, i);
+           if (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::DocBook(Buffer const * buf, ostream & os) 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;
+    }
+
+    //+---------------------------------------------------------------------
+    //+                      the single row and columns (cells)            +
+    //+---------------------------------------------------------------------
+
+    int cell = 0;
+    os << "<tbody>\n";
+    for (int i = 0; i < rows_; ++i) {
+        os << "<row>\n";
+       for (int j = 0; j < columns_; ++j) {
+           if (IsPartOfMultiColumn(i, 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_CENTER:
+               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);
+           os << "</entry>";
+           ++cell;
+       }
+       os << "</row>\n";
+    }
+    os << "</tbody>\n";
+    //+---------------------------------------------------------------------
+    //+                      the closing of the tabular                    +
+    //+---------------------------------------------------------------------
+
+    os << "</tgroup>";
+    ++ret;
+
+    return ret;
+}
+
+
+namespace {
+
+inline
+void print_n_chars(ostream & os, unsigned char ch, int n)
+{
+       os << string(n, ch);
+}
+
+} // namespace anon
+
+
+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;
+       print_n_chars(os, ch, len);
+       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;
+       print_n_chars(os, ch, len);
+       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) const
+{
+    ostringstream sstr;
+    int ret = GetCellInset(cell)->Ascii(buf, sstr, 0);
+
+    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;
+    }
+
+    for (unsigned int i = 0; i < len1; ++i)
+       os << " ";
+    os << sstr.str();
+    for (unsigned int i = 0; i < len2; ++i)
+       os << " ";
+    if (RightLine(cell))
+       os << " |";
+    else
+       os << "  ";
+
+    return ret;
 }
 
+
+int LyXTabular::Ascii(Buffer const * buf, ostream & os) const
+{
+    int ret = 0;
+
+    //+---------------------------------------------------------------------
+    //+           first calculate the width of the single columns          +
+    //+---------------------------------------------------------------------
+    vector<unsigned int> clen(columns_);
+
+    // 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) {
+       AsciiTopHLine(os, i, clen);
+       for (int j = 0; j < columns_; ++j) {
+           if (IsPartOfMultiColumn(i,j))
+               continue;
+           ret += AsciiPrintCell(buf, os, cell, i, j, clen);
+           ++cell;
+       }
+       os << endl;
+       AsciiBottomHLine(os, i, clen);
+    }
+    return ret;
+}
+
+
 InsetText * LyXTabular::GetCellInset(int cell) const
 {
-    return cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
+    return & cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
+}
+
+
+InsetText * LyXTabular::GetCellInset(int row, int column) const
+{
+    return GetCellInset(GetCellNumber(row, column));
 }
+
+
+void LyXTabular::Validate(LaTeXFeatures & features) const
+{
+    if (IsLongTabular())
+        features.longtable = true;
+    if (NeedRotating())
+       features.rotating = true;
+    for (int cell = 0; !features.array && (cell < numberofcells); ++cell) {
+       if (GetVAlignment(cell) != LYX_VALIGN_TOP)
+           features.array = true;
+       GetCellInset(cell)->Validate(features);
+    }
+}
+
+
+#ifndef NEW_INSETS
+LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
+{
+    LyXParagraph * par = GetCellInset(cell)->par;
+
+    for (; par; par = par->next_) {
+       for (int i = 0; i < par->Last(); ++i) {
+           if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
+               return BOX_PARBOX;
+       }
+    }
+    return BOX_NONE;
+}
+#else
+LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
+{
+    LyXParagraph * par = GetCellInset(cell)->par;
+
+    for (; par; par = par->next()) {
+       for (int i = 0; i < par->size(); ++i) {
+           if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
+               return BOX_PARBOX;
+       }
+    }
+    return BOX_NONE;
+}
+#endif