X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.C;h=86091c6e36a02486ec4f65ffa911810f50349877;hb=7521b5d20f42102cf444e3fd8718a088a60d0098;hp=c63b540191a289f20ae41b2e0c54b0101d25e6e1;hpb=94fd1a06287642d3691d857d0e51b83fb116ae6c;p=lyx.git diff --git a/src/tabular.C b/src/tabular.C index c63b540191..86091c6e36 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -3,20 +3,22 @@ * * LyX, The Document Processor * - * Copyright 2000 The LyX Team. + * Copyright 2000-2001 The LyX Team. + * + * @author: Jürgen Vigna * * ====================================================== */ #include -#include -#include - #ifdef __GNUG__ #pragma implementation #endif +#include +#include + #include "tabular.h" #include "debug.h" #include "vspace.h" @@ -30,6 +32,7 @@ #include "support/lyxmanip.h" #include "insets/insettabular.h" #include "insets/insettext.h" +#include "gettext.h" using std::ostream; using std::istream; @@ -38,236 +41,224 @@ using std::max; using std::endl; using std::vector; -static int const WIDTH_OF_LINE = 5; - -/// Define a few methods for the inner structs - -LyXTabular::cellstruct::cellstruct() -{ - cellno = 0; //should be initilaized correctly later. - width_of_cell = 0; - multicolumn = LyXTabular::CELL_NORMAL; - alignment = LYX_ALIGN_CENTER; - top_line = true; - bottom_line = false; - rotate = false; - linebreaks = false; - inset = 0; -} - +#ifndef CXX_GLOBAL_CSTD +using std::strlen; +#endif -LyXTabular::cellstruct::~cellstruct() -{ - delete inset; -} +namespace { + int const WIDTH_OF_LINE = 5; -LyXTabular::cellstruct::cellstruct(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; - rotate = cs.rotate; - linebreaks = cs.linebreaks; - inset = 0; -} +} // namespace +/// 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; + top_line = true; + bottom_line = false; + ascent_of_row = 0; + descent_of_row = 0; + newpage = false; } LyXTabular::columnstruct::columnstruct() { - left_line = true; - right_line = false; - alignment = LYX_ALIGN_CENTER; - width_of_column = 0; + left_line = true; + right_line = false; + alignment = LYX_ALIGN_CENTER; + valignment = LYX_VALIGN_TOP; + width_of_column = 0; } /* konstruktor */ LyXTabular::LyXTabular(InsetTabular * inset, int rows_arg, int columns_arg) { - owner_ = inset; - Init(rows_arg, columns_arg); + owner_ = inset; + cur_cell = -1; + Init(rows_arg, columns_arg); } LyXTabular::LyXTabular(InsetTabular * inset, LyXTabular const & lt) { - owner_ = inset; - Init(lt.rows_, lt.columns_); - - operator=(lt); -} - - -LyXTabular::LyXTabular(InsetTabular * inset, LyXLex & lex) -{ - owner_ = inset; - Read(lex); + owner_ = inset; + cur_cell = -1; + Init(lt.rows_, lt.columns_, <); +#if 0 +#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); +#endif } -LyXTabular::~LyXTabular() +LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex) { - delete[] rowofcell; - delete[] columnofcell; + owner_ = inset; + cur_cell = -1; + Read(buf, lex); } LyXTabular & LyXTabular::operator=(LyXTabular 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_); - - 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; +#if 0 +#warning This while method should look like this: (Lgb) + + LyXTabular tmp(lt); + tmp.swap(*this); +#else + // 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() + lyx::Assert(rows_ == lt.rows_ && columns_ == lt.columns_); + cur_cell = -1; + 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; + Reinit(); +#endif + return *this; } -LyXTabular * LyXTabular::Clone(InsetTabular * inset) +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! - /// - int i,j; - for(i=0; i < rows_; ++i) { - for(j=0; j < columns_; ++j) { - delete result->cell_info[i][j].inset; - result->cell_info[i][j].inset=new InsetText(*cell_info[i][j].inset, - inset->BufferOwner()); - result->cell_info[i][j].inset->setOwner(inset); + LyXTabular * result = new LyXTabular(inset, *this); +#if 0 + // 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); + } } - } - return result; +#endif + return result; } /* activates all lines and sets all widths to 0 */ -void LyXTabular::Init(int rows_arg, int columns_arg) -{ - int i, j; - int cellno = 0; - - rows_ = rows_arg; - columns_ = columns_arg; - row_info = vector(rows_, rowstruct()); - column_info = vector(columns_, columnstruct()); - cell_info = vector > - (rows_, vector(columns_, cellstruct())); - - // Jürgen, use iterators. - for (i = 0; i < rows_; ++i) { - for (j = 0; j < columns_; ++j) { - cell_info[i][j].inset = new InsetText(owner_->BufferOwner()); - cell_info[i][j].inset->setOwner(owner_); - cell_info[i][j].inset->SetDrawLockedFrame(true); - cell_info[i][j].cellno = cellno++; - } - } - row_info[i-1].bottom_line = true; - row_info[0].bottom_line = true; - - for (i = 0; i < columns_; ++i) { - calculate_width_of_column(i); - } - column_info[columns_-1].right_line = true; +void LyXTabular::Init(int rows_arg, int columns_arg, LyXTabular const * lt) +{ + rows_ = rows_arg; + columns_ = columns_arg; + row_info = row_vector(rows_, rowstruct()); + column_info = column_vector(columns_, columnstruct()); + cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct())); + + if (lt) { + operator=(*lt); + return; + } + + int cellno = 0; + for (int i = 0; i < rows_; ++i) { + for (int j = 0; j < columns_; ++j) { + cell_info[i][j].inset.setOwner(owner_); + cell_info[i][j].inset.setDrawFrame(0, InsetText::LOCKED); + cell_info[i][j].cellno = cellno++; + } + cell_info[i].back().right_line = true; + } + row_info.back().bottom_line = true; + row_info.front().bottom_line = true; + + for (int i = 0; i < columns_; ++i) { + calculate_width_of_column(i); + } + column_info.back().right_line = true; - calculate_width_of_tabular(); + calculate_width_of_tabular(); - rowofcell = 0; - columnofcell = 0; - set_row_column_number_info(); - is_long_tabular = false; - rotate = 0; - endhead = -1; - endfirsthead = -1; - endfoot = -1; - endlastfoot = -1; + rowofcell = vector(); + columnofcell = vector(); + set_row_column_number_info(); + is_long_tabular = false; + rotate = false; + endhead = 0; + endfirsthead = 0; + endfoot = 0; + endlastfoot = 0; } -void LyXTabular::AppendRow(int /* cell */) +void LyXTabular::AppendRow(int cell) { -#if 0 - int row = row_of_cell(cell); - rowstruct * row_info2 = new rowstruct[rows_ + 1]; - cellstruct ** cell_info2 = new cellstruct * [rows_ + 1]; - int i; - - for (i = 0; i <= row; ++i) { - cell_info2[i] = cell_info[i]; - row_info2[i] = row_info[i]; - } - for (i = rows_ - 1; i >= row; --i) { - cell_info2[i + 1] = cell_info[i]; - row_info2[i + 1] = row_info[i]; - } - row_info2[row + 1].top_line = row_info[i].top_line; - cell_info2[row + 1] = new cellstruct[columns_](owner_->BufferOwner()); - for (i = 0; i < columns_; ++i) { - cell_info2[row + 1][i].width_of_cell = 0; - cell_info2[row + 1][i] = cell_info2[row][i]; - } + ++rows_; - delete[] cell_info; - cell_info = cell_info2; - delete[] row_info; - row_info = row_info2; - - ++rows_; - - Reinit(); + int row = row_of_cell(cell); + + row_vector::iterator rit = row_info.begin() + row; + row_info.insert(rit, rowstruct()); + // now set the values of the row before + row_info[row] = row_info[row+1]; + +#if 0 + cell_vvector::iterator cit = cell_info.begin() + row; + cell_info.insert(cit, vector(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 (int i = row + 1; i < rows_; ++i) { + for (int j = 0; j < columns_; ++j) { + c_info[i][j] = cell_info[i-1][j]; + } + } + cell_info = c_info; + ++row; + for (int j = 0; j < columns_; ++j) { + cell_info[row][j].inset.clear(); + } #endif + Reinit(); } void LyXTabular::DeleteRow(int row) { + // 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_; @@ -275,1817 +266,2324 @@ void LyXTabular::DeleteRow(int row) } -void LyXTabular::AppendColumn(int /*cell*/) +void LyXTabular::AppendColumn(int cell) { -#if 0 - int j; - columnstruct * column_info2 = new columnstruct[columns_ + 1]; - int column = right_column_of_cell(cell); - - int i = 0; - for (; i <= column; ++i) { - column_info2[i] = column_info[i]; - } - for (i = columns_ - 1; i >= column; --i) { - column_info2[i + 1] = column_info[i]; - } - - delete[] column_info; - column_info = column_info2; - - for (i = 0; i < rows_; ++i) { - cellstruct * tmp = cell_info[i]; - cell_info[i] = new cellstruct[columns_ + 1](owner_->BufferOwner()); - for (j = 0; j <= column; ++j) { - cell_info[i][j] = tmp[j]; - } - for (j = column; j < columns_; ++j) { - cell_info[i][j + 1] = tmp[j]; - } - // care about multicolumns - if (cell_info[i][column + 1].multicolumn - == LyXTabular::CELL_BEGIN_OF_MULTICOLUMN){ - cell_info[i][column + 1].multicolumn = - LyXTabular::CELL_PART_OF_MULTICOLUMN; - } - if (column + 1 == columns_ - || cell_info[i][column + 2].multicolumn - != LyXTabular::CELL_PART_OF_MULTICOLUMN){ - cell_info[i][column + 1].multicolumn = - LyXTabular::CELL_NORMAL; - } - delete[] tmp; - } - - ++columns_; - Reinit(); -#endif -} - - -void LyXTabular::DeleteColumn(int /*cell*/) -{ -#if 0 - int column1 = column_of_cell(cell); - int column2 = right_column_of_cell(cell); - - if (column1 == 0 && column2 == columns_ - 1) - return; - - for (int column = column1; column <= column2; ++column) { - delete_column(column1); - } - Reinit(); -#endif + ++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]; + + for (int i = 0; i < rows_; ++i) { + for (int j = 0; j <= column; ++j) { + c_info[i][j] = cell_info[i][j]; + } + for (int j = column + 1; j < columns_; ++j) { + c_info[i][j] = cell_info[i][j - 1]; + } + // care about multicolumns + if (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 != CELL_PART_OF_MULTICOLUMN) { + cell_info[i][column + 1].multicolumn = LyXTabular::CELL_NORMAL; + } + } + cell_info = c_info; + //++column; + for (int i = 0; i < rows_; ++i) { + //cell_info[i][column].inset.clear(); + cell_info[i][column + 1].inset.clear(); + } + Reinit(); } -void LyXTabular::delete_column(int /*column*/) +void LyXTabular::DeleteColumn(int column) { -#if 0 - int i, j; - columnstruct * column_info2 = new columnstruct[columns_-1]; - - for (i = 0; i < column; ++i) { - column_info2[i] = column_info[i]; - } - for (i = column; i < columns_ - 1; ++i) { - column_info2[i] = column_info[i + 1]; - } - - delete[] column_info; - column_info = column_info2; - - for (i = 0; i < rows_; ++i) { - cellstruct * tmp = cell_info[i]; - cell_info[i] = new cellstruct[columns_ - 1](owner_->BufferOwner()); - for (j = 0; j < column; ++j) { - cell_info[i][j] = tmp[j]; - } - for (j = column; j < columns_ - 1; ++j) { - cell_info[i][j] = tmp[j + 1]; - } - delete[] tmp; - } - - --columns_; - Reinit(); -#endif + // 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; - - // Jürgen, use iterators. - 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; columnSetAutoBreakRows( - !GetPWidth(GetCellNumber(row, column)).empty()); - } - } + 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()); + } + } } int LyXTabular::GetNumberOfCells() const { - return numberofcells; + return numberofcells; } int LyXTabular::NumberOfCellsInRow(int cell) const { - int row = row_of_cell(cell); - int result = 0; - for (int i = 0; i < columns_; ++i) { - if (cell_info[row][i].multicolumn != LyXTabular::CELL_PART_OF_MULTICOLUMN) - ++result; - } - return result; -} - - -int LyXTabular::AppendCellAfterCell(int append_cell, int question_cell) -{ - return (right_column_of_cell(append_cell) == - right_column_of_cell(question_cell)); -} - - -int LyXTabular::DeleteCellIfColumnIsDeleted(int cell, int delete_column_cell) -{ - 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) const +bool LyXTabular::TopLine(int cell, bool onlycolumn) const { - int row = row_of_cell(cell); - - if (IsMultiColumn(cell)) - return cellinfo_of_cell(cell)->top_line; - return row_info[row].top_line; + int const row = row_of_cell(cell); + + if (!onlycolumn && IsMultiColumn(cell)) + return cellinfo_of_cell(cell)->top_line; + return row_info[row].top_line; } -bool LyXTabular::BottomLine(int cell) const +bool LyXTabular::BottomLine(int cell, bool onlycolumn) const { - //no bottom line underneath non-existent cells if you please - if(cell >= numberofcells) - return false; + // 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)) - return cellinfo_of_cell(cell)->bottom_line; - return row_info[row_of_cell(cell)].bottom_line; + 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) const +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) const +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) const { - if (GetAdditionalHeight(cell)) + int row = row_of_cell(cell); + if ((row > 0) && !GetAdditionalHeight(row)) { + int column = column_of_cell(cell); + --row; + while (column + && cell_info[row][column].multicolumn + == LyXTabular::CELL_PART_OF_MULTICOLUMN) + --column; + if (cell_info[row][column].multicolumn == LyXTabular::CELL_NORMAL) + return row_info[row].bottom_line; + else + return cell_info[row][column].bottom_line; + } return false; - 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; + 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::IsLastRow(int cell) const { - return (row_of_cell(cell) == rows_ - 1); + return (row_of_cell(cell) == rows_ - 1); } -int LyXTabular::GetAdditionalHeight(int cell) const +int LyXTabular::GetAdditionalHeight(int row) 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; - } - } - 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; - } - } - if (top && bottom) - return WIDTH_OF_LINE; - return 0; + if (!row || row >= rows_) + 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 (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; } 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::GetWidthOfColumn(int cell) const { - int column1 = column_of_cell(cell); - int column2 = right_column_of_cell(cell); - int result = 0; - int i = column1; - for (; i <= column2; ++i) { - result += column_info[i].width_of_column; - } - return result; + int const column1 = column_of_cell(cell); + int const column2 = right_column_of_cell(cell); + int result = 0; + for (int i = column1; i <= column2; ++i) { + result += column_info[i].width_of_column; + } + return result; } int LyXTabular::GetWidthOfTabular() const { - 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); - - // first set columns to 0 so we can calculate the right width - int i = column1; - for (; i <= column2; ++i) { - cell_info[row][i].width_of_cell = 0; - } - // set the width to MAX_WIDTH until width > 0 - int width = (new_width + 2 * WIDTH_OF_LINE); - for (i = column1; (i < column2) && (width > 0); ++i) { - cell_info[row][i].width_of_cell = column_info[i].width_of_column; - width -= column_info[i].width_of_column; - } - if (i == column2) { - cell_info[row][i].width_of_cell = width; - } - return true; + if (!IsMultiColumn(cell)) + return false; + + int const row = row_of_cell(cell); + int const column1 = column_of_cell(cell); + int const column2 = right_column_of_cell(cell); + + // first set columns to 0 so we can calculate the right width + for (int i = column1; i <= column2; ++i) { + cell_info[row][i].width_of_cell = 0; + } + // set the width to MAX_WIDTH until width > 0 + int width = (new_width + 2 * WIDTH_OF_LINE); + + int i = column1; + for (; i < column2 && width > column_info[i].width_of_column; ++i) { + cell_info[row][i].width_of_cell = column_info[i].width_of_column; + width -= column_info[i].width_of_column; + } + if (width > 0) { + cell_info[row][i].width_of_cell = width; + } + return true; } 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; - for (; i <= column2; ++i) - cell_info[row][i].width_of_cell = 0; - for(i = cell + 1; (i < numberofcells) && (!IsMultiColumn(i)); ++i) - ; - if (i < numberofcells) - recalculateMulticolCells(i, GetWidthOfCell(i) - (2 * WIDTH_OF_LINE)); - SetWidthOfMulticolCell(cell, new_width); + // first set columns to 0 so we can calculate the right width + int i = column1; + for (; i <= column2; ++i) + cell_info[row][i].width_of_cell = 0; + for (i = cell + 1; (i < numberofcells) && (!IsMultiColumn(i)); ++i) + ; + if (i < numberofcells) + recalculateMulticolCells(i, GetWidthOfCell(i) - (2 * WIDTH_OF_LINE)); + SetWidthOfMulticolCell(cell, new_width); } /* 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 width = 0; - - if (IsMultiColumn(cell)) { - tmp = SetWidthOfMulticolCell(cell, new_width); - } else { - width = (new_width + 2*WIDTH_OF_LINE); - cell_info[row][column1].width_of_cell = width; - if (column_info[column1].right_line && (column1 < columns_-1) && - column_info[column1+1].left_line) // additional width - cell_info[row][column1].width_of_cell += WIDTH_OF_LINE; - tmp = calculate_width_of_column_NMC(column1); - } - if (tmp) { - int i; - for(i = 0; ialignment = align; - return true; -} - - -bool LyXTabular::SetPWidth(int cell, string const & width) -{ - bool flag = !width.empty(); - - if (IsMultiColumn(cell)) { - cellinfo_of_cell(cell)->p_width = width; - GetCellInset(cell)->SetAutoBreakRows(flag); - } else { - int j = column_of_cell(cell); - int c; - column_info[j].p_width = width; + int const row = row_of_cell(cell); + int const column1 = column_of_cell(cell); + bool tmp = false; + int width = 0; + + 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); + cell_info[row][column1].width_of_cell = width; + if (column_info[column1].right_line && (column1 < columns_-1) && + column_info[column1+1].left_line) // additional width + cell_info[row][column1].width_of_cell += WIDTH_OF_LINE; + tmp = calculate_width_of_column_NMC(column1); + } + if (tmp) { + int i = 0; + for (; ialignment = align; + return true; +} + + +bool LyXTabular::SetVAlignment(int cell, VAlignment align, bool onlycolumn) +{ + 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) { - c = GetCellNumber(i, j); - flag = !GetPWidth(c).empty(); // because of multicolumns! - GetCellInset(c)->SetAutoBreakRows(flag); + 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; + return true; } -bool LyXTabular::SetAlignSpecial(int cell, string const & special, int what) +bool LyXTabular::SetMColumnPWidth(int cell, string const & width) { - if (what == SET_SPECIAL_MULTI) - cellinfo_of_cell(cell)->align_special = special; - else - column_info[column_of_cell(cell)].align_special = special; - return true; + bool const flag = !width.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; + else + column_info[column_of_cell(cell)].align_special = special; + return true; } bool LyXTabular::SetAllLines(int cell, bool line) { - SetTopLine(cell, line); - SetBottomLine(cell, line); - SetRightLine(cell, line); - SetLeftLine(cell, line); - return true; + SetTopLine(cell, line); + SetBottomLine(cell, line); + SetRightLine(cell, line); + SetLeftLine(cell, line); + return true; +} + + +bool LyXTabular::SetTopLine(int cell, bool line, bool onlycolumn) +{ + int const row = row_of_cell(cell); + + if (onlycolumn || !IsMultiColumn(cell)) + row_info[row].top_line = line; + else + cellinfo_of_cell(cell)->top_line = line; + return true; } -bool LyXTabular::SetTopLine(int cell, bool line) +bool LyXTabular::SetBottomLine(int cell, bool line, bool onlycolumn) { - int row = row_of_cell(cell); + if (onlycolumn || !IsMultiColumn(cell)) + row_info[row_of_cell(cell)].bottom_line = line; + else + cellinfo_of_cell(cell)->bottom_line = line; + return true; +} + - if (!IsMultiColumn(cell)) - row_info[row].top_line = line; - else - cellinfo_of_cell(cell)->top_line = line; - return true; +bool LyXTabular::SetLeftLine(int cell, bool line, bool onlycolumn) +{ + if (onlycolumn || !IsMultiColumn(cell)) + column_info[column_of_cell(cell)].left_line = line; + else + cellinfo_of_cell(cell)->left_line = line; + return true; } -bool LyXTabular::SetBottomLine(int cell, bool line) +bool LyXTabular::SetRightLine(int cell, bool line, bool onlycolumn) { - if (!IsMultiColumn(cell)) - row_info[row_of_cell(cell)].bottom_line = line; - else - cellinfo_of_cell(cell)->bottom_line = line; - return true; + if (onlycolumn || !IsMultiColumn(cell)) + column_info[right_column_of_cell(cell)].right_line = line; + else + cellinfo_of_cell(cell)->right_line = line; + return true; } -bool LyXTabular::SetLeftLine(int cell, bool line) +LyXAlignment LyXTabular::GetAlignment(int cell, bool onlycolumn) const { - column_info[column_of_cell(cell)].left_line = line; - return true; + if (!onlycolumn && IsMultiColumn(cell)) + return cellinfo_of_cell(cell)->alignment; + else + return column_info[column_of_cell(cell)].alignment; } -bool LyXTabular::SetRightLine(int cell, bool line) +LyXTabular::VAlignment +LyXTabular::GetVAlignment(int cell, bool onlycolumn) const { - column_info[right_column_of_cell(cell)].right_line = line; - return true; + if (!onlycolumn && IsMultiColumn(cell)) + return cellinfo_of_cell(cell)->valignment; + else + return column_info[column_of_cell(cell)].valignment; } -char LyXTabular::GetAlignment(int cell) const +string const LyXTabular::GetPWidth(int cell) const { - if (IsMultiColumn(cell)) - return cellinfo_of_cell(cell)->alignment; - else - return column_info[column_of_cell(cell)].alignment; + if (IsMultiColumn(cell)) + return cellinfo_of_cell(cell)->p_width; + return column_info[column_of_cell(cell)].p_width; } -string LyXTabular::GetPWidth(int cell) const +string const LyXTabular::GetColumnPWidth(int cell) const { - if (IsMultiColumn(cell)) - return cellinfo_of_cell(cell)->p_width; - return column_info[column_of_cell(cell)].p_width; + return column_info[column_of_cell(cell)].p_width; } -string LyXTabular::GetAlignSpecial(int cell, int what) const +string const LyXTabular::GetMColumnPWidth(int cell) const { - if (what == SET_SPECIAL_MULTI) - return cellinfo_of_cell(cell)->align_special; - return column_info[column_of_cell(cell)].align_special; + if (IsMultiColumn(cell)) + return cellinfo_of_cell(cell)->p_width; + return string(); +} + + +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) const { - int row = row_of_cell(cell); - int column1 = column_of_cell(cell); - int column2 = right_column_of_cell(cell); - int result = 0; - int i = column1; - for (; i <= column2; ++i) { - result += cell_info[row][i].width_of_cell; - } - -// result += GetAdditionalWidth(cell); - - return result; + 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) const { - int x = 0; + int x = 0; - switch (GetAlignment(cell)){ - case LYX_ALIGN_CENTER: - x += (GetWidthOfColumn(cell) - GetWidthOfCell(cell)) / 2; - break; - case LYX_ALIGN_RIGHT: - x += GetWidthOfColumn(cell) - GetWidthOfCell(cell); - // + GetAdditionalWidth(cell); - break; - default: /* LYX_ALIGN_LEFT: nothing :-) */ - break; - } - - // the LaTeX Way :-( - x += WIDTH_OF_LINE; - return x; + switch (GetAlignment(cell)){ + case LYX_ALIGN_CENTER: + x += (GetWidthOfColumn(cell) - GetWidthOfCell(cell)) / 2; + break; + case LYX_ALIGN_RIGHT: + x += GetWidthOfColumn(cell) - GetWidthOfCell(cell); + // + GetAdditionalWidth(cell); + break; + default: /* LYX_ALIGN_LEFT: nothing :-) */ + break; + } + + // the LaTeX Way :-( + x += WIDTH_OF_LINE; + return x; } bool LyXTabular::IsFirstCellInRow(int cell) const { - return (column_of_cell(cell) == 0); + return column_of_cell(cell) == 0; } int LyXTabular::GetFirstCellInRow(int row) const { - if (row > (rows_-1)) - row = rows_ - 1; - return cell_info[row][0].cellno; + if (row > (rows_-1)) + row = rows_ - 1; + return cell_info[row][0].cellno; } bool LyXTabular::IsLastCellInRow(int cell) const { - return (right_column_of_cell(cell) == (columns_ - 1)); + return (right_column_of_cell(cell) == (columns_ - 1)); } int LyXTabular::GetLastCellInRow(int row) const { - if (row > (rows_-1)) - row = rows_ - 1; - return cell_info[row][columns_-1].cellno; + if (row > (rows_-1)) + row = rows_ - 1; + return cell_info[row][columns_-1].cellno; } bool LyXTabular::calculate_width_of_column(int column) { - int old_column_width = column_info[column].width_of_column; - int maximum = 0; - - for (int i = 0; i < rows_; ++i) { - maximum = max(cell_info[i][column].width_of_cell, maximum); - } - column_info[column].width_of_column = maximum; - return (column_info[column].width_of_column != old_column_width); + int 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 old_column_width = column_info[column].width_of_column; - int max = 0; - for (int i = 0; i < rows_; ++i) { - if (!IsMultiColumn(GetCellNumber(i, column)) && - (cell_info[i][column].width_of_cell > max)) { - max = cell_info[i][column].width_of_cell; - } - } - column_info[column].width_of_column = max; - return (column_info[column].width_of_column != old_column_width); + int const old_column_width = column_info[column].width_of_column; + int max = 0; + for (int i = 0; i < rows_; ++i) { + if (!IsMultiColumn(GetCellNumber(i, column), true) && + (cell_info[i][column].width_of_cell > max)) { + max = cell_info[i][column].width_of_cell; + } + } + column_info[column].width_of_column = max; + return (column_info[column].width_of_column != old_column_width); } 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; - else if (cell < 0) - return 0; - return rowofcell[cell]; + if (cell >= numberofcells) + return rows_ - 1; + else if (cell < 0) + return 0; + return rowofcell[cell]; } int LyXTabular::column_of_cell(int cell) const { - if (cell >= numberofcells) - return columns_-1; - else if (cell < 0) - return 0; - return columnofcell[cell]; + if (cell >= numberofcells) + return columns_ - 1; + else if (cell < 0) + return 0; + return columnofcell[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; -} - - -void LyXTabular::Write(ostream & os) const -{ - int i, j; - - // header line - os << "" << endl; - // global longtable options - os << "" << endl << endl; - for (i = 0; i < rows_; ++i) { - os << "" << endl; - for (j = 0; j < columns_; ++j) { - if (!i) { - os << "" << endl; - } else { - os << "" << endl; - } - os << "" << endl; - os << "\\begin_inset "; - cell_info[i][j].inset->Write(os); - os << "\n\\end_inset " << endl; - os << "" << endl; - os << "" << endl; - } - os << "" << endl; - } - os << "" << endl; -} - - -static -bool getTokenValue(string const str, const char * token, string & ret) -{ - int pos = str.find(token); - char ch = str[pos+strlen(token)]; - - if ((pos < 0) || (ch != '=')) - return false; - ret.erase(); - pos += strlen(token)+1; - ch = str[pos]; - if ((ch != '"') && (ch != '\'')) { // only read till next space - ret += ch; - ch = ' '; - } - while((pos < int(str.length()-1)) && (str[++pos] != ch)) - ret += str[pos]; + int 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; +} + + +// Perfect case for a template... (Lgb) +#if 1 +template +string const write_attribute(string const & name, T const & t) +{ + string str = " " + name + "=\"" + tostr(t) + "\""; + return str; +} - return true; +template <> +string const write_attribute(string const & name, bool const & b) +{ + return write_attribute(name, int(b)); } +#else -static -bool getTokenValue(string const str, const char * token, int & num) +string const write_attribute(string const & name, int value) { - string ret; - int pos = str.find(token); - char ch = str[pos+strlen(token)]; + string str = " " + name + "=\"" + tostr(value) + "\""; + return str; +} - if ((pos < 0) || (ch != '=')) - return false; - ret.erase(); - pos += strlen(token)+1; - ch = str[pos]; - if ((ch != '"') && (ch != '\'')) { // only read till next space - if (!isdigit(ch)) - return false; - ret += ch; - } - ++pos; - while((pos < int(str.length()-1)) && isdigit(str[pos])) - ret += str[pos++]; - num = strToInt(ret); - return true; +string const write_attribute(string const & name, string const & value) +{ + string str = " " + name + "=\"" + value + "\""; + return str; } -static -bool getTokenValue(string const str, const char * token, bool & flag) +string const write_attribute(string const & name, bool value) { - string ret; - int pos = str.find(token); - char ch = str[pos+strlen(token)]; + string str = " " + name + "=\"" + tostr(static_cast(value)) + "\""; + return str; +} +#endif + + +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(); +} + + +template<> +inline +string const tostr(LyXTabular::VAlignment const & num) +{ + switch(num) { + case LyXTabular::LYX_VALIGN_TOP: + return "top"; + case LyXTabular::LYX_VALIGN_CENTER: + return "center"; + case LyXTabular::LYX_VALIGN_BOTTOM: + return "bottom"; + } + return string(); +} + + +template<> +inline +string const tostr(LyXTabular::BoxType const & num) +{ + switch(num) { + case LyXTabular::BOX_NONE: + return "none"; + case LyXTabular::BOX_PARBOX: + return "parbox"; + case LyXTabular::BOX_MINIPAGE: + return "minipage"; + } + return string(); +} + + +void LyXTabular::Write(Buffer const * buf, ostream & os) const +{ + // header line + os << "\n"; + // global longtable options + os << "\n"; + for (int j = 0; j < columns_; ++j) { + os << "\n"; + } + for (int i = 0; i < rows_; ++i) { + os << "\n"; + for (int j = 0; j < columns_; ++j) { + os << "\n"; + os << "\\begin_inset "; + cell_info[i][j].inset.write(buf, os); + os << "\n\\end_inset \n" + << "\n"; + } + os << "\n"; + } + os << "\n"; +} + + +namespace { + +// I would have liked a fromstr template a lot better. (Lgb) + +inline +bool string2type(string const str, LyXAlignment & num) +{ + if (str == "none") + num = LYX_ALIGN_NONE; + else if (str == "block") + num = LYX_ALIGN_BLOCK; + else if (str == "left") + num = LYX_ALIGN_LEFT; + else if (str == "center") + num = LYX_ALIGN_CENTER; + else if (str == "right") + num = LYX_ALIGN_RIGHT; + else + return false; + return true; +} + + +inline +bool string2type(string const str, LyXTabular::VAlignment & num) +{ + if (str == "top") + num = LyXTabular::LYX_VALIGN_TOP; + else if (str == "center") + num = LyXTabular::LYX_VALIGN_CENTER; + else if (str == "bottom") + num = LyXTabular::LYX_VALIGN_BOTTOM; + else + return false; + return true; +} + + +inline +bool string2type(string const str, LyXTabular::BoxType & num) +{ + 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; +} + + +inline +bool string2type(string const str, bool & num) +{ + if (str == "true") + num = true; + else if (str == "false") + num = false; + else + return false; + return true; +} + + +bool getTokenValue(string const & str, const char * token, string & ret) +{ + size_t token_length = strlen(token); + string::size_type pos = str.find(token); + + if (pos == string::npos || pos + token_length + 1 >= str.length() + || str[pos + token_length] != '=') + return false; + ret.erase(); + pos += token_length + 1; + char ch = str[pos]; + if ((ch != '"') && (ch != '\'')) { // only read till next space + ret += ch; + ch = ' '; + } + while((pos < str.length() - 1) && (str[++pos] != ch)) + ret += str[pos]; + + return true; +} + + +bool getTokenValue(string const & str, const char * token, int & num) +{ + string tmp; + if (!getTokenValue(str, token, tmp)) + return false; + num = strToInt(tmp); + return true; +} + + +bool getTokenValue(string const & str, const char * token, LyXAlignment & num) +{ + string tmp; + if (!getTokenValue(str, token, tmp)) + return false; + return string2type(tmp, num); +} + + +bool getTokenValue(string const & str, const char * token, + LyXTabular::VAlignment & num) +{ + string tmp; + if (!getTokenValue(str, token, tmp)) + return false; + return string2type(tmp, num); +} - if ((pos < 0) || (ch != '=')) - return false; - ret.erase(); - pos += strlen(token)+1; - ch = str[pos]; - if ((ch != '"') && (ch != '\'')) { // only read till next space - if (!isdigit(ch)) - return false; - ret += ch; - } - ++pos; - while((pos < int(str.length()-1)) && isdigit(str[pos])) - ret += str[pos++]; - flag = strToInt(ret); - return true; +bool getTokenValue(string const & str, const char * token, + LyXTabular::BoxType & num) +{ + string tmp; + if (!getTokenValue(str, token, tmp)) + return false; + return string2type(tmp, num); } +bool getTokenValue(string const & str, const char * token, bool & flag) +{ + string tmp; + if (!getTokenValue(str, token, tmp)) + return false; + return string2type(tmp, flag); +} + + +inline void l_getline(istream & is, string & str) { - getline(is, str); - while(str.empty()) - getline(is, str); -} - - -void LyXTabular::Read(LyXLex & lex) -{ - string line; - istream & is = lex.getStream(); - - l_getline(is, line); - if (!prefixIs(line, " got" << - line << ")" << endl; - return; - } - (void)getTokenValue(line, "islongtable", is_long_tabular); - (void)getTokenValue(line, "endhead", endhead); - (void)getTokenValue(line, "endfirsthead", endfirsthead); - (void)getTokenValue(line, "endfoot", endfoot); - (void)getTokenValue(line, "endlastfoot", endlastfoot); - int i, j; - for(i = 0; i < rows_; ++i) { + str.erase(); + while (str.empty()) { + getline(is, str); + if (!str.empty() && str[str.length() - 1] == '\r') + str.erase(str.length() - 1); + } +} + +} // namespace anon + + +void LyXTabular::Read(Buffer const * buf, LyXLex & lex) +{ + string line; + istream & is = lex.getStream(); + l_getline(is, line); - if (!prefixIs(line, " got" << - line << ")" << endl; - return; - } - (void)getTokenValue(line, "topline", row_info[i].top_line); - (void)getTokenValue(line, "bottomline", row_info[i].bottom_line); - (void)getTokenValue(line, "newpage", row_info[i].newpage); - for (j = 0; j < columns_; ++j) { - l_getline(is,line); - if (!prefixIs(line," got" << - line << ")" << endl; + if (!prefixIs(line, " got" << - line << ")" << endl; + } + + int version; + if (!getTokenValue(line, "version", version)) return; - } - (void)getTokenValue(line, "multicolumn", cell_info[i][j].multicolumn); - (void)getTokenValue(line, "alignment", cell_info[i][j].alignment); - (void)getTokenValue(line, "topline", cell_info[i][j].top_line); - (void)getTokenValue(line, "bottomline", cell_info[i][j].bottom_line); - (void)getTokenValue(line, "rotate", cell_info[i][j].rotate); - (void)getTokenValue(line, "linebreaks", cell_info[i][j].linebreaks); - (void)getTokenValue(line, "width", cell_info[i][j].p_width); - (void)getTokenValue(line, "special", cell_info[i][j].align_special); - l_getline(is, line); - if (prefixIs(line, "\\begin_inset")) { - cell_info[i][j].inset->Read(lex); - l_getline(is, line); - } - if (line != "") { - lyxerr << "Wrong tabular format (expected got" << - line << ")" << endl; + if (version == 1) + ReadOld(buf, is, lex, line); + else if (version == 2) + ReadNew(buf, is, lex, line); +} + + +void LyXTabular::ReadNew(Buffer const * buf, istream & is, + LyXLex & lex, string const & l) +{ + string line(l); + int rows_arg; + if (!getTokenValue(line, "rows", rows_arg)) return; - } - l_getline(is, line); - if (line != "") { - lyxerr << "Wrong tabular format (expected got" << - line << ")" << endl; + int columns_arg; + if (!getTokenValue(line, "columns", columns_arg)) return; - } - } + Init(rows_arg, columns_arg); l_getline(is, line); - if (line != "") { - lyxerr << "Wrong tabular format (expected got" << - line << ")" << endl; - return; + if (!prefixIs(line, " got" << + line << ")" << endl; + return; } - } - while (line != "") { - l_getline(is, line); - } - set_row_column_number_info(); + 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," 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, " 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, " 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, "")) { + lyxerr << "Wrong tabular format (expected got" << + line << ")" << endl; + return; + } + } + l_getline(is, line); + if (!prefixIs(line, "")) { + lyxerr << "Wrong tabular format (expected got" << + line << ")" << endl; + return; + } + } + while (!prefixIs(line, "")) { + l_getline(is, line); + } + set_row_column_number_info(); } void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl) { - int version; - int i, j; - int rows_arg = 0; - int columns_arg = 0; - int is_long_tabular_arg = false; - int rotate_arg = false; - int a = -1; - int b = -1; - int c = -1; - int d = -1; - int e = 0; - int f = 0; - int g = 0; - int h = 0; + 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 = atoi(s.c_str() + 8); - else - version = 1; - - vector 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(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; + istream & is = lex.getStream(); + string s(fl); + if (s.length() > 8) + version = lyx::atoi(s.substr(8, string::npos)); + else + version = 1; + + vector 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(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(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(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(a); + cell_info[i][j].alignment = static_cast(b); + cell_info[i][j].top_line = static_cast(c); + cell_info[i][j].bottom_line = static_cast(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(f); + cell_info[i][j].usebox = static_cast(g); + cell_info[i][j].align_special = s1; + cell_info[i][j].p_width = s2; + } + } } - for (i = 0; i < columns_; ++i) { - getline(is, tmp); + set_row_column_number_info(true); + + Paragraph * par = new Paragraph; + Paragraph * return_par = 0; + + string tmptok; + int pos = 0; + Paragraph::depth_type 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)) { + // 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; + } } - for (i = 0; i < rows_; ++i) { - for (j = 0; j < columns_; ++j) { - getline(is, tmp); - } + // now we have the par we should fill the insets with this! + int cell = 0; + InsetText * inset = GetCellInset(cell); + int row; + + for (int i = 0; i < par->size(); ++i) { + 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); + inset->paragraph()->insertFromMinibuffer(inset->paragraph()->size()); } - } 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(rows_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; - cont_row_info[i] = 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(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(a); - cell_info[i][j].alignment = static_cast(b); - cell_info[i][j].top_line = static_cast(c); - cell_info[i][j].bottom_line = static_cast(d); - cell_info[i][j].rotate = static_cast(f); - cell_info[i][j].linebreaks = static_cast(g); - cell_info[i][j].align_special = s1; - cell_info[i][j].p_width = s2; - } - } - } - set_row_column_number_info(); - - LyXParagraph * par = new LyXParagraph; - LyXParagraph * return_par = 0; - LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE; - LyXParagraph::footnote_kind footnotekind = LyXParagraph::FOOTNOTE; - string token, tmptok; - int pos = 0; - char depth = 0; - LyXFont font(LyXFont::ALL_SANE); - - while (lex.IsOK()) { - lex.nextToken(); - token = lex.GetString(); - if (token.empty()) - continue; - if ((token == "\\layout") || (token == "\\end_float")) { - lex.pushToken(token); - break; - } - if (owner_->BufferOwner()->parseSingleLyXformat2Token(lex, par, - return_par, - token, pos, - depth, font, - footnoteflag, - footnotekind)) - { - // 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; - - for(int i=0; i < par->Last(); ++i) { - if (par->IsNewline(i)) { - ++cell; - if (cell > GetNumberOfCells()) { - lyxerr << "Some error in reading old table format occured!" << - endl << "Terminating when reading cell[" << cell << "]!" << - endl; - 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)].linebreaks) - { - // insert a space instead - par->Erase(i); - par->InsertChar(i, ' '); - } - } - par->CopyIntoMinibuffer(i); - inset->par->InsertFromMinibuffer(inset->par->Last()); - } - Reinit(); -} - - -char const * LyXTabular::GetDocBookAlign(int cell, bool isColumn) const -{ - int i = isColumn ? cell : column_of_cell(cell); - - //if (isColumn) - //i = cell; - //else - //i = column_of_cell(cell); - if (!isColumn && IsMultiColumn(cell)) { - if (!cellinfo_of_cell(cell)->align_special.empty()) { - return cellinfo_of_cell(cell)->align_special.c_str(); - } else { - switch (GetAlignment(cell)) { - case LYX_ALIGN_LEFT: - return "left"; - case LYX_ALIGN_RIGHT: - return "right"; - default: - return "center"; - } - } - } else { - if (!column_info[i].align_special.empty()) { - return column_info[i].align_special.c_str(); - } -#ifdef IGNORE_THIS_FOR_NOW - else if (!column_info[i].p_width.empty()) { - file += "p{"; - file += column_info[i].p_width; - file += '}'; - } -#endif - else { - switch (column_info[i].alignment) { - case LYX_ALIGN_LEFT: - return "left"; - case LYX_ALIGN_RIGHT: - return "right"; - default: - return "center"; - } - } - } -} - - -// cell <0 will tex the preamble -// returns the number of printed newlines -int LyXTabular::DocBookEndOfCell(ostream & os, int cell, int & depth) const -{ - int i; - int ret = 0; - //int tmp; // tmp2; // unused - int nvcell; // fcell; // unused - if (IsLastCell(cell)) { - os << newlineAndDepth(--depth) - << "" - << newlineAndDepth(--depth) - << "" - << newlineAndDepth(--depth) - << "" - << newlineAndDepth(--depth); - if (is_long_tabular) - os << ""; - else - os << "" - << newlineAndDepth(--depth); - ret += 4; - } else { - nvcell = cell + 1; - if (cell < 0) { - // preamble - if (is_long_tabular) - os << "" - << newlineAndDepth(++depth); - ++ret; - for (i = 0; i < columns_; ++i) { - os << "" - << newlineAndDepth(depth); - ++ret; -#ifdef NOT_HANDLED_YET_AS_I_DONT_KNOW_HOW - if (column_info[i].left_line) - os << '|'; -#endif - } - os << "" - << newlineAndDepth(++depth) - << "" - << newlineAndDepth(++depth) - << "" - << newlineAndDepth(++depth); - ret += 3; - } else { - if (IsLastCellInRow(cell)) { - os << newlineAndDepth(--depth) - << "" - << newlineAndDepth(--depth) - << "" - << newlineAndDepth(depth) - << "" - << newlineAndDepth(++depth) - << "" - << newlineAndDepth(++depth); - ret += 4; - } else { - os << newlineAndDepth(--depth) - << "" - << newlineAndDepth(depth) - << "" - << newlineAndDepth(++depth); - ret += 3; - } - } - } - return ret; -} - - -bool LyXTabular::IsMultiColumn(int cell) const -{ - return (cellinfo_of_cell(cell)->multicolumn != LyXTabular::CELL_NORMAL); + 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 row = row_of_cell(cell); - int column = column_of_cell(cell); - return &cell_info[row][column]; + 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) { - int new_width = cellinfo_of_cell(cell)->width_of_cell; - - cellinfo_of_cell(cell)->multicolumn = LyXTabular::CELL_BEGIN_OF_MULTICOLUMN; - cellinfo_of_cell(cell)->alignment = column_info[column_of_cell(cell)].alignment; - cellinfo_of_cell(cell)->top_line = row_info[row_of_cell(cell)].top_line; - cellinfo_of_cell(cell)->bottom_line = row_info[row_of_cell(cell)].bottom_line; - for (number--; number > 0; --number) { - cellinfo_of_cell(cell+number)->multicolumn = - LyXTabular::CELL_PART_OF_MULTICOLUMN; - new_width += cellinfo_of_cell(cell+number)->width_of_cell; - } - set_row_column_number_info(); - SetWidthOfCell(cell, new_width); + 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 row = row_of_cell(cell); - int column = column_of_cell(cell); - int result = 1; - ++column; - while (column < columns_ && cell_info[row][column].multicolumn - == LyXTabular::CELL_PART_OF_MULTICOLUMN){ - ++result; - ++column; - } - return result; + int const row = row_of_cell(cell); + int column = column_of_cell(cell); + int result = 1; + ++column; + while ((column < columns_) && + cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN) + { + ++result; + ++column; + } + return result; } int LyXTabular::UnsetMultiColumn(int cell) { - int row = row_of_cell(cell); - int column = column_of_cell(cell); - - int result = 0; - - if (cell_info[row][column].multicolumn - == LyXTabular::CELL_BEGIN_OF_MULTICOLUMN){ - cell_info[row][column].multicolumn = LyXTabular::CELL_NORMAL; - ++column; - while (column < columns_ && - cell_info[row][column].multicolumn - == LyXTabular::CELL_PART_OF_MULTICOLUMN){ - cell_info[row][column].multicolumn = - LyXTabular::CELL_NORMAL; - ++column; - ++result; - } - } - set_row_column_number_info(); - return result; + int const row = row_of_cell(cell); + int column = column_of_cell(cell); + + int result = 0; + + if (cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN) { + cell_info[row][column].multicolumn = CELL_NORMAL; + ++column; + while ((column < columns_) && + (cell_info[row][column].multicolumn ==CELL_PART_OF_MULTICOLUMN)) + { + cell_info[row][column].multicolumn = CELL_NORMAL; + ++column; + ++result; + } + } + set_row_column_number_info(); + return result; } -void LyXTabular::SetLongTabular(int what) +void LyXTabular::SetLongTabular(bool what) { - is_long_tabular = what; + is_long_tabular = what; } bool LyXTabular::IsLongTabular() const { - return is_long_tabular; + return is_long_tabular; } -void LyXTabular::SetRotateTabular(int what) +void LyXTabular::SetRotateTabular(bool flag) { - rotate = what; + rotate = flag; } bool LyXTabular::GetRotateTabular() const { - return rotate; + return rotate; } -void LyXTabular::SetRotateCell(int cell, int what) +void LyXTabular::SetRotateCell(int cell, bool flag) { - cellinfo_of_cell(cell)->rotate = what; + cellinfo_of_cell(cell)->rotate = flag; } bool LyXTabular::GetRotateCell(int cell) const { - return cellinfo_of_cell(cell)->rotate; + 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; + 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 < GetNumberOfCells()) - return false; - return true; + 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; + 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; + 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::SetLinebreaks(int cell, bool what) +void LyXTabular::SetUsebox(int cell, BoxType type) { - cellinfo_of_cell(cell)->linebreaks = what; + cellinfo_of_cell(cell)->usebox = type; } -bool LyXTabular::GetLinebreaks(int cell) const +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 false; - return cellinfo_of_cell(cell)->linebreaks; + 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 row = row_of_cell(cell); + int const row = row_of_cell(cell); + int const val = (row + 1) * (column_of_cell(cell) ? 1 : -1); - if (first) { - if (row == endfirsthead) - endfirsthead = -1; - else - endfirsthead = row; - } else { - if (row == endhead) - endhead = -1; - else - endhead = row; - } + if (first) { + if (endfirsthead == val) + endfirsthead = 0; + else + endfirsthead = val; + } else { + if (endhead == val) + endhead = 0; + else + endhead = val; + } } -bool LyXTabular::GetRowOfLTHead(int cell) const +bool LyXTabular::GetRowOfLTHead(int cell, int & row) const { - if ((endhead+1) > rows_) - return false; - return (row_of_cell(cell) == endhead); + row = endhead; + if (abs(endhead) > rows_) + return false; + return (row_of_cell(cell) == abs(endhead) - 1); } -bool LyXTabular::GetRowOfLTFirstHead(int cell) const +bool LyXTabular::GetRowOfLTFirstHead(int cell, int & row) const { - if ((endfirsthead+1) > rows_) - return false; - return (row_of_cell(cell) == endfirsthead); + row = endfirsthead; + if (abs(endfirsthead) > rows_) + return false; + return (row_of_cell(cell) == abs(endfirsthead) - 1); } void LyXTabular::SetLTFoot(int cell, bool last) { - int row = row_of_cell(cell); + int const row = row_of_cell(cell); + int const val = (row + 1) * (column_of_cell(cell) ? 1 : -1); - if (last) { - if (row == endlastfoot) - endlastfoot = -1; - else - endlastfoot = row; - } else { - if (row == endfoot) - endfoot = -1; - else - endfoot = row; - } + if (last) { + if (endlastfoot == val) + endlastfoot = 0; + else + endlastfoot = val; + } else { + if (endfoot == val) + endfoot = 0; + else + endfoot = val; + } } -bool LyXTabular::GetRowOfLTFoot(int cell) const +bool LyXTabular::GetRowOfLTFoot(int cell, int & row) const { - if ((endfoot+1) > rows_) - return false; - return (row_of_cell(cell) == endfoot); + row = endfoot; + if ((endfoot + 1) > rows_) + return false; + return (row_of_cell(cell) == abs(endfoot) - 1); } -bool LyXTabular::GetRowOfLTLastFoot(int cell) const + +bool LyXTabular::GetRowOfLTLastFoot(int cell, int & row) const { - if ((endlastfoot+1) > rows_) - return false; - return (row_of_cell(cell) == endlastfoot); + 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; + row_info[row_of_cell(cell)].newpage = what; } bool LyXTabular::GetLTNewPage(int cell) const { - return row_info[row_of_cell(cell)].newpage; + return row_info[row_of_cell(cell)].newpage; } -void LyXTabular::SetAscentOfRow(int row, int height) +bool LyXTabular::SetAscentOfRow(int row, int height) { - if (row >= rows_) - return; - row_info[row].ascent_of_row = height; + if ((row >= rows_) || (row_info[row].ascent_of_row == height)) + return false; + row_info[row].ascent_of_row = height; + return true; } -void LyXTabular::SetDescentOfRow(int row, int height) +bool LyXTabular::SetDescentOfRow(int row, int height) { - if (row >= rows_) - return; - row_info[row].descent_of_row = 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; + 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; + if (row >= rows_) + return 0; + return row_info[row].descent_of_row; } int LyXTabular::GetHeightOfTabular() const { - int height = 0; + int height = 0; - for(int row = 0; row < rows_; ++row) - height += GetAscentOfRow(row) + GetDescentOfRow(row) + - GetAdditionalHeight(GetCellNumber(row, 0)); - return height; + for (int row = 0; row < rows_; ++row) + height += GetAscentOfRow(row) + GetDescentOfRow(row) + + GetAdditionalHeight(row); + return height; } bool LyXTabular::IsPartOfMultiColumn(int row, int column) const { - if ((row >= rows_) || (column >= columns_)) - return false; - return (cell_info[row][column].multicolumn==CELL_PART_OF_MULTICOLUMN); + if ((row >= rows_) || (column >= columns_)) + return false; + return (cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN); } int LyXTabular::TeXTopHLine(ostream & os, int row) const { - int fcell = GetFirstCellInRow(row); - int n = NumberOfCellsInRow(fcell) + fcell; - int tmp=0; - int i; - - for (i = fcell; i < n; ++i) { - if (TopLine(i)) - ++tmp; - } - if (tmp == (n - fcell)){ - os << "\\hline "; - } else { - for (i = fcell; i < n; ++i) { - if (TopLine(i)) { - os << "\\cline{" - << column_of_cell(i) + 1 - << '-' - << right_column_of_cell(i) + 1 - << "} "; - } - } - } - if (tmp) { - os << endl; + 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; - } - return 0; } int LyXTabular::TeXBottomHLine(ostream & os, int row) const { - int fcell = GetFirstCellInRow(row); - int n = NumberOfCellsInRow(fcell) + fcell; - int tmp = 0; - int i; - - for (i = fcell; i < n; ++i) { - if (BottomLine(i)) - ++tmp; - } - if (tmp == (n-fcell)){ - os << "\\hline"; - } else { - for (i = fcell; i < n; ++i) { - if (BottomLine(i)) { - os << "\\cline{" - << column_of_cell(i) + 1 - << '-' - << right_column_of_cell(i) + 1 - << "} "; - } - } - } - if (tmp) { - os << endl; + 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; - } - return 0; } int LyXTabular::TeXCellPreamble(ostream & os, int cell) const { - int ret = 0; + int ret = 0; - if (GetRotateCell(cell)) { - os << "\\begin{sideways}" << endl; + if (GetRotateCell(cell)) { + os << "\\begin{sideways}\n"; + ++ret; + } + if (IsMultiColumn(cell)) { + os << "\\multicolumn{" << cells_in_multicolumn(cell) << "}{"; + if (!cellinfo_of_cell(cell)->align_special.empty()) { + os << cellinfo_of_cell(cell)->align_special << "}{"; + } else { + if (LeftLine(cell) && + (IsFirstCellInRow(cell) || + (!IsMultiColumn(cell-1) && !LeftLine(cell, true) && + !RightLine(cell-1, true)))) + { + os << '|'; + } + if (!GetPWidth(cell).empty()) { + 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)) { + 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) { + 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; - } - if (IsMultiColumn(cell)) { - os << "\\multicolumn{" << cells_in_multicolumn(cell) << "}{"; - if (!cellinfo_of_cell(cell+1)->align_special.empty()) { - os << cellinfo_of_cell(cell+1)->align_special << "}{"; - } else { - if (LeftLine(cell)) - os << '|'; - if (!GetPWidth(cell).empty()) { - os << "p{" << GetPWidth(cell) << '}'; - } else { - switch (GetAlignment(cell)) { + + //+--------------------------------------------------------------------- + //+ 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->paragraph()->isRightToLeftPar(buf->params) && + inset->paragraph()->size() > 0 && GetPWidth(cell).empty(); + + 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 << "\n"; + + for (int i = 0; i < columns_; ++i) { + os << "\n"; + ++ret; + } + + //+--------------------------------------------------------------------- + //+ the single row and columns (cells) + + //+--------------------------------------------------------------------- + + int cell = 0; + os << "\n"; + for (int i = 0; i < rows_; ++i) { + os << "\n"; + for (int j = 0; j < columns_; ++j) { + if (IsPartOfMultiColumn(i, j)) + continue; + + os << ""; + ret += GetCellInset(cell)->docBook(buf, os); + os << ""; + ++cell; } - } - if (RightLine(cell)) - os << '|'; - if (((cell + 1) < numberofcells) && !IsFirstCellInRow(cell+1) && - LeftLine(cell+1)) - os << '|'; - os << "}{"; + os << "\n"; } - } - if (GetLinebreaks(cell)) { - os << "\\parbox[t]{" << GetPWidth(cell) << "}{\\smallskip{}"; - } - return ret; + os << "\n"; + //+--------------------------------------------------------------------- + //+ the closing of the tabular + + //+--------------------------------------------------------------------- + + os << ""; + ++ret; + + return ret; } -int LyXTabular::TeXCellPostamble(ostream & os, int cell) const +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 const & clen) const { - int ret = 0; + int const fcell = GetFirstCellInRow(row); + int const n = NumberOfCellsInRow(fcell) + fcell; + int tmp = 0; - // usual cells - if (GetLinebreaks(cell)) - os << "\\smallskip{}}"; - if (IsMultiColumn(cell)){ - os << '}'; - } - if (GetRotateCell(cell)) { - os << endl << "\\end{sideways}"; - ++ret; - } - return ret; + 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::Latex(ostream & os, bool fragile, bool fp) const +int LyXTabular::AsciiBottomHLine(ostream & os, int row, + vector const & clen) const { - int ret = 0; - int i,j; - int cell = 0; + int const fcell = GetFirstCellInRow(row); + int const n = NumberOfCellsInRow(fcell) + fcell; + int tmp = 0; - //+--------------------------------------------------------------------- - //+ first the opening preamble + - //+--------------------------------------------------------------------- + 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; +} - if (rotate) { - os << "\\begin{sideways}" << endl; - ++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'; + +int LyXTabular::AsciiPrintCell(Buffer const * buf, ostream & os, + int cell, int row, int column, + vector 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: - os << 'r'; + case LYX_ALIGN_RIGHT: + len1 = len2; + len2 = 0; break; - default: - os << 'c'; + case LYX_ALIGN_CENTER: + len1 = len2 / 2; + len2 -= len1; break; - } - } - if (column_info[i].right_line) - os << '|'; - } - os << "}" << endl; - ++ret; - - //+--------------------------------------------------------------------- - //+ the single row and columns (cells) + - //+--------------------------------------------------------------------- - - for(i=0; i < rows_; ++i) { - ret += TeXTopHLine(os, i); - for(j=0; j < columns_; ++j) { - if (IsPartOfMultiColumn(i,j)) - continue; - ret += TeXCellPreamble(os, cell); - ret += GetCellInset(cell)->Latex(os, fragile, fp); - ret += TeXCellPostamble(os, cell); - if (!IsLastCellInRow(cell)) { // not last cell in row - os << "&" << endl; - ++ret; - } - ++cell; - } - os << "\\\\" << endl; - ret += TeXBottomHLine(os, i); - if (IsLongTabular()) { - if (i == endhead) { - os << "\\endhead\n"; - ++ret; - } - if (i == endfirsthead) { - os << "\\endfirsthead\n"; - ++ret; - } - if (i == endfoot) { - os << "\\endfoot\n"; - ++ret; - } - if (i == endlastfoot) { - os << "\\endlastfoot\n"; - ++ret; - } - if (row_info[i].newpage) { - os << "\\newpage\n"; - ++ret; - } } - } - //+--------------------------------------------------------------------- - //+ the closing of the tabular + - //+--------------------------------------------------------------------- + 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 << " "; - if (is_long_tabular) - os << "\\end{longtable}"; - else - os << "\\end{tabular}"; - if (rotate) { - os << "\n\\end{sideways}"; - ++ret; - } + return ret; +} + + +int LyXTabular::Ascii(Buffer const * buf, ostream & os) const +{ + int ret = 0; - return ret; + //+--------------------------------------------------------------------- + //+ first calculate the width of the single columns + + //+--------------------------------------------------------------------- + vector 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; + cur_cell = cell; + return & cell_info[row_of_cell(cell)][column_of_cell(cell)].inset; +} + + +InsetText * LyXTabular::GetCellInset(int row, int column) const +{ +#ifdef WITH_WARNINGS +#warning Juergen, should we check whether the row/column values are correct? +// If we do not need to do that, the tests in GetCellNumber should be +// changed to asserts. +#endif + cur_cell = GetCellNumber(row, column); + return & cell_info[row][column].inset; } + void LyXTabular::Validate(LaTeXFeatures & features) const { - if (IsLongTabular()) - features.longtable = true; - if (NeedRotating()) - features.rotating = true; - for(int cell = 0; cell < numberofcells; ++cell) - GetCellInset(cell)->Validate(features); + 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); + } +} + + +std::vector const LyXTabular::getLabelList() const +{ + std::vector label_list; + for (int i = 0; i < rows_; ++i) + for (int j = 0; j < columns_; ++j) { + std::vector const l = + GetCellInset(i, j)->getLabelList(); + label_list.insert(label_list.end(), + l.begin(), l.end()); + } + return label_list; } + + +LyXTabular::BoxType LyXTabular::UseParbox(int cell) const +{ + Paragraph * par = GetCellInset(cell)->paragraph(); + + for (; par; par = par->next()) { + for (int i = 0; i < par->size(); ++i) { + if (par->getChar(i) == Paragraph::META_NEWLINE) + return BOX_PARBOX; + } + } + return BOX_NONE; +} + +/* Emacs: + * Local variables: + * tab-width: 4 + * End: + * vi:set tabstop=4: + */