#include "insets/insettabular.h"
#include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
#include <sstream>
using lyx::support::ltrim;
using lyx::support::prefixIs;
using lyx::support::rtrim;
-using lyx::support::strToInt;
using lyx::support::suffixIs;
using boost::shared_ptr;
return s.empty() ? s : " " + name + "=\"" + s + "\"";
}
+template <>
string const write_attribute(string const & name, string const & t)
{
return t.empty() ? t : " " + name + "=\"" + t + "\"";
}
+template <>
string const write_attribute(string const & name, bool const & b)
{
// we write only true attribute values so we remove a bit of the
// file format bloat for tabulars.
- return b ? write_attribute(name, tostr(b)) : string();
+ return b ? write_attribute(name, convert<string>(b)) : string();
}
+template <>
string const write_attribute(string const & name, int const & i)
{
// we write only true attribute values so we remove a bit of the
// file format bloat for tabulars.
- return i ? write_attribute(name, tostr(i)) : string();
+ return i ? write_attribute(name, convert<string>(i)) : string();
}
+template <>
+string const write_attribute(string const & name, LyXTabular::idx_type const & i)
+{
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return i ? write_attribute(name, convert<string>(i)) : string();
+}
+
+
+template <>
string const write_attribute(string const & name, LyXLength const & value)
{
// we write only the value if we really have one same reson as above.
num = 0;
if (!getTokenValue(str, token, tmp))
return false;
- num = strToInt(tmp);
+ num = convert<int>(tmp);
return true;
}
{}
-LyXTabular::LyXTabular(BufferParams const & bp, int rows_arg, int columns_arg)
+LyXTabular::LyXTabular(BufferParams const & bp, row_type rows_arg,
+ col_type columns_arg)
{
init(bp, rows_arg, columns_arg);
}
// activates all lines and sets all widths to 0
-void LyXTabular::init(BufferParams const & bp, int rows_arg, int columns_arg)
+void LyXTabular::init(BufferParams const & bp, row_type rows_arg,
+ col_type columns_arg)
{
rows_ = rows_arg;
columns_ = columns_arg;
column_info.reserve(10);
cell_info.reserve(100);
fixCellNums();
- for (int i = 0; i < rows_; ++i)
+ for (row_type i = 0; i < rows_; ++i)
cell_info[i].back().right_line = true;
row_info.back().bottom_line = true;
row_info.front().bottom_line = true;
void LyXTabular::fixCellNums()
{
- int cellno = 0;
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
+ idx_type cellno = 0;
+ for (row_type i = 0; i < rows_; ++i) {
+ for (col_type j = 0; j < columns_; ++j) {
// When debugging it can be nice to set
// this to true.
cell_info[i][j].inset->setDrawFrame(false);
}
-void LyXTabular::appendRow(BufferParams const & bp, int const cell)
+void LyXTabular::appendRow(BufferParams const & bp, idx_type const cell)
{
++rows_;
- int const row = row_of_cell(cell);
+ row_type const row = row_of_cell(cell);
row_vector::iterator rit = row_info.begin() + row;
row_info.insert(rit, rowstruct());
row_info[row] = row_info[row + 1];
cell_vvector old(rows_ - 1);
- for (int i = 0; i < rows_ - 1; ++i)
+ for (row_type i = 0; i < rows_ - 1; ++i)
swap(cell_info[i], old[i]);
cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp)));
- for (int i = 0; i <= row; ++i)
+ for (row_type i = 0; i <= row; ++i)
swap(cell_info[i], old[i]);
- for (int i = row + 2; i < rows_; ++i)
+ for (row_type i = row + 2; i < rows_; ++i)
swap(cell_info[i], old[i - 1]);
if (bp.tracking_changes)
- for (int j = 0; j < columns_; ++j)
+ for (col_type j = 0; j < columns_; ++j)
cell_info[row + 1][j].inset->markNew(true);
set_row_column_number_info();
}
-void LyXTabular::deleteRow(int const row)
+void LyXTabular::deleteRow(row_type const row)
{
// Not allowed to delete last row
if (rows_ == 1)
}
-void LyXTabular::appendColumn(BufferParams const & bp, int const cell)
+void LyXTabular::appendColumn(BufferParams const & bp, idx_type const cell)
{
++columns_;
- int const column = column_of_cell(cell);
+ col_type const column = column_of_cell(cell);
column_vector::iterator cit = column_info.begin() + column + 1;
column_info.insert(cit, columnstruct());
// set the column values of the column before
column_info[column + 1] = column_info[column];
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
cell_info[i].insert(cell_info[i].begin() + column + 1, cellstruct(bp));
// care about multicolumns
cell_info[i][column + 1].multicolumn = LyXTabular::CELL_NORMAL;
}
//++column;
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
cell_info[i][column + 1].inset->clear(false);
if (bp.tracking_changes)
cell_info[i][column + 1].inset->markNew(true);
}
-void LyXTabular::deleteColumn(int const column)
+void LyXTabular::deleteColumn(col_type const column)
{
// Not allowed to delete last column
if (columns_ == 1)
return;
column_info.erase(column_info.begin() + column);
- for (int i = 0; i < rows_; ++i)
+ for (row_type i = 0; i < rows_; ++i)
cell_info[i].erase(cell_info[i].begin() + column);
--columns_;
fixCellNums();
void LyXTabular::set_row_column_number_info()
{
- numberofcells = -1;
- for (int row = 0; row < rows_; ++row) {
- for (int column = 0; column < columns_; ++column) {
+ numberofcells = 0;
+ for (row_type row = 0; row < rows_; ++row) {
+ for (col_type column = 0; column < columns_; ++column) {
if (cell_info[row][column].multicolumn
!= LyXTabular::CELL_PART_OF_MULTICOLUMN)
++numberofcells;
- cell_info[row][column].cellno = numberofcells;
+ if (numberofcells == 0)
+ // FIXME: Is this intended?
+ cell_info[row][column].cellno = npos;
+ else
+ cell_info[row][column].cellno =
+ numberofcells - 1;
}
}
- ++numberofcells; // because this is one more than as we start from 0
rowofcell.resize(numberofcells);
columnofcell.resize(numberofcells);
- for (int row = 0, column = 0, c = 0;
+ row_type row = 0;
+ col_type column = 0;
+ for (idx_type c = 0;
c < numberofcells && row < rows_ && column < columns_;) {
rowofcell[c] = row;
columnofcell[c] = column;
}
}
- for (int row = 0; row < rows_; ++row) {
- for (int column = 0; column < columns_; ++column) {
+ for (row_type row = 0; row < rows_; ++row) {
+ for (col_type column = 0; column < columns_; ++column) {
if (isPartOfMultiColumn(row,column))
continue;
cell_info[row][column].inset->setAutoBreakRows(
}
-int LyXTabular::getNumberOfCells() const
+LyXTabular::idx_type LyXTabular::getNumberOfCells() const
{
return numberofcells;
}
-int LyXTabular::numberOfCellsInRow(int const cell) const
+LyXTabular::idx_type LyXTabular::numberOfCellsInRow(idx_type const cell) const
{
- int const row = row_of_cell(cell);
- int result = 0;
- for (int i = 0; i < columns_; ++i)
+ row_type const row = row_of_cell(cell);
+ idx_type result = 0;
+ for (col_type i = 0; i < columns_; ++i)
if (cell_info[row][i].multicolumn != LyXTabular::CELL_PART_OF_MULTICOLUMN)
++result;
return result;
// returns 1 if there is a topline, returns 0 if not
-bool LyXTabular::topLine(int const cell, bool const onlycolumn) const
+bool LyXTabular::topLine(idx_type const cell, bool const onlycolumn) const
{
if (!onlycolumn && isMultiColumn(cell))
return cellinfo_of_cell(cell).top_line;
}
-bool LyXTabular::bottomLine(int cell, bool onlycolumn) const
+bool LyXTabular::bottomLine(idx_type const cell, bool onlycolumn) const
{
if (!onlycolumn && isMultiColumn(cell))
return cellinfo_of_cell(cell).bottom_line;
}
-bool LyXTabular::leftLine(int cell, bool onlycolumn) const
+bool LyXTabular::leftLine(idx_type cell, bool onlycolumn) const
{
if (!onlycolumn && isMultiColumn(cell) &&
(isFirstCellInRow(cell) || isMultiColumn(cell-1)))
}
-bool LyXTabular::rightLine(int cell, bool onlycolumn) const
+bool LyXTabular::rightLine(idx_type cell, bool onlycolumn) const
{
if (!onlycolumn && isMultiColumn(cell) &&
(isLastCellInRow(cell) || isMultiColumn(cell + 1)))
}
-bool LyXTabular::topAlreadyDrawn(int cell) const
+bool LyXTabular::topAlreadyDrawn(idx_type cell) const
{
- int row = row_of_cell(cell);
+ row_type row = row_of_cell(cell);
if (row > 0 && !getAdditionalHeight(row)) {
- int column = column_of_cell(cell);
+ col_type column = column_of_cell(cell);
--row;
while (column
&& cell_info[row][column].multicolumn
}
-bool LyXTabular::leftAlreadyDrawn(int cell) const
+bool LyXTabular::leftAlreadyDrawn(idx_type cell) const
{
- int column = column_of_cell(cell);
+ col_type column = column_of_cell(cell);
if (column > 0) {
- int row = row_of_cell(cell);
+ row_type row = row_of_cell(cell);
while (--column &&
(cell_info[row][column].multicolumn ==
LyXTabular::CELL_PART_OF_MULTICOLUMN));
}
-bool LyXTabular::isLastRow(int cell) const
+bool LyXTabular::isLastRow(idx_type cell) const
{
return row_of_cell(cell) == rows_ - 1;
}
-int LyXTabular::getAdditionalHeight(int row) const
+int LyXTabular::getAdditionalHeight(row_type row) const
{
if (!row || row >= rows_)
return 0;
bool top = true;
bool bottom = true;
- for (int column = 0; column < columns_ && bottom; ++column) {
+ for (col_type column = 0; column < columns_ && bottom; ++column) {
switch (cell_info[row - 1][column].multicolumn) {
case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
bottom = cell_info[row - 1][column].bottom_line;
bottom = row_info[row - 1].bottom_line;
}
}
- for (int column = 0; column < columns_ && top; ++column) {
+ for (col_type column = 0; column < columns_ && top; ++column) {
switch (cell_info[row][column].multicolumn) {
case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
top = cell_info[row][column].top_line;
}
-int LyXTabular::getAdditionalWidth(int cell) const
+int LyXTabular::getAdditionalWidth(idx_type cell) const
{
// internally already set in setWidthOfCell
// used to get it back in text.C
- int const col = right_column_of_cell(cell);
- int const row = row_of_cell(cell);
+ col_type const col = right_column_of_cell(cell);
+ row_type const row = row_of_cell(cell);
if (col < columns_ - 1 && rightLine(cell) &&
leftLine(cell_info[row][col+1].cellno)) // column_info[col+1].left_line)
{
// returns the maximum over all rows
-int LyXTabular::getWidthOfColumn(int cell) const
+int LyXTabular::getWidthOfColumn(idx_type cell) const
{
- int const column1 = column_of_cell(cell);
- int const column2 = right_column_of_cell(cell);
+ col_type const column1 = column_of_cell(cell);
+ col_type const column2 = right_column_of_cell(cell);
int result = 0;
- for (int i = column1; i <= column2; ++i)
+ for (col_type i = column1; i <= column2; ++i)
result += column_info[i].width_of_column;
return result;
}
// returns true if a complete update is necessary, otherwise false
-bool LyXTabular::setWidthOfMulticolCell(int cell, int new_width)
+bool LyXTabular::setWidthOfMulticolCell(idx_type cell, int new_width)
{
if (!isMultiColumn(cell))
return false;
- int const row = row_of_cell(cell);
- int const column1 = column_of_cell(cell);
- int const column2 = right_column_of_cell(cell);
+ row_type const row = row_of_cell(cell);
+ col_type const column1 = column_of_cell(cell);
+ col_type const column2 = right_column_of_cell(cell);
int const old_val = cell_info[row][column2].width_of_cell;
// first set columns to 0 so we can calculate the right width
- for (int i = column1; i <= column2; ++i) {
+ for (col_type i = column1; i <= column2; ++i) {
cell_info[row][i].width_of_cell = 0;
}
// set the width to MAX_WIDTH until width > 0
int width = new_width + 2 * WIDTH_OF_LINE;
- int i = column1;
+ col_type i = column1;
for (; i < column2 && width > column_info[i].width_of_column; ++i) {
cell_info[row][i].width_of_cell = column_info[i].width_of_column;
width -= column_info[i].width_of_column;
}
-void LyXTabular::recalculateMulticolumnsOfColumn(int column)
+void LyXTabular::recalculateMulticolumnsOfColumn(col_type column)
{
// the last column does not have to be recalculated because all
// multicolumns will have here there last multicolumn cell which
// always will have the whole rest of the width of the cell.
if (column > (columns_ - 2))
return;
- for(int row = 0; row < rows_; ++row) {
+ for(row_type row = 0; row < rows_; ++row) {
int mc = cell_info[row][column].multicolumn;
int nmc = cell_info[row][column+1].multicolumn;
// we only have to update multicolumns which do not have this
(mc == CELL_PART_OF_MULTICOLUMN &&
nmc == CELL_PART_OF_MULTICOLUMN))
{
- int const cellno = cell_info[row][column].cellno;
+ idx_type const cellno = cell_info[row][column].cellno;
setWidthOfMulticolCell(cellno,
getWidthOfCell(cellno) - 2 * WIDTH_OF_LINE);
}
// returns 1 if a complete update is necessary, otherwise 0
-void LyXTabular::setWidthOfCell(int cell, int new_width)
+void LyXTabular::setWidthOfCell(idx_type cell, int new_width)
{
- int const row = row_of_cell(cell);
- int const column1 = column_of_cell(cell);
+ row_type const row = row_of_cell(cell);
+ col_type const column1 = column_of_cell(cell);
bool tmp = false;
int width = 0;
int add_width = 0;
recalculateMulticolumnsOfColumn(column1);
}
if (tmp) {
- for (int i = 0; i < columns_; ++i)
+ for (col_type i = 0; i < columns_; ++i)
calculate_width_of_column(i);
calculate_width_of_tabular();
}
}
-void LyXTabular::setAlignment(int cell, LyXAlignment align, bool onlycolumn)
+void LyXTabular::setAlignment(idx_type cell, LyXAlignment align,
+ bool onlycolumn)
{
if (!isMultiColumn(cell) || onlycolumn)
column_info[column_of_cell(cell)].alignment = align;
}
-void LyXTabular::setVAlignment(int cell, VAlignment align, bool onlycolumn)
+void LyXTabular::setVAlignment(idx_type cell, VAlignment align,
+ bool onlycolumn)
{
if (!isMultiColumn(cell) || onlycolumn)
column_info[column_of_cell(cell)].valignment = align;
}
-void LyXTabular::setColumnPWidth(int cell, LyXLength const & width)
+void LyXTabular::setColumnPWidth(idx_type cell, LyXLength const & width)
{
- int const j = column_of_cell(cell);
+ col_type const j = column_of_cell(cell);
column_info[j].p_width = width;
- for (int i = 0; i < rows_; ++i) {
- int const cell = getCellNumber(i, j);
+ for (row_type i = 0; i < rows_; ++i) {
+ idx_type const cell = getCellNumber(i, j);
// because of multicolumns
getCellInset(cell)->setAutoBreakRows(!getPWidth(cell).zero());
}
}
-bool LyXTabular::setMColumnPWidth(int cell, LyXLength const & width)
+bool LyXTabular::setMColumnPWidth(idx_type cell, LyXLength const & width)
{
if (!isMultiColumn(cell))
return false;
}
-void LyXTabular::setAlignSpecial(int cell, string const & special,
+void LyXTabular::setAlignSpecial(idx_type cell, string const & special,
LyXTabular::Feature what)
{
if (what == SET_SPECIAL_MULTI)
}
-void LyXTabular::setAllLines(int cell, bool line)
+void LyXTabular::setAllLines(idx_type cell, bool line)
{
setTopLine(cell, line);
setBottomLine(cell, line);
}
-void LyXTabular::setTopLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setTopLine(idx_type cell, bool line, bool onlycolumn)
{
- int const row = row_of_cell(cell);
+ row_type const row = row_of_cell(cell);
if (onlycolumn || !isMultiColumn(cell))
row_info[row].top_line = line;
else
}
-void LyXTabular::setBottomLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setBottomLine(idx_type cell, bool line, bool onlycolumn)
{
if (onlycolumn || !isMultiColumn(cell))
row_info[row_of_cell(cell)].bottom_line = line;
}
-void LyXTabular::setLeftLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setLeftLine(idx_type cell, bool line, bool onlycolumn)
{
if (onlycolumn || !isMultiColumn(cell))
column_info[column_of_cell(cell)].left_line = line;
}
-void LyXTabular::setRightLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setRightLine(idx_type cell, bool line, bool onlycolumn)
{
if (onlycolumn || !isMultiColumn(cell))
column_info[right_column_of_cell(cell)].right_line = line;
}
-LyXAlignment LyXTabular::getAlignment(int cell, bool onlycolumn) const
+LyXAlignment LyXTabular::getAlignment(idx_type cell, bool onlycolumn) const
{
if (!onlycolumn && isMultiColumn(cell))
return cellinfo_of_cell(cell).alignment;
LyXTabular::VAlignment
-LyXTabular::getVAlignment(int cell, bool onlycolumn) const
+LyXTabular::getVAlignment(idx_type cell, bool onlycolumn) const
{
if (!onlycolumn && isMultiColumn(cell))
return cellinfo_of_cell(cell).valignment;
}
-LyXLength const LyXTabular::getPWidth(int cell) const
+LyXLength const LyXTabular::getPWidth(idx_type cell) const
{
if (isMultiColumn(cell))
return cellinfo_of_cell(cell).p_width;
}
-LyXLength const LyXTabular::getColumnPWidth(int cell) const
+LyXLength const LyXTabular::getColumnPWidth(idx_type cell) const
{
return column_info[column_of_cell(cell)].p_width;
}
-LyXLength const LyXTabular::getMColumnPWidth(int cell) const
+LyXLength const LyXTabular::getMColumnPWidth(idx_type cell) const
{
if (isMultiColumn(cell))
return cellinfo_of_cell(cell).p_width;
}
-string const LyXTabular::getAlignSpecial(int cell, int what) const
+string const LyXTabular::getAlignSpecial(idx_type cell, int what) const
{
if (what == SET_SPECIAL_MULTI)
return cellinfo_of_cell(cell).align_special;
}
-int LyXTabular::getWidthOfCell(int cell) const
+int LyXTabular::getWidthOfCell(idx_type cell) const
{
- int const row = row_of_cell(cell);
- int const column1 = column_of_cell(cell);
- int const column2 = right_column_of_cell(cell);
+ row_type const row = row_of_cell(cell);
+ col_type const column1 = column_of_cell(cell);
+ col_type const column2 = right_column_of_cell(cell);
int result = 0;
- for (int i = column1; i <= column2; ++i)
+ for (col_type i = column1; i <= column2; ++i)
result += cell_info[row][i].width_of_cell;
return result;
}
-int LyXTabular::getBeginningOfTextInCell(int cell) const
+int LyXTabular::getBeginningOfTextInCell(idx_type cell) const
{
int x = 0;
}
-bool LyXTabular::isFirstCellInRow(int cell) const
+bool LyXTabular::isFirstCellInRow(idx_type cell) const
{
return column_of_cell(cell) == 0;
}
-int LyXTabular::getFirstCellInRow(int row) const
+LyXTabular::idx_type LyXTabular::getFirstCellInRow(row_type row) const
{
if (row > rows_ - 1)
row = rows_ - 1;
}
-bool LyXTabular::isLastCellInRow(int cell) const
+bool LyXTabular::isLastCellInRow(idx_type cell) const
{
return right_column_of_cell(cell) == columns_ - 1;
}
-int LyXTabular::getLastCellInRow(int row) const
+LyXTabular::idx_type LyXTabular::getLastCellInRow(row_type row) const
{
if (row > rows_ - 1)
row = rows_ - 1;
}
-void LyXTabular::calculate_width_of_column(int column)
+void LyXTabular::calculate_width_of_column(col_type column)
{
int maximum = 0;
- for (int i = 0; i < rows_; ++i)
+ for (row_type i = 0; i < rows_; ++i)
maximum = max(cell_info[i][column].width_of_cell, maximum);
column_info[column].width_of_column = maximum;
}
// column of this multicolumn cell as this gives an added width to the
// column, all the rest should be adapted!
//
-bool LyXTabular::calculate_width_of_column_NMC(int column)
+bool LyXTabular::calculate_width_of_column_NMC(col_type column)
{
int const old_column_width = column_info[column].width_of_column;
int max = 0;
- for (int i = 0; i < rows_; ++i) {
- int cell = getCellNumber(i, column);
+ for (row_type i = 0; i < rows_; ++i) {
+ idx_type cell = getCellNumber(i, column);
bool ismulti = isMultiColumnReal(cell);
if ((!ismulti || column == right_column_of_cell(cell)) &&
cell_info[i][column].width_of_cell > max)
void LyXTabular::calculate_width_of_tabular()
{
width_of_tabular = 0;
- for (int i = 0; i < columns_; ++i)
+ for (col_type i = 0; i < columns_; ++i)
width_of_tabular += column_info[i].width_of_column;
}
-int LyXTabular::row_of_cell(int cell) const
+LyXTabular::row_type LyXTabular::row_of_cell(idx_type cell) const
{
if (cell >= numberofcells)
return rows_ - 1;
- if (cell < 0)
+ if (cell == npos)
return 0;
return rowofcell[cell];
}
-int LyXTabular::column_of_cell(int cell) const
+LyXTabular::col_type LyXTabular::column_of_cell(idx_type cell) const
{
if (cell >= numberofcells)
return columns_ - 1;
- if (cell < 0)
+ if (cell == npos)
return 0;
return columnofcell[cell];
}
-int LyXTabular::right_column_of_cell(int cell) const
+LyXTabular::col_type LyXTabular::right_column_of_cell(idx_type cell) const
{
- int const row = row_of_cell(cell);
- int column = column_of_cell(cell);
+ row_type const row = row_of_cell(cell);
+ col_type column = column_of_cell(cell);
while (column < columns_ - 1 &&
cell_info[row][column + 1].multicolumn == LyXTabular::CELL_PART_OF_MULTICOLUMN)
++column;
<< write_attribute("lastFootBottomDL", endlastfoot.bottomDL)
<< write_attribute("lastFootEmpty", endlastfoot.empty)
<< ">\n";
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
os << "<column"
<< write_attribute("alignment", column_info[j].alignment)
<< write_attribute("valignment", column_info[j].valignment)
<< write_attribute("special", column_info[j].align_special)
<< ">\n";
}
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
os << "<row"
<< write_attribute("topline", row_info[i].top_line)
<< write_attribute("bottomline", row_info[i].bottom_line)
<< write_attribute("endlastfoot", row_info[i].endlastfoot)
<< write_attribute("newpage", row_info[i].newpage)
<< ">\n";
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
os << "<cell"
<< write_attribute("multicolumn", cell_info[i][j].multicolumn)
<< write_attribute("alignment", cell_info[i][j].alignment)
}
-void LyXTabular::setHeaderFooterRows(int hr, int fhr, int fr, int lfr)
-{
- // set header info
- while (hr > 0) {
- row_info[--hr].endhead = true;
- }
- // set firstheader info
- if (fhr && fhr < rows_) {
- if (row_info[fhr].endhead) {
- while (fhr > 0) {
- row_info[--fhr].endfirsthead = true;
- row_info[fhr].endhead = false;
- }
- } else if (row_info[fhr - 1].endhead) {
- endfirsthead.empty = true;
- } else {
- while (fhr > 0 && !row_info[--fhr].endhead) {
- row_info[fhr].endfirsthead = true;
- }
- }
- }
- // set footer info
- if (fr && fr < rows_) {
- if (row_info[fr].endhead && row_info[fr-1].endhead) {
- while (fr > 0 && !row_info[--fr].endhead) {
- row_info[fr].endfoot = true;
- row_info[fr].endhead = false;
- }
- } else if (row_info[fr].endfirsthead && row_info[fr-1].endfirsthead) {
- while (fr > 0 && !row_info[--fr].endfirsthead) {
- row_info[fr].endfoot = true;
- row_info[fr].endfirsthead = false;
- }
- } else if (!row_info[fr - 1].endhead && !row_info[fr - 1].endfirsthead) {
- while (fr > 0 && !row_info[--fr].endhead &&
- !row_info[fr].endfirsthead)
- {
- row_info[fr].endfoot = true;
- }
- }
- }
- // set lastfooter info
- if (lfr && lfr < rows_) {
- if (row_info[lfr].endhead && row_info[lfr - 1].endhead) {
- while (lfr > 0 && !row_info[--lfr].endhead) {
- row_info[lfr].endlastfoot = true;
- row_info[lfr].endhead = false;
- }
- } else if (row_info[lfr].endfirsthead &&
- row_info[lfr - 1].endfirsthead)
- {
- while (lfr > 0 && !row_info[--lfr].endfirsthead) {
- row_info[lfr].endlastfoot = true;
- row_info[lfr].endfirsthead = false;
- }
- } else if (row_info[lfr].endfoot
- && row_info[lfr - 1].endfoot) {
- while (lfr > 0 && !row_info[--lfr].endfoot) {
- row_info[lfr].endlastfoot = true;
- row_info[lfr].endfoot = false;
- }
- } else if (!row_info[fr - 1].endhead
- && !row_info[fr - 1].endfirsthead &&
- !row_info[fr - 1].endfoot)
- {
- while (lfr > 0 &&
- !row_info[--lfr].endhead && !row_info[lfr].endfirsthead &&
- !row_info[lfr].endfoot)
- {
- row_info[lfr].endlastfoot = true;
- }
- } else if (haveLTFoot()) {
- endlastfoot.empty = true;
- }
- }
-}
-
-
void LyXTabular::read(Buffer const & buf, LyXLex & lex)
{
string line;
}
getTokenValue(line, "rotate", rotate);
getTokenValue(line, "islongtable", is_long_tabular);
- // compatibility read for old longtable options. Now we can make any
- // row part of the header/footer type we want before it was strict
- // sequential from the first row down (as LaTeX does it!). So now when
- // we find a header/footer line we have to go up the rows and set it
- // on all preceding rows till the first or one with already a h/f option
- // set. If we find a firstheader on the same line as a header or a
- // lastfooter on the same line as a footer then this should be set empty.
- // (Jug 20011220)
- if (version < 3) {
- int hrow;
- int fhrow;
- int frow;
- int lfrow;
-
- getTokenValue(line, "endhead", hrow);
- getTokenValue(line, "endfirsthead", fhrow);
- getTokenValue(line, "endfoot", frow);
- getTokenValue(line, "endlastfoot", lfrow);
- setHeaderFooterRows(abs(hrow), abs(fhrow), abs(frow), abs(lfrow));
- } else {
- getTokenValue(line, "firstHeadTopDL", endfirsthead.topDL);
- getTokenValue(line, "firstHeadBottomDL", endfirsthead.bottomDL);
- getTokenValue(line, "firstHeadEmpty", endfirsthead.empty);
- getTokenValue(line, "headTopDL", endhead.topDL);
- getTokenValue(line, "headBottomDL", endhead.bottomDL);
- getTokenValue(line, "footTopDL", endfoot.topDL);
- getTokenValue(line, "footBottomDL", endfoot.bottomDL);
- getTokenValue(line, "lastFootTopDL", endlastfoot.topDL);
- getTokenValue(line, "lastFootBottomDL", endlastfoot.bottomDL);
- getTokenValue(line, "lastFootEmpty", endlastfoot.empty);
- }
- for (int j = 0; j < columns_; ++j) {
+ getTokenValue(line, "firstHeadTopDL", endfirsthead.topDL);
+ getTokenValue(line, "firstHeadBottomDL", endfirsthead.bottomDL);
+ getTokenValue(line, "firstHeadEmpty", endfirsthead.empty);
+ getTokenValue(line, "headTopDL", endhead.topDL);
+ getTokenValue(line, "headBottomDL", endhead.bottomDL);
+ getTokenValue(line, "footTopDL", endfoot.topDL);
+ getTokenValue(line, "footBottomDL", endfoot.bottomDL);
+ getTokenValue(line, "lastFootTopDL", endlastfoot.topDL);
+ getTokenValue(line, "lastFootBottomDL", endlastfoot.bottomDL);
+ getTokenValue(line, "lastFootEmpty", endlastfoot.empty);
+
+ for (col_type j = 0; j < columns_; ++j) {
l_getline(is,line);
if (!prefixIs(line,"<column")) {
lyxerr << "Wrong tabular format (expected <column ...> got"
getTokenValue(line, "special", column_info[j].align_special);
}
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
l_getline(is, line);
if (!prefixIs(line, "<row")) {
lyxerr << "Wrong tabular format (expected <row ...> got"
getTokenValue(line, "endfoot", row_info[i].endfoot);
getTokenValue(line, "endlastfoot", row_info[i].endlastfoot);
getTokenValue(line, "newpage", row_info[i].newpage);
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
l_getline(is, line);
if (!prefixIs(line, "<cell")) {
lyxerr << "Wrong tabular format (expected <cell ...> got"
}
-bool LyXTabular::isMultiColumn(int cell) const
+bool LyXTabular::isMultiColumn(idx_type cell) const
{
return cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
}
-bool LyXTabular::isMultiColumnReal(int cell) const
+bool LyXTabular::isMultiColumnReal(idx_type cell) const
{
return column_of_cell(cell) != right_column_of_cell(cell) &&
cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
}
-LyXTabular::cellstruct & LyXTabular::cellinfo_of_cell(int cell) const
+LyXTabular::cellstruct & LyXTabular::cellinfo_of_cell(idx_type cell) const
{
return cell_info[row_of_cell(cell)][column_of_cell(cell)];
}
-void LyXTabular::setMultiColumn(Buffer * buffer, int cell, int number)
+void LyXTabular::setMultiColumn(Buffer * buffer, idx_type cell,
+ idx_type number)
{
cellstruct & cs = cellinfo_of_cell(cell);
cs.multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
cs.top_line = row_info[row_of_cell(cell)].top_line;
cs.bottom_line = row_info[row_of_cell(cell)].bottom_line;
cs.right_line = column_info[column_of_cell(cell+number-1)].right_line;
- for (int i = 1; i < number; ++i) {
+ for (idx_type i = 1; i < number; ++i) {
cellstruct & cs1 = cellinfo_of_cell(cell + i);
cs1.multicolumn = CELL_PART_OF_MULTICOLUMN;
cs.inset->appendParagraphs(buffer, cs1.inset->paragraphs());
}
-int LyXTabular::cells_in_multicolumn(int cell) const
+LyXTabular::idx_type LyXTabular::cells_in_multicolumn(idx_type cell) const
{
- int const row = row_of_cell(cell);
- int column = column_of_cell(cell);
- int result = 1;
+ row_type const row = row_of_cell(cell);
+ col_type column = column_of_cell(cell);
+ idx_type result = 1;
++column;
while (column < columns_ &&
cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN)
}
-int LyXTabular::unsetMultiColumn(int cell)
+LyXTabular::idx_type LyXTabular::unsetMultiColumn(idx_type cell)
{
- int const row = row_of_cell(cell);
- int column = column_of_cell(cell);
+ row_type const row = row_of_cell(cell);
+ col_type column = column_of_cell(cell);
- int result = 0;
+ idx_type result = 0;
if (cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN) {
cell_info[row][column].multicolumn = CELL_NORMAL;
}
-void LyXTabular::setRotateCell(int cell, bool flag)
+void LyXTabular::setRotateCell(idx_type cell, bool flag)
{
cellinfo_of_cell(cell).rotate = flag;
}
-bool LyXTabular::getRotateCell(int cell) const
+bool LyXTabular::getRotateCell(idx_type cell) const
{
return cellinfo_of_cell(cell).rotate;
}
{
if (rotate)
return true;
- for (int i = 0; i < rows_; ++i)
- for (int j = 0; j < columns_; ++j)
+ for (row_type i = 0; i < rows_; ++i)
+ for (col_type j = 0; j < columns_; ++j)
if (cell_info[i][j].rotate)
return true;
return false;
}
-bool LyXTabular::isLastCell(int cell) const
+bool LyXTabular::isLastCell(idx_type cell) const
{
if (cell + 1 < numberofcells)
return false;
}
-int LyXTabular::getCellAbove(int cell) const
+LyXTabular::idx_type LyXTabular::getCellAbove(idx_type cell) const
{
if (row_of_cell(cell) > 0)
return cell_info[row_of_cell(cell)-1][column_of_cell(cell)].cellno;
}
-int LyXTabular::getCellBelow(int cell) const
+LyXTabular::idx_type LyXTabular::getCellBelow(idx_type cell) const
{
if (row_of_cell(cell) + 1 < rows_)
return cell_info[row_of_cell(cell)+1][column_of_cell(cell)].cellno;
}
-int LyXTabular::getLastCellAbove(int cell) const
+LyXTabular::idx_type LyXTabular::getLastCellAbove(idx_type cell) const
{
- if (row_of_cell(cell) <= 0)
+ if (row_of_cell(cell) == 0)
return cell;
if (!isMultiColumn(cell))
return getCellAbove(cell);
}
-int LyXTabular::getLastCellBelow(int cell) const
+LyXTabular::idx_type LyXTabular::getLastCellBelow(idx_type cell) const
{
if (row_of_cell(cell) + 1 >= rows_)
return cell;
}
-int LyXTabular::getCellNumber(int row, int column) const
+LyXTabular::idx_type LyXTabular::getCellNumber(row_type row,
+ col_type column) const
{
- BOOST_ASSERT(column >= 0 || column < columns_ || row >= 0 || row < rows_);
+ BOOST_ASSERT(column != npos && column < columns_ &&
+ row != npos && row < rows_);
return cell_info[row][column].cellno;
}
-void LyXTabular::setUsebox(int cell, BoxType type)
+void LyXTabular::setUsebox(idx_type cell, BoxType type)
{
cellinfo_of_cell(cell).usebox = type;
}
-LyXTabular::BoxType LyXTabular::getUsebox(int cell) const
+LyXTabular::BoxType LyXTabular::getUsebox(idx_type cell) const
{
if (column_info[column_of_cell(cell)].p_width.zero() &&
!(isMultiColumn(cell) && !cellinfo_of_cell(cell).p_width.zero()))
///
// This are functions used for the longtable support
///
-void LyXTabular::setLTHead(int row, bool flag, ltType const & hd, bool first)
+void LyXTabular::setLTHead(row_type row, bool flag, ltType const & hd,
+ bool first)
{
if (first) {
endfirsthead = hd;
}
-bool LyXTabular::getRowOfLTHead(int row, ltType & hd) const
+bool LyXTabular::getRowOfLTHead(row_type row, ltType & hd) const
{
hd = endhead;
hd.set = haveLTHead();
}
-bool LyXTabular::getRowOfLTFirstHead(int row, ltType & hd) const
+bool LyXTabular::getRowOfLTFirstHead(row_type row, ltType & hd) const
{
hd = endfirsthead;
hd.set = haveLTFirstHead();
}
-void LyXTabular::setLTFoot(int row, bool flag, ltType const & fd, bool last)
+void LyXTabular::setLTFoot(row_type row, bool flag, ltType const & fd,
+ bool last)
{
if (last) {
endlastfoot = fd;
}
-bool LyXTabular::getRowOfLTFoot(int row, ltType & fd) const
+bool LyXTabular::getRowOfLTFoot(row_type row, ltType & fd) const
{
fd = endfoot;
fd.set = haveLTFoot();
}
-bool LyXTabular::getRowOfLTLastFoot(int row, ltType & fd) const
+bool LyXTabular::getRowOfLTLastFoot(row_type row, ltType & fd) const
{
fd = endlastfoot;
fd.set = haveLTLastFoot();
}
-void LyXTabular::setLTNewPage(int row, bool what)
+void LyXTabular::setLTNewPage(row_type row, bool what)
{
row_info[row].newpage = what;
}
-bool LyXTabular::getLTNewPage(int row) const
+bool LyXTabular::getLTNewPage(row_type row) const
{
return row_info[row].newpage;
}
bool LyXTabular::haveLTHead() const
{
- for (int i = 0; i < rows_; ++i)
+ for (row_type i = 0; i < rows_; ++i)
if (row_info[i].endhead)
return true;
return false;
{
if (endfirsthead.empty)
return false;
- for (int i = 0; i < rows_; ++i)
+ for (row_type i = 0; i < rows_; ++i)
if (row_info[i].endfirsthead)
return true;
return false;
bool LyXTabular::haveLTFoot() const
{
- for (int i = 0; i < rows_; ++i)
+ for (row_type i = 0; i < rows_; ++i)
if (row_info[i].endfoot)
return true;
return false;
{
if (endlastfoot.empty)
return false;
- for (int i = 0; i < rows_; ++i)
+ for (row_type i = 0; i < rows_; ++i)
if (row_info[i].endlastfoot)
return true;
return false;
// end longtable support functions
-void LyXTabular::setAscentOfRow(int row, int height)
+void LyXTabular::setAscentOfRow(row_type row, int height)
{
if (row >= rows_ || row_info[row].ascent_of_row == height)
return;
}
-void LyXTabular::setDescentOfRow(int row, int height)
+void LyXTabular::setDescentOfRow(row_type row, int height)
{
if (row >= rows_ || row_info[row].descent_of_row == height)
return;
}
-int LyXTabular::getAscentOfRow(int row) const
+int LyXTabular::getAscentOfRow(row_type row) const
{
if (row >= rows_)
return 0;
}
-int LyXTabular::getDescentOfRow(int row) const
+int LyXTabular::getDescentOfRow(row_type row) const
{
BOOST_ASSERT(row < rows_);
return row_info[row].descent_of_row;
int LyXTabular::getHeightOfTabular() const
{
int height = 0;
- for (int row = 0; row < rows_; ++row)
+ for (row_type row = 0; row < rows_; ++row)
height += getAscentOfRow(row) + getDescentOfRow(row) +
getAdditionalHeight(row);
return height;
}
-bool LyXTabular::isPartOfMultiColumn(int row, int column) const
+bool LyXTabular::isPartOfMultiColumn(row_type row, col_type column) const
{
BOOST_ASSERT(row < rows_);
BOOST_ASSERT(column < columns_);
}
-int LyXTabular::TeXTopHLine(ostream & os, int row) const
+int LyXTabular::TeXTopHLine(ostream & os, row_type row) const
{
- BOOST_ASSERT(row >= 0);
+ // FIXME: assert or return 0 as in TeXBottomHLine()?
+ BOOST_ASSERT(row != npos);
BOOST_ASSERT(row < rows_);
- int const fcell = getFirstCellInRow(row);
- int const n = numberOfCellsInRow(fcell) + fcell;
- int tmp = 0;
+ idx_type const fcell = getFirstCellInRow(row);
+ idx_type const n = numberOfCellsInRow(fcell) + fcell;
+ idx_type tmp = 0;
- for (int i = fcell; i < n; ++i) {
+ for (idx_type i = fcell; i < n; ++i) {
if (topLine(i))
++tmp;
}
if (tmp == n - fcell) {
os << "\\hline ";
} else if (tmp) {
- for (int i = fcell; i < n; ++i) {
+ for (idx_type i = fcell; i < n; ++i) {
if (topLine(i)) {
os << "\\cline{"
<< column_of_cell(i) + 1
}
-int LyXTabular::TeXBottomHLine(ostream & os, int row) const
+int LyXTabular::TeXBottomHLine(ostream & os, row_type row) const
{
- if (row < 0 || row >= rows_)
+ // FIXME: return 0 or assert as in TeXTopHLine()?
+ if (row == npos || row >= rows_)
return 0;
- int const fcell = getFirstCellInRow(row);
- int const n = numberOfCellsInRow(fcell) + fcell;
- int tmp = 0;
+ idx_type const fcell = getFirstCellInRow(row);
+ idx_type const n = numberOfCellsInRow(fcell) + fcell;
+ idx_type tmp = 0;
- for (int i = fcell; i < n; ++i) {
+ for (idx_type i = fcell; i < n; ++i) {
if (bottomLine(i))
++tmp;
}
if (tmp == n - fcell) {
os << "\\hline";
} else if (tmp) {
- for (int i = fcell; i < n; ++i) {
+ for (idx_type i = fcell; i < n; ++i) {
if (bottomLine(i)) {
os << "\\cline{"
<< column_of_cell(i) + 1
}
-int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
+int LyXTabular::TeXCellPreamble(ostream & os, idx_type cell) const
{
int ret = 0;
}
-int LyXTabular::TeXCellPostamble(ostream & os, int cell) const
+int LyXTabular::TeXCellPostamble(ostream & os, idx_type cell) const
{
int ret = 0;
os << "\\hline\n";
++ret;
}
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
if (row_info[i].endhead) {
ret += TeXRow(os, i, buf, runparams);
}
os << "\\hline\n";
++ret;
}
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
if (row_info[i].endfirsthead) {
ret += TeXRow(os, i, buf, runparams);
}
os << "\\hline\n";
++ret;
}
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
if (row_info[i].endfoot) {
ret += TeXRow(os, i, buf, runparams);
}
os << "\\hline\n";
++ret;
}
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
if (row_info[i].endlastfoot) {
ret += TeXRow(os, i, buf, runparams);
}
}
-bool LyXTabular::isValidRow(int row) const
+bool LyXTabular::isValidRow(row_type row) const
{
if (!is_long_tabular)
return true;
}
-int LyXTabular::TeXRow(ostream & os, int i, Buffer const & buf,
+int LyXTabular::TeXRow(ostream & os, row_type i, Buffer const & buf,
OutputParams const & runparams) const
{
- int cell = getCellNumber(i, 0);
+ idx_type cell = getCellNumber(i, 0);
int ret = TeXTopHLine(os, i);
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
if (isPartOfMultiColumn(i, j))
continue;
ret += TeXCellPreamble(os, cell);
os << "\\begin{longtable}{";
else
os << "\\begin{tabular}{";
- for (int i = 0; i < columns_; ++i) {
+ for (col_type i = 0; i < columns_; ++i) {
if (!column_info[i].align_special.empty()) {
os << column_info[i].align_special;
} else {
//+ the single row and columns (cells) +
//+---------------------------------------------------------------------
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
if (isValidRow(i)) {
ret += TeXRow(os, i, buf, runparams);
if (is_long_tabular && row_info[i].newpage) {
const OutputParams & runparams) const
{
os << "<tabular ca=\"";
- for (int i = 0; i < columns_; ++i) {
+ for (col_type i = 0; i < columns_; ++i) {
switch (column_info[i].alignment) {
case LYX_ALIGN_LEFT:
os << 'l';
}
}
os << "\">\n";
- int cell = 0;
+ idx_type cell = 0;
int ret = 0;
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
+ for (row_type i = 0; i < rows_; ++i) {
+ for (col_type j = 0; j < columns_; ++j) {
if (isPartOfMultiColumn(i, j))
continue;
shared_ptr<InsetText> inset = getCellInset(cell);
}
-int LyXTabular::docbookRow(Buffer const & buf, ostream & os, int row,
+int LyXTabular::docbookRow(Buffer const & buf, ostream & os, row_type row,
OutputParams const & runparams) const
{
int ret = 0;
- int cell = getFirstCellInRow(row);
+ idx_type cell = getFirstCellInRow(row);
os << "<row>\n";
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
if (isPartOfMultiColumn(row, j))
continue;
os << "<tgroup cols=\"" << columns_
<< "\" colsep=\"1\" rowsep=\"1\">\n";
- for (int i = 0; i < columns_; ++i) {
+ for (col_type i = 0; i < columns_; ++i) {
os << "<colspec colname=\"col" << i << "\" align=\"";
switch (column_info[i].alignment) {
case LYX_ALIGN_LEFT:
if (haveLTHead() || haveLTFirstHead()) {
os << "<thead>\n";
++ret;
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
if (row_info[i].endhead || row_info[i].endfirsthead) {
ret += docbookRow(buf, os, i, runparams);
}
if (haveLTFoot() || haveLTLastFoot()) {
os << "<tfoot>\n";
++ret;
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
if (row_info[i].endfoot || row_info[i].endlastfoot) {
ret += docbookRow(buf, os, i, runparams);
}
os << "<tbody>\n";
++ret;
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
if (isValidRow(i)) {
ret += docbookRow(buf, os, i, runparams);
}
}
-int LyXTabular::asciiTopHLine(ostream & os, int row,
+int LyXTabular::asciiTopHLine(ostream & os, row_type row,
vector<unsigned int> const & clen) const
{
- int const fcell = getFirstCellInRow(row);
- int const n = numberOfCellsInRow(fcell) + fcell;
- int tmp = 0;
+ idx_type const fcell = getFirstCellInRow(row);
+ idx_type const n = numberOfCellsInRow(fcell) + fcell;
+ idx_type tmp = 0;
- for (int i = fcell; i < n; ++i) {
+ for (idx_type i = fcell; i < n; ++i) {
if (topLine(i)) {
++tmp;
break;
return 0;
unsigned char ch;
- for (int i = fcell; i < n; ++i) {
+ for (idx_type i = fcell; i < n; ++i) {
if (topLine(i)) {
if (leftLine(i))
os << "+-";
os << " ";
ch = ' ';
}
- int column = column_of_cell(i);
+ col_type column = column_of_cell(i);
int len = clen[column];
while (column < columns_ - 1
&& isPartOfMultiColumn(row, ++column))
}
-int LyXTabular::asciiBottomHLine(ostream & os, int row,
+int LyXTabular::asciiBottomHLine(ostream & os, row_type row,
vector<unsigned int> const & clen) const
{
- int const fcell = getFirstCellInRow(row);
- int const n = numberOfCellsInRow(fcell) + fcell;
- int tmp = 0;
+ idx_type const fcell = getFirstCellInRow(row);
+ idx_type const n = numberOfCellsInRow(fcell) + fcell;
+ idx_type tmp = 0;
- for (int i = fcell; i < n; ++i) {
+ for (idx_type i = fcell; i < n; ++i) {
if (bottomLine(i)) {
++tmp;
break;
return 0;
unsigned char ch;
- for (int i = fcell; i < n; ++i) {
+ for (idx_type i = fcell; i < n; ++i) {
if (bottomLine(i)) {
if (leftLine(i))
os << "+-";
os << " ";
ch = ' ';
}
- int column = column_of_cell(i);
+ col_type column = column_of_cell(i);
int len = clen[column];
while (column < columns_ -1
&& isPartOfMultiColumn(row, ++column))
int LyXTabular::asciiPrintCell(Buffer const & buf, ostream & os,
OutputParams const & runparams,
- int cell, int row, int column,
+ idx_type cell, row_type row, col_type column,
vector<unsigned int> const & clen,
bool onlydata) const
{
if (!onlydata) {
// first all non (real) multicolumn cells!
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
clen[j] = 0;
- for (int i = 0; i < rows_; ++i) {
- int cell = getCellNumber(i, j);
+ for (row_type i = 0; i < rows_; ++i) {
+ idx_type cell = getCellNumber(i, j);
if (isMultiColumnReal(cell))
continue;
ostringstream sstr;
}
}
// then all (real) multicolumn cells!
- for (int j = 0; j < columns_; ++j) {
- for (int i = 0; i < rows_; ++i) {
- int cell = getCellNumber(i, j);
+ for (col_type j = 0; j < columns_; ++j) {
+ for (row_type i = 0; i < rows_; ++i) {
+ idx_type cell = getCellNumber(i, j);
if (!isMultiColumnReal(cell) || isPartOfMultiColumn(i, j))
continue;
ostringstream sstr;
getCellInset(cell)->plaintext(buf, sstr, runparams);
int len = int(sstr.str().length());
- int const n = cells_in_multicolumn(cell);
- for (int k = j; len > 0 && k < j + n - 1; ++k)
+ idx_type const n = cells_in_multicolumn(cell);
+ for (col_type k = j; len > 0 && k < j + n - 1; ++k)
len -= clen[k];
if (len > int(clen[j + n - 1]))
clen[j + n - 1] = len;
}
}
}
- int cell = 0;
- for (int i = 0; i < rows_; ++i) {
+ idx_type cell = 0;
+ for (row_type i = 0; i < rows_; ++i) {
if (!onlydata && asciiTopHLine(os, i, clen))
os << string(depth * 2, ' ');
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
if (isPartOfMultiColumn(i, j))
continue;
if (onlydata && j > 0)
}
-shared_ptr<InsetText> LyXTabular::getCellInset(int cell) const
+shared_ptr<InsetText> LyXTabular::getCellInset(idx_type cell) const
{
return cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
}
-shared_ptr<InsetText> LyXTabular::getCellInset(int row, int column) const
+shared_ptr<InsetText> LyXTabular::getCellInset(row_type row,
+ col_type column) const
{
return cell_info[row][column].inset;
}
-int LyXTabular::getCellFromInset(InsetBase const * inset) const
+LyXTabular::idx_type
+LyXTabular::getCellFromInset(InsetBase const * inset) const
{
// is this inset part of the tabular?
if (!inset) {
BOOST_ASSERT(false);
}
- for (int cell = 0, n = getNumberOfCells(); cell < n; ++cell)
+ for (idx_type cell = 0, n = getNumberOfCells(); cell < n; ++cell)
if (getCellInset(cell).get() == inset) {
lyxerr[Debug::INSETTEXT] << "LyXTabular::getCellFromInset: "
<< "cell=" << cell << endl;
features.require("longtable");
if (needRotating())
features.require("rotating");
- for (int cell = 0; cell < numberofcells; ++cell) {
+ for (idx_type cell = 0; cell < numberofcells; ++cell) {
if (getVAlignment(cell) != LYX_VALIGN_TOP ||
(!getPWidth(cell).zero() && !isMultiColumn(cell)))
features.require("array");
void LyXTabular::getLabelList(Buffer const & buffer,
std::vector<string> & list) const
{
- for (int i = 0; i < rows_; ++i)
- for (int j = 0; j < columns_; ++j)
+ for (row_type i = 0; i < rows_; ++i)
+ for (col_type j = 0; j < columns_; ++j)
getCellInset(i, j)->getLabelList(buffer, list);
}
-LyXTabular::BoxType LyXTabular::useParbox(int cell) const
+LyXTabular::BoxType LyXTabular::useParbox(idx_type cell) const
{
ParagraphList const & parlist = getCellInset(cell)->paragraphs();
ParagraphList::const_iterator cit = parlist.begin();
projects / lyx.git / blobdiff