]> git.lyx.org Git - lyx.git/blobdiff - src/table.C
Baruch's graphic-inset patch.
[lyx.git] / src / table.C
index 54d9ad7958d9b00a5361c5b4e4815f029aff2715..e9972a7e7bbc56f5053f885508dcf54246c3b549 100644 (file)
  * 
  *           LyX, The Document Processor
  *      
- *       Copyright (C) 1995 Matthias Ettrich
- *        Copyright (C) 1995-1998 The LyX Team.
+ *       Copyright 1995 Matthias Ettrich
+ *        Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== 
  */
 
 #include <config.h>
 
+#include <algorithm>
 #include <cstdlib>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include "table.h"
+#include "debug.h"
 #include "vspace.h"
 #include "layout.h"
 #include "support/lstrings.h"
+#include "support/lyxmanip.h"
+#include "support/LAssert.h"
+#include "lyx_gui_misc.h"
 
-#include <algorithm>
+using std::ostream;
+using std::istream;
+using std::getline;
 using std::max;
+using std::endl;
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+static int const WIDTH_OF_LINE = 5;
 
-extern void addNewlineAndDepth(string & file, int const depth); // Jug 990923
+/// Define a few methods for the inner structs
 
-static int const WIDTH_OF_LINE = 5;
+LyXTable::cellstruct::cellstruct() 
+{
+       cellno = 0; //should be initilaized correctly later.
+       width_of_cell = 0;
+       multicolumn = LyXTable::CELL_NORMAL;
+       alignment = LYX_ALIGN_CENTER;
+       top_line = true;
+       bottom_line = false;
+       has_cont_row = false;
+       rotate = false;
+       linebreaks = false;
+}
+
+LyXTable::cellstruct::~cellstruct() 
+{
+}
+
+LyXTable::cellstruct & 
+  LyXTable::cellstruct::operator=(cellstruct const & cs)
+{
+       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;
+       has_cont_row = cs.has_cont_row;
+       rotate = cs.rotate;
+       linebreaks = cs.linebreaks;
+       return *this;
+}
+
+LyXTable::rowstruct::rowstruct() 
+{
+       top_line = true;
+       bottom_line = false;
+       is_cont_row = false;
+       ascent_of_row = 0;
+       descent_of_row = 0;
+       newpage = false;
+}
+
+// Nothing to do, but gcc 2.7.2.3 wants one... (JMarc)
+LyXTable::rowstruct::~rowstruct() 
+{
+}
+
+LyXTable::rowstruct & 
+  LyXTable::rowstruct::operator=(rowstruct const & rs)
+{
+       top_line = rs.top_line;
+       bottom_line = rs.bottom_line;
+       is_cont_row = rs.is_cont_row;
+       ascent_of_row = rs.ascent_of_row;
+       descent_of_row = rs.descent_of_row;
+       newpage = rs.newpage;
+       return *this;
+}
+
+LyXTable::columnstruct::columnstruct() 
+{
+        left_line = true;
+        right_line = false;
+        alignment = LYX_ALIGN_CENTER;
+        width_of_column = 0;
+}
+
+LyXTable::columnstruct::~columnstruct() 
+{
+}
+
+LyXTable::columnstruct & 
+  LyXTable::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 */
 LyXTable::LyXTable(int rows_arg, int columns_arg)
 {
-       Init(rows_arg, columns_arg);
+    Init(rows_arg, columns_arg);
 }
 
 
+LyXTable::LyXTable(LyXTable const & lt)
+{
+    Init(lt.rows, lt.columns);
+    
+    operator=(lt);
+}
+
 LyXTable::LyXTable(LyXLex & lex)
 {
-       istream & is = lex.getStream();
-       Read(is);
+    istream & is = lex.getStream();
+    Read(is);
 }
 
 
-LyXTable::~LyXTable() {
-       delete[] rowofcell;
-       delete[] columnofcell;
-       delete[] column_info;
-        delete[] row_info;
-       for (int i = 0; i < rows; ++i) {
-               delete[] cell_info[i]; // verify that this shoudn't be freed with delete
-       }
-       delete[] cell_info;
+LyXTable::~LyXTable()
+{
+    delete[] rowofcell;
+    delete[] columnofcell;
+    delete[] column_info;
+    delete[] row_info;
+    for (int i = 0; i < rows; ++i) {
+       delete[] cell_info[i];
+    }
+    delete[] cell_info;
 }
 
 
+LyXTable & LyXTable::operator=(LyXTable const & lt)
+{
+    // If this and lt is not of the same size we have a serious bug
+    // So then it is ok to throw an exception, or for now
+    // call abort()
+    Assert(rows == lt.rows && columns == lt.columns);
+
+    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];
+    }
+
+    SetLongTable(lt.is_long_table);
+    rotate = lt.rotate;
+    Reinit();
+    
+    return *this;
+}
+
 LyXTable * LyXTable::Clone()
 {
     LyXTable * result = new LyXTable(rows, columns);
-    int row, column;;
+    int row, column;
 
     for (row = 0; row < rows; ++row) {
         for (column = 0; column < columns; ++column) {
@@ -97,32 +227,14 @@ void LyXTable::Init(int rows_arg, int columns_arg)
     int cellno = 0;
     for (i = 0; i < rows; ++i) {
         cell_info[i] = new cellstruct[columns];
-        row_info[i].top_line = true;
-        row_info[i].bottom_line = false;
-        row_info[i].is_cont_row = false;
-        row_info[i].newpage = false;
         for (j = 0; j < columns; ++j) {
             cell_info[i][j].cellno = cellno++;
-            cell_info[i][j].width_of_cell = 0;
-            cell_info[i][j].multicolumn = LyXTable::CELL_NORMAL;
-            cell_info[i][j].alignment = LYX_ALIGN_CENTER;
-            cell_info[i][j].top_line = row_info[i].top_line;
-            cell_info[i][j].bottom_line = row_info[i].bottom_line;
-            cell_info[i][j].has_cont_row = false;
-            cell_info[i][j].rotate = false;
-            cell_info[i][j].linebreaks = false;
         }
     }
     row_info[i-1].bottom_line = true;
     row_info[0].bottom_line = true;
 
     for (i = 0; i < columns; ++i) {
-        column_info[i].left_line = true;
-        column_info[i].right_line = false;
-        column_info[i].alignment = LYX_ALIGN_CENTER;
-        // set width_of_column to zero before it is used in
-        // calculate_width_of_column() (thornley)
-        column_info[i].width_of_column = 0;
         calculate_width_of_column(i);
     }
     column_info[i-1].right_line = true;
@@ -775,7 +887,7 @@ void LyXTable::calculate_width_of_table()
 }
 
 
-int LyXTable::row_of_cell(int cell) 
+int LyXTable::row_of_cell(int cell) const
 {
     if (cell >= numberofcells)
         return rows-1;
@@ -785,7 +897,7 @@ int LyXTable::row_of_cell(int cell)
 }
 
 
-int LyXTable::column_of_cell(int cell)
+int LyXTable::column_of_cell(int cell) const
 {
     if (cell >= numberofcells)
         return columns-1;
@@ -806,29 +918,30 @@ int LyXTable::right_column_of_cell(int cell)
 }
 
 
-void LyXTable::Write(ostream & os)
+void LyXTable::Write(ostream & os, bool old_format)
 {
-    int i, j;
-    os << "multicol5\n"
-       << rows << " " << columns << " " << is_long_table << " "
-       << rotate << " " << endhead << " " << endfirsthead << " "
-       << endfoot << " " << endlastfoot << "\n";
-    for (i = 0; i < rows; ++i) {
+    if (old_format) {
+       int i, j;
+       os << "multicol5\n"
+          << rows << " " << columns << " " << is_long_table << " "
+          << 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].is_cont_row << " "
               << row_info[i].newpage << "\n";
-    }
-    for (i = 0; i < columns; ++i) {
+       }
+       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) {
+       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 << " "
@@ -838,7 +951,10 @@ void LyXTable::Write(ostream & os)
                   << 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;
     }
 }
 
@@ -861,18 +977,19 @@ void LyXTable::Read(istream & is)
        int h = 0;
        
        string s;
-       getline(is, s);
+       while(!s.length())
+           getline(is, s);
        if (s.length() > 8)
                version = atoi(s.c_str() + 8);
        else
                version = 1;
-#ifdef WITH_WARNINGS
-#warning Insert a error message window here that this format is not supported anymore
-#endif
        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_table_arg
                           >> rotate_arg >> a >> b >> c >> d;
@@ -955,7 +1072,7 @@ void LyXTable::Read(istream & is)
 
 // cell <0 will tex the preamble
 // returns the number of printed newlines
-int LyXTable::TexEndOfCell(string & file, int cell)
+int LyXTable::TexEndOfCell(ostream & os, int cell)
 {
     int i;
     int ret = 0;
@@ -964,14 +1081,14 @@ int LyXTable::TexEndOfCell(string & file, int cell)
     if (ShouldBeVeryLastCell(cell)) {
         // the very end at the very beginning
         if (Linebreaks(cell))
-            file += "\\smallskip{}}";
+               os << "\\smallskip{}}";
         if (IsMultiColumn(cell))
-            file += '}';
+               os << '}';
         if (RotateCell(cell)) {
-            file += "\n\\end{sideways}";
+               os << "\n\\end{sideways}";
             ++ret;
         }
-        file += "\\\\\n";
+        os << "\\\\\n";
         ++ret;
     
         tmp = 0;
@@ -982,30 +1099,30 @@ int LyXTable::TexEndOfCell(string & file, int cell)
                 ++tmp;
         }
         if (tmp == NumberOfCellsInRow(fcell)) {
-            file += "\\hline ";
+               os << "\\hline ";
         } else {
             tmp = 0;
             for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
                 if (BottomLine(fcell + i)) {
-                   file += "\\cline{";
-                   file += tostr(column_of_cell(fcell + i) + 1);
-                   file += '-';
-                   file += tostr(right_column_of_cell(fcell + i) + 1);
-                   file += "} ";
+                       os << "\\cline{"
+                          << column_of_cell(fcell + i) + 1
+                          << '-'
+                          << right_column_of_cell(fcell + i) + 1
+                          << "} ";
                     tmp = 1;
                 }
             }
         }
         if (tmp){
-            file += '\n';
+               os << '\n';
             ++ret;
         }
         if (is_long_table)
-            file += "\\end{longtable}";
+               os << "\\end{longtable}";
         else
-            file += "\\end{tabular}";
+               os << "\\end{tabular}";
         if (rotate) {
-            file += "\n\\end{sideways}";
+               os << "\n\\end{sideways}";
             ++ret;
         }
     } else {
@@ -1013,39 +1130,39 @@ int LyXTable::TexEndOfCell(string & file, int cell)
         if (cell < 0){
             // preamble
             if (rotate) {
-                file += "\\begin{sideways}\n";
+                   os << "\\begin{sideways}\n";
                 ++ret;
             }
             if (is_long_table)
-                file += "\\begin{longtable}{";
+                   os << "\\begin{longtable}{";
             else
-                file += "\\begin{tabular}{";
+                   os << "\\begin{tabular}{";
             for (i = 0; i < columns; ++i) {
                 if (column_info[i].left_line)
-                   file += '|';
+                       os << '|';
                 if (!column_info[i].align_special.empty()) {
-                    file += column_info[i].align_special.c_str();
+                       os << column_info[i].align_special;
                 } else if (!column_info[i].p_width.empty()) {
-                    file += "p{";
-                    file += column_info[i].p_width;
-                    file += '}';
+                       os << "p{"
+                          << column_info[i].p_width
+                          << '}';
                 } else {
                     switch (column_info[i].alignment) {
                       case LYX_ALIGN_LEFT:
-                          file += 'l';
+                             os << 'l';
                           break;
                       case LYX_ALIGN_RIGHT:
-                          file += 'r';
+                             os << 'r';
                           break;
                       default:
-                          file += 'c';
+                             os << 'c';
                           break;
                     }
                 }
                 if (column_info[i].right_line)
-                    file += '|';
+                       os << '|';
             }
-            file += "}\n";
+            os << "}\n";
             ++ret;
             tmp = 0;
             if (GetNumberOfCells()) {
@@ -1055,38 +1172,38 @@ int LyXTable::TexEndOfCell(string & file, int cell)
                         ++tmp;
                 }
                 if (tmp == NumberOfCellsInRow(fcell)){
-                    file += "\\hline ";
+                       os << "\\hline ";
                 } else {
                     tmp = 0;
                     for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
                         if (TopLine(fcell + i)) {
-                           file += "\\cline{";
-                           file += tostr(column_of_cell(fcell + i) + 1);
-                           file += '-';
-                           file += tostr(right_column_of_cell(fcell + i) + 1);
-                           file += "} ";
-                            tmp = 1;
+                               os << "\\cline{"
+                                  << column_of_cell(fcell + i) + 1
+                                  << '-'
+                                  << right_column_of_cell(fcell + i) + 1
+                                  << "} ";
+                               tmp = 1;
                         }
                     }
                 }
                 if (tmp){
-                    file += '\n';
+                       os << '\n';
                     ++ret;
                 }
             }
             if (RotateCell(0)) {
-                file += "\\begin{sideways}\n";
+                   os << "\\begin{sideways}\n";
                 ++ret;
             }
         } else {
             // usual cells
             if (Linebreaks(cell))
-                file += "\\smallskip{}}";
+                   os << "\\smallskip{}}";
             if (IsMultiColumn(cell)){
-                file += '}';
+                   os << '}';
             }
             if (RotateCell(cell)) {
-                file += "\n\\end{sideways}";
+                   os << "\n\\end{sideways}";
                 ++ret;
             }
             if (IsLastCell(cell)) {
@@ -1110,7 +1227,7 @@ int LyXTable::TexEndOfCell(string & file, int cell)
                 //   & this row is a special header/footer
                 bool pr_top_hline = (flag1 && flag2) || (!flag1 && !flag2) ||
                     (endfirsthead == endhead);
-                file += "\\\\\n";
+                os << "\\\\\n";
                 ++ret;
                 tmp = 0;
                 fcell = cell;
@@ -1121,17 +1238,17 @@ int LyXTable::TexEndOfCell(string & file, int cell)
                         ++tmp;
                 }
                 if (tmp == NumberOfCellsInRow(cell)){
-                    file += "\\hline ";
+                       os << "\\hline ";
                     hline1 = "\\hline ";
                 } else {
                     tmp = 0;
                     for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
                         if (BottomLine(fcell + i)){
-                            file += "\\cline{";
-                            file += tostr(column_of_cell(fcell + i) + 1);
-                            file += '-';
-                            file += tostr(right_column_of_cell(fcell + i) + 1);
-                            file += "} ";
+                               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 += '-';
@@ -1142,27 +1259,28 @@ int LyXTable::TexEndOfCell(string & file, int cell)
                     }
                 }
                 if (tmp){
-                    file += '\n';
+                       os << '\n';
                     ++ret;
                 }
                 if (IsLongTable() && (row == endfoot)) {
-                    file += "\\endfoot\n";
+                       os << "\\endfoot\n";
                     ++ret;
                     print_hline = false; // no double line below footer
                 }
                 if (IsLongTable() && (row == endlastfoot)) {
-                    file += "\\endlastfoot\n";
+                       os << "\\endlastfoot\n";
                     ++ret;
                     print_hline = false; // no double line below footer
                 }
                 if (IsLongTable() && row_info[row].newpage) {
-                    file += "\\newpage\n";
+                       os << "\\newpage\n";
                     ++ret;
                     print_hline = false; // no line below a \\newpage-command
                 }
                 tmp = 0;
-                if (nvcell < numberofcells && (cell < GetNumberOfCells() - 1) &&
-                    !ShouldBeVeryLastCell(cell)) {
+                if (nvcell < numberofcells
+                   && (cell < GetNumberOfCells() - 1)
+                    && !ShouldBeVeryLastCell(cell)) {
                     fcell = nvcell;
                     for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
                         if (TopLine(fcell + i))
@@ -1170,18 +1288,18 @@ int LyXTable::TexEndOfCell(string & file, int cell)
                     }
                     if (tmp == NumberOfCellsInRow(fcell)) {
                         if (print_hline)
-                            file += "\\hline ";
+                               os << "\\hline ";
                         hline2 = "\\hline ";
                     } else {
                         tmp = 0;
                         for (i = 0; i < NumberOfCellsInRow(fcell); ++i) {
                             if (TopLine(fcell + i)) {
                                 if (print_hline) {
-                                   file += "\\cline{";
-                                   file += tostr(column_of_cell(fcell+i)+1);
-                                   file += '-';
-                                   file += tostr(right_column_of_cell(fcell+i)+1);
-                                   file += "} ";
+                                       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);
@@ -1193,7 +1311,7 @@ int LyXTable::TexEndOfCell(string & file, int cell)
                         }
                     }
                     if (tmp && print_hline){
-                        file += '\n';
+                           os << '\n';
                         ++ret;
                     }
                 }
@@ -1213,82 +1331,83 @@ int LyXTable::TexEndOfCell(string & file, int cell)
                     ((row == endfoot) || (row == endlastfoot));
                 --row;
                 if (IsLongTable() && (row == endhead)) {
-                   file += "\\endhead\n";
+                       os << "\\endhead\n";
                     ++ret;
                 }
                 if (IsLongTable() && (row == endfirsthead)) {
-                    file += "\\endfirsthead\n";
+                       os << "\\endfirsthead\n";
                     ++ret;
                 }
                 if (sflag1) { // add the \hline for next foot row
                     if (!hline1.empty()) {
-                        file += hline1 + '\n';
+                           os << hline1 + '\n';
                         ++ret;
                     }
                 }
                 // add the \hline for the first row
                 if (pr_top_hline && sflag2) {
                     if (!hline2.empty()) {
-                        file += hline2 + '\n';
+                           os << hline2 + '\n';
                         ++ret;
                     }
                 }
                 if (nvcell < numberofcells && RotateCell(nvcell)) {
-                    file += "\\begin{sideways}\n";
+                       os << "\\begin{sideways}\n";
                     ++ret;
                 }
             } else {
-                file += "&\n";
+                   os << "&\n";
                 ++ret;
                 if (nvcell < numberofcells && RotateCell(nvcell)) {
-                    file += "\\begin{sideways}\n";
+                       os << "\\begin{sideways}\n";
                     ++ret;
                 }
             }
         }
         if (nvcell < numberofcells && IsMultiColumn(nvcell)) {
-            file += "\\multicolumn{";
-           file += tostr(cells_in_multicolumn(nvcell));
-           file += "}{";
-            if (!cellinfo_of_cell(cell+1)->align_special.empty()) {
-                file += cellinfo_of_cell(cell+1)->align_special;
-                file += "}{";
+               os << "\\multicolumn{"
+                  << cells_in_multicolumn(nvcell)
+                  << "}{";
+            if (!cellinfo_of_cell(nvcell)->align_special.empty()) {
+                   os << cellinfo_of_cell(nvcell)->align_special
+                      << "}{";
             } else {
                 if (LeftLine(nvcell))
-                    file += '|';
+                       os << '|';
                 if (!GetPWidth(nvcell).empty()) {
-                    file += "p{";
-                    file += GetPWidth(nvcell);
-                    file += '}';
+                       os << "p{"
+                          << GetPWidth(nvcell)
+                          << '}';
                 } else {
                     switch (GetAlignment(nvcell)) {
-                      case LYX_ALIGN_LEFT: file += 'l'; break;
-                      case LYX_ALIGN_RIGHT: file += 'r'; break;
-                      default:  file += 'c'; break;
+                   case LYX_ALIGN_LEFT: os << 'l'; break;
+                   case LYX_ALIGN_RIGHT: os << 'r'; break;
+                   default:  os << 'c'; break;
                     }
                 }
                 if (RightLine(nvcell))
-                    file += '|';
+                       os << '|';
                 //if (column_of_cell(cell+2)!= 0 && LeftLine(cell+2))
-                if (((nvcell+1) < numberofcells) &&
+                if (((nvcell + 1) < numberofcells) &&
                     (NextVirtualCell(nvcell+1) < numberofcells) &&
                     (column_of_cell(NextVirtualCell(nvcell+1))!= 0) &&
                     LeftLine(NextVirtualCell(nvcell+1)))
-                    file += '|';
-                file += "}{";
+                       os << '|';
+               
+               os << "}{";
             }
         }
         if (nvcell < numberofcells && Linebreaks(nvcell)) {
-//            !column_info[column_of_cell(nvcell)].p_width.empty()) {
-            file += "\\parbox{";
-           file += GetPWidth(nvcell);
-           file += "}{\\smallskip{}";
+               os << "\\parbox[t]{"
+                  << GetPWidth(nvcell)
+                  << "}{\\smallskip{}";
        }
     }
     return ret;
 }
 
 
+#if 0
 // cell <0 will tex the preamble
 // returns the number of printed newlines
 int LyXTable::RoffEndOfCell(ostream & os, int cell)
@@ -1381,6 +1500,7 @@ int LyXTable::RoffEndOfCell(ostream & os, int cell)
     }
     return ret;
 }
+#endif
 
 
 char const *LyXTable::getDocBookAlign(int cell, bool isColumn)
@@ -1427,121 +1547,122 @@ char const *LyXTable::getDocBookAlign(int cell, bool isColumn)
     }
 }
 
+
 // cell <0 will tex the preamble
 // returns the number of printed newlines
-int LyXTable::DocBookEndOfCell(string & file, int cell, int &depth)
+int LyXTable::DocBookEndOfCell(ostream & os, int cell, int & depth)
 {
     int i;
     int ret = 0;
     //int tmp; // tmp2; // unused
     int nvcell; // fcell; // unused
     if (ShouldBeVeryLastCell(cell)) {
-       addNewlineAndDepth(file,--depth);
-        file += "</ENTRY>";
-       addNewlineAndDepth(file,--depth);
-        file += "</ROW>";
-       addNewlineAndDepth(file,--depth);
-        file += "</TBODY>";
-       addNewlineAndDepth(file,--depth);
+           os << newlineAndDepth(--depth)
+              << "</ENTRY>"
+              << newlineAndDepth(--depth)
+              << "</ROW>"
+              << newlineAndDepth(--depth)
+              << "</TBODY>"
+              << newlineAndDepth(--depth);
         if (is_long_table)
-            file += "</TGROUP>";
+               os << "</TGROUP>";
         else
-            file += "</TGROUP>";
-       addNewlineAndDepth(file,--depth);
+               os << "</TGROUP>"
+                  << newlineAndDepth(--depth);
         ret += 4;
     } else {
-        nvcell = NextVirtualCell(cell+1);
+        nvcell = NextVirtualCell(cell + 1);
         if (cell < 0) {
             // preamble
             if (is_long_table)
-                file += "<TGROUP ";
+                   os << "<TGROUP ";
             else
-                file += "<TGROUP ";
-            file += "COLS='";
-            file += tostr(columns);
-            file += "' COLSEP='1' ROWSEP='1'>";
-           addNewlineAndDepth(file,++depth);
+                   os << "<TGROUP ";
+            os << "COLS='"
+              << columns
+              << "' COLSEP='1' ROWSEP='1'>"
+              << newlineAndDepth(++depth);
             ++ret;
             for (i = 0; i < columns; ++i) {
-                file += "<COLSPEC ALIGN='";
-               file += getDocBookAlign(i, true);
-               file += "' COLNAME='col";
-                file += tostr(i+1);
-                file += "' COLNUM='";
-                file += tostr(i+1);
-               file += "' COLSEP='";
+                   os << "<COLSPEC ALIGN='"
+                      << getDocBookAlign(i, true)
+                      << "' COLNAME='col"
+                      << i + 1
+                      << "' COLNUM='"
+                      << i + 1
+                      << "' COLSEP='";
                if (i == (columns-1)) {
-                    file += '1';
+                      os << '1';
                } else {
                    if (column_info[i].right_line ||
                        column_info[i+1].left_line)
-                       file += '1';
+                          os << '1';
                    else
-                       file += '0';
+                          os << '0';
                }
-               file += "'>";
-               addNewlineAndDepth(file, depth);
+               os << "'>"
+                 << newlineAndDepth(depth);
                 ++ret;
 #ifdef NOT_HANDLED_YET_AS_I_DONT_KNOW_HOW
                 if (column_info[i].left_line)
-                    file += '|';
+                       os << '|';
 #endif
             }
-            file += "<TBODY>";
-           addNewlineAndDepth(file,++depth);
-            file += "<ROW>";
-           addNewlineAndDepth(file,++depth);
-            file += "<ENTRY ALIGN='";
-            file += getDocBookAlign(0);
-           file += "'";
+            os << "<TBODY>"
+              << newlineAndDepth(++depth)
+              << "<ROW>"
+              << newlineAndDepth(++depth)
+              << "<ENTRY ALIGN='"
+              << getDocBookAlign(0)
+              << "'";
            if (IsMultiColumn(0)) {
-               file += " NAMEST='col1' NAMEEND='col";
-               file += tostr(cells_in_multicolumn(0));
-               file += "'";
+                  os << " NAMEST='col1' NAMEEND='col"
+                     << cells_in_multicolumn(0)
+                     << "'";
            }
-            file += ">";
-           addNewlineAndDepth(file,++depth);
+          os << ">"
+             << newlineAndDepth(++depth);
             ret += 3;
         } else {
             if (IsLastCell(cell)) {
-               addNewlineAndDepth(file,--depth);
-                file += "</ENTRY>";
-               addNewlineAndDepth(file,--depth);
-                file += "</ROW>";
-               addNewlineAndDepth(file, depth);
-               file += "<ROW>";
-               addNewlineAndDepth(file,++depth);
-                file += "<ENTRY ALIGN='";
-                file += getDocBookAlign(cell+1);
-                file += "' VALIGN='middle'";
-               if (IsMultiColumn(cell+1)) {
-                   file += " NAMEST='col";
-                   file += tostr(column_of_cell(cell+1) + 1);
-                   file += "' NAMEEND='col";
-                   file += tostr(column_of_cell(cell+1) +
-                       cells_in_multicolumn(cell+1));
-                   file += "'";
+                   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)
+                         << "'";
                }
-               file += ">";
-               addNewlineAndDepth(file,++depth);
+               os << ">"
+                 << newlineAndDepth(++depth);
                 ret += 4;
             } else {
-               addNewlineAndDepth(file,--depth);
-                file += "</ENTRY>";
-               addNewlineAndDepth(file, depth);
-                file += "<ENTRY ALIGN='";
-                file += getDocBookAlign(cell+1);
-                file += "' VALIGN='middle'";
-               if (IsMultiColumn(cell+1)) {
-                   file += " NAMEST='col";
-                   file += tostr(column_of_cell(cell+1) + 1);
-                   file += "' NAMEEND='col";
-                   file += tostr(column_of_cell(cell+1) +
-                       cells_in_multicolumn(cell+1));
-                   file += "'";
+                   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)
+                         << "'";
                }
-               file += ">";
-               addNewlineAndDepth(file,++depth);
+               os << ">"
+                 << newlineAndDepth(++depth);
                 ret += 3;
             }
         }
@@ -1905,3 +2026,55 @@ bool LyXTable::LTNewPage(int cell)
 {
     return row_info[row_of_cell(cell)].newpage;
 }
+
+void LyXTable::SetAscentOfRow(int row, int height)
+{
+    if (row >= rows)
+        return;
+    row_info[row].ascent_of_row = height;
+}
+
+void LyXTable::SetDescentOfRow(int row, int height)
+{
+    if (row >= rows)
+        return;
+    row_info[row].descent_of_row = height;
+}
+
+int LyXTable::AscentOfRow(int row)
+{
+    if (row >= rows)
+        return 0;
+    return row_info[row].ascent_of_row;
+}
+
+int LyXTable::DescentOfRow(int row)
+{
+    if (row >= rows)
+        return 0;
+    return row_info[row].descent_of_row;
+}
+
+int LyXTable::HeightOfTable()
+{
+    int
+        height,
+        row;
+
+    for(row=0,height=0;(row<rows); ++row)
+        height += AscentOfRow(row) + DescentOfRow(row) +
+           AdditionalHeight(GetCellNumber(0,row));
+    return height;
+}
+
+bool LyXTable::IsPartOfMultiColumn(int row, int column)
+{
+    if ((row >= rows) || (column >= columns))
+        return false;
+    return (cell_info[row][column].multicolumn==CELL_PART_OF_MULTICOLUMN);
+}
+
+int LyXTable::Latex(ostream &)
+{
+    return 0;
+}