-/* This file is part of
- * ======================================================
+/**
+ * \file tabular.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author José Matos
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
*
- * Copyright 2000-2002 The LyX Team.
- *
- * @author: Jürgen Vigna
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "tabular.h"
-#include "LaTeXFeatures.h"
-#include "Lsstream.h"
+
#include "buffer.h"
+#include "bufferparams.h"
#include "debug.h"
-#include "gettext.h"
+#include "LaTeXFeatures.h"
#include "lyxlex.h"
-#include "vspace.h"
+#include "outputparams.h"
+#include "paragraph.h"
#include "insets/insettabular.h"
-#include "insets/insettext.h"
-#include "support/LAssert.h"
-#include "support/LIstream.h"
#include "support/lstrings.h"
-#include "support/lyxmanip.h"
#include "support/tostr.h"
-#include "frontends/Alert.h"
-#include "frontends/Painter.h"
+#include <sstream>
-#include <algorithm>
-#include <cstdlib>
-
-using namespace lyx::support;
+using lyx::support::ltrim;
+using lyx::support::prefixIs;
+using lyx::support::rtrim;
+using lyx::support::strToInt;
+using lyx::support::suffixIs;
using std::abs;
-using std::ostream;
-using std::istream;
+using std::endl;
using std::getline;
using std::max;
-using std::endl;
+
+using std::istream;
+using std::ostream;
+using std::ostringstream;
using std::vector;
+using std::string;
#ifndef CXX_GLOBAL_CSTD
using std::strlen;
#endif
+
namespace {
int const WIDTH_OF_LINE = 5;
switch (num) {
case LyXTabular::LYX_VALIGN_TOP:
return "top";
- case LyXTabular::LYX_VALIGN_CENTER:
- return "center";
+ case LyXTabular::LYX_VALIGN_MIDDLE:
+ return "middle";
case LyXTabular::LYX_VALIGN_BOTTOM:
return "bottom";
}
return string();
}
+
// I would have liked a fromstr template a lot better. (Lgb)
bool string2type(string const str, LyXAlignment & num)
{
{
if (str == "top")
num = LyXTabular::LYX_VALIGN_TOP;
- else if (str == "center")
- num = LyXTabular::LYX_VALIGN_CENTER;
+ else if (str == "middle" )
+ num = LyXTabular::LYX_VALIGN_MIDDLE;
else if (str == "bottom")
num = LyXTabular::LYX_VALIGN_BOTTOM;
else
return false;
pos += token_length + 1;
char ch = str[pos];
- if ((ch != '"') && (ch != '\'')) { // only read till next space
+ if (ch != '"' && ch != '\'') { // only read till next space
ret += ch;
ch = ' ';
}
- while ((pos < str.length() - 1) && (str[++pos] != ch))
+ while (pos < str.length() - 1 && str[++pos] != ch)
ret += str[pos];
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);
+ return getTokenValue(str, token, tmp) && string2type(tmp, num);
}
LyXTabular::VAlignment & num)
{
string tmp;
- if (!getTokenValue(str, token, tmp))
- return false;
- return string2type(tmp, num);
+ return getTokenValue(str, token, tmp) && string2type(tmp, num);
}
LyXTabular::BoxType & num)
{
string tmp;
- if (!getTokenValue(str, token, tmp))
- return false;
- return string2type(tmp, num);
+ return getTokenValue(str, token, tmp) && string2type(tmp, num);
}
// not in the file-format.
flag = false;
string tmp;
- if (!getTokenValue(str, token, tmp))
- return false;
- return string2type(tmp, flag);
+ return getTokenValue(str, token, tmp) && string2type(tmp, flag);
}
// in the file format.
len = LyXLength();
string tmp;
- if (!getTokenValue(str, token, tmp))
- return false;
- return isValidLength(tmp, &len);
+ return getTokenValue(str, token, tmp) && isValidLength(tmp, &len);
}
/// Define a few methods for the inner structs
-LyXTabular::cellstruct::cellstruct(BufferParams const & bg)
- : inset(bg)
+LyXTabular::cellstruct::cellstruct(BufferParams const & bp)
+ : inset(bp)
{
cellno = 0;
width_of_cell = 0;
}
-LyXTabular::LyXTabular(BufferParams const & bp,
- InsetTabular * inset, int rows_arg, int columns_arg)
+LyXTabular::LyXTabular(BufferParams const & bp, int rows_arg, int columns_arg)
{
- owner_ = inset;
- cur_cell = -1;
init(bp, rows_arg, columns_arg);
}
-LyXTabular::LyXTabular(BufferParams const & bp,
- InsetTabular * inset, LyXTabular const & lt)
-{
- owner_ = inset;
- cur_cell = -1;
- init(bp, lt.rows_, lt.columns_, <);
-}
-
-
-LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex)
-{
- owner_ = inset;
- cur_cell = -1;
- read(buf, lex);
-}
-
-
// activates all lines and sets all widths to 0
-void LyXTabular::init(BufferParams const & bp,
- int rows_arg, int columns_arg, LyXTabular const * lt)
+void LyXTabular::init(BufferParams const & bp, int rows_arg, int columns_arg)
{
- rows_ = rows_arg;
+ rows_ = rows_arg;
columns_ = columns_arg;
- row_info = row_vector(rows_, rowstruct());
- column_info = column_vector(columns_, columnstruct());
+ row_info = row_vector(rows_);
+ column_info = column_vector(columns_);
cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp)));
+ row_info.reserve(10);
+ column_info.reserve(10);
+ cell_info.reserve(100);
+ fixCellNums();
+ for (int i = 0; i < rows_; ++i)
+ cell_info[i].back().right_line = true;
+ row_info.back().bottom_line = true;
+ row_info.front().bottom_line = true;
+ column_info.back().right_line = true;
+ is_long_tabular = false;
+ rotate = false;
+}
- if (lt) {
- operator=(*lt);
- return;
- }
+void LyXTabular::fixCellNums()
+{
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);
+ // When debugging it can be nice to set
+ // this to true.
+ cell_info[i][j].inset.setDrawFrame(false);
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();
-
- rowofcell = vector<int>();
- columnofcell = vector<int>();
set_row_column_number_info();
- is_long_tabular = false;
- rotate = false;
}
// now set the values of the row before
row_info[row] = row_info[row + 1];
-#if 0
- cell_vvector::iterator cit = cell_info.begin() + row;
- cell_info.insert(cit, vector<cellstruct>(columns_, cellstruct(bp)));
-#else
- cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
- cellstruct(bp)));
+ cell_vvector old(rows_ - 1);
+ for (int i = 0; i < rows_ - 1; ++i)
+ swap(cell_info[i], old[i]);
- for (int i = 0; i <= row; ++i) {
- for (int j = 0; j < columns_; ++j) {
- c_info[i][j] = cell_info[i][j];
- }
- }
- for (int i = row + 1; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
- c_info[i][j] = cell_info[i-1][j];
- }
- }
- cell_info = c_info;
- ++row;
- for (int j = 0; j < columns_; ++j) {
- cell_info[row][j].inset.clear(false);
- if (bp.tracking_changes)
- cell_info[row][j].inset.markNew(true);
- }
-#endif
- Reinit();
+ cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp)));
+
+ for (int i = 0; i <= row; ++i)
+ swap(cell_info[i], old[i]);
+ for (int i = row + 2; i < rows_; ++i)
+ swap(cell_info[i], old[i - 1]);
+
+ if (bp.tracking_changes)
+ for (int j = 0; j < columns_; ++j)
+ cell_info[row + 1][j].inset.markNew(true);
+
+ set_row_column_number_info();
}
row_info.erase(row_info.begin() + row);
cell_info.erase(cell_info.begin() + row);
--rows_;
- Reinit();
+ fixCellNums();
}
{
++columns_;
- cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
- cellstruct(bp)));
int const column = column_of_cell(cell);
column_vector::iterator cit = column_info.begin() + column + 1;
column_info.insert(cit, columnstruct());
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];
- }
+ cell_info[i].insert(cell_info[i].begin() + column + 1, cellstruct(bp));
+
// care about multicolumns
- if (c_info[i][column + 1].multicolumn==CELL_BEGIN_OF_MULTICOLUMN)
- {
- c_info[i][column + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
- }
- if (column + 2 >= columns_ ||
- c_info[i][column + 2].multicolumn != CELL_PART_OF_MULTICOLUMN)
- {
- c_info[i][column + 1].multicolumn = LyXTabular::CELL_NORMAL;
- }
+ if (cell_info[i][column + 1].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
+ cell_info[i][column + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
+
+ if (column + 2 >= 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 + 1].inset.clear(false);
if (bp.tracking_changes)
cell_info[i][column + 1].inset.markNew(true);
}
- Reinit();
+ fixCellNums();
}
for (int i = 0; i < rows_; ++i)
cell_info[i].erase(cell_info[i].begin() + column);
--columns_;
- Reinit();
-}
-
-
-void LyXTabular::reinit()
-{
- Reinit(false);
+ fixCellNums();
}
-void LyXTabular::Reinit(bool reset_widths)
-{
- if (reset_widths) {
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
- cell_info[i][j].width_of_cell = 0;
- cell_info[i][j].inset.setOwner(owner_);
- }
- }
- }
-
- for (int i = 0; i < columns_; ++i)
- calculate_width_of_column(i);
-
- calculate_width_of_tabular();
-
- set_row_column_number_info();
-}
-
-
-void LyXTabular::set_row_column_number_info(bool oldformat)
+void LyXTabular::set_row_column_number_info()
{
numberofcells = -1;
for (int row = 0; row < rows_; ++row) {
} while (column < columns_ &&
cell_info[row][column].multicolumn
== LyXTabular::CELL_PART_OF_MULTICOLUMN);
+
if (column == columns_) {
column = 0;
++row;
for (int column = 0; column < columns_; ++column) {
if (isPartOfMultiColumn(row,column))
continue;
- // now set the right line of multicolumns right for oldformat read
- if (oldformat &&
- cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
- {
- int cn = cells_in_multicolumn(cell_info[row][column].cellno);
- cell_info[row][column].right_line =
- cell_info[row][column+cn-1].right_line;
- }
cell_info[row][column].inset.setAutoBreakRows(
!getPWidth(getCellNumber(row, column)).zero());
}
bool LyXTabular::rightLine(int cell, bool onlycolumn) const
{
if (!onlycolumn && isMultiColumn(cell) &&
- (isLastCellInRow(cell) || isMultiColumn(cell+1)))
+ (isLastCellInRow(cell) || isMultiColumn(cell + 1)))
{
if (cellinfo_of_cell(cell).align_special.empty())
return cellinfo_of_cell(cell).right_line;
bool LyXTabular::isLastRow(int cell) const
{
- return (row_of_cell(cell) == rows_ - 1);
+ return row_of_cell(cell) == rows_ - 1;
}
// returns 1 if a complete update is necessary, otherwise 0
-bool LyXTabular::setWidthOfCell(int cell, int new_width)
+void LyXTabular::setWidthOfCell(int cell, int new_width)
{
int const row = row_of_cell(cell);
int const column1 = column_of_cell(cell);
column1 < columns_ - 1 &&
leftLine(cell_info[row][column1+1].cellno, true))
{
- // additional width
add_width = WIDTH_OF_LINE;
}
- if (getWidthOfCell(cell) == new_width + 2 * WIDTH_OF_LINE + add_width) {
- return false;
- }
- if (isMultiColumn(cell, true)) {
+
+ if (getWidthOfCell(cell) == new_width + 2 * WIDTH_OF_LINE + add_width)
+ return;
+
+ if (isMultiColumnReal(cell)) {
tmp = setWidthOfMulticolCell(cell, new_width);
} else {
width = new_width + 2 * WIDTH_OF_LINE + add_width;
for (int i = 0; i < columns_; ++i)
calculate_width_of_column(i);
calculate_width_of_tabular();
- return true;
}
- return false;
}
bool LyXTabular::setMColumnPWidth(int cell, LyXLength const & width)
{
- bool const flag = !width.zero();
+ if (!isMultiColumn(cell))
+ return false;
cellinfo_of_cell(cell).p_width = width;
- if (isMultiColumn(cell)) {
- getCellInset(cell).setAutoBreakRows(flag);
- return true;
- }
- return false;
+ getCellInset(cell).setAutoBreakRows(!width.zero());
+ return true;
}
int max = 0;
for (int i = 0; i < rows_; ++i) {
int cell = getCellNumber(i, column);
- bool ismulti = isMultiColumn(cell, true);
+ bool ismulti = isMultiColumnReal(cell);
if ((!ismulti || column == right_column_of_cell(cell)) &&
cell_info[i][column].width_of_cell > max)
{
}
-void LyXTabular::write(Buffer const * buf, ostream & os) const
+void LyXTabular::write(Buffer const & buf, ostream & os) const
{
// header line
os << "<lyxtabular"
<< ">\n";
os << "\\begin_inset ";
cell_info[i][j].inset.write(buf, os);
- os << "\n\\end_inset \n"
+ os << "\n\\end_inset\n"
<< "</cell>\n";
}
os << "</row>\n";
}
-void LyXTabular::read(Buffer const * buf, LyXLex & lex)
+void LyXTabular::read(Buffer const & buf, LyXLex & lex)
{
string line;
istream & is = lex.getStream();
l_getline(is, line);
if (!prefixIs(line, "<lyxtabular ")
&& !prefixIs(line, "<LyXTabular ")) {
- Assert(false);
+ BOOST_ASSERT(false);
return;
}
int version;
if (!getTokenValue(line, "version", version))
return;
- Assert(version >= 2);
+ BOOST_ASSERT(version >= 2);
int rows_arg;
if (!getTokenValue(line, "rows", rows_arg))
int columns_arg;
if (!getTokenValue(line, "columns", columns_arg))
return;
- init(buf->params, rows_arg, columns_arg);
+ init(buf.params(), rows_arg, columns_arg);
l_getline(is, line);
if (!prefixIs(line, "<features")) {
lyxerr << "Wrong tabular format (expected <features ...> got"
}
-bool LyXTabular::isMultiColumn(int cell, bool real) const
+bool LyXTabular::isMultiColumn(int cell) const
+{
+ return cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
+}
+
+
+bool LyXTabular::isMultiColumnReal(int cell) const
{
- return (!real || column_of_cell(cell) != right_column_of_cell(cell)) &&
+ return column_of_cell(cell) != right_column_of_cell(cell) &&
cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
}
for (int i = 1; i < number; ++i) {
cellstruct & cs1 = cellinfo_of_cell(cell + i);
cs1.multicolumn = CELL_PART_OF_MULTICOLUMN;
- cs.inset.appendParagraphs(buffer, cs1.inset.paragraphs);
+ cs.inset.appendParagraphs(buffer, cs1.inset.paragraphs());
cs1.inset.clear(false);
}
set_row_column_number_info();
int LyXTabular::getCellNumber(int row, int column) const
{
- Assert(column >= 0 || column < columns_ || row >= 0 || row < rows_);
+ BOOST_ASSERT(column >= 0 || column < columns_ || row >= 0 || row < rows_);
return cell_info[row][column].cellno;
}
// end longtable support functions
-bool LyXTabular::setAscentOfRow(int row, int height)
+void LyXTabular::setAscentOfRow(int row, int height)
{
if (row >= rows_ || row_info[row].ascent_of_row == height)
- return false;
+ return;
row_info[row].ascent_of_row = height;
- return true;
}
-bool LyXTabular::setDescentOfRow(int row, int height)
+void LyXTabular::setDescentOfRow(int row, int height)
{
if (row >= rows_ || row_info[row].descent_of_row == height)
- return false;
+ return;
row_info[row].descent_of_row = height;
- return true;
}
int LyXTabular::getDescentOfRow(int row) const
{
- if (row >= rows_)
- return 0;
+ BOOST_ASSERT(row < rows_);
return row_info[row].descent_of_row;
}
bool LyXTabular::isPartOfMultiColumn(int row, int column) const
{
- if (row >= rows_ || column >= columns_)
- return false;
+ BOOST_ASSERT(row < rows_);
+ BOOST_ASSERT(column < columns_);
return cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN;
}
int LyXTabular::TeXTopHLine(ostream & os, int row) const
{
- if (row < 0 || row >= rows_)
- return 0;
+ BOOST_ASSERT(row >= 0);
+ BOOST_ASSERT(row < rows_);
int const fcell = getFirstCellInRow(row);
int const n = numberOfCellsInRow(fcell) + fcell;
case LYX_VALIGN_TOP:
os << 'p';
break;
- case LYX_VALIGN_CENTER:
+ case LYX_VALIGN_MIDDLE:
os << 'm';
break;
case LYX_VALIGN_BOTTOM:
case LYX_VALIGN_TOP:
os << 't';
break;
- case LYX_VALIGN_CENTER:
+ case LYX_VALIGN_MIDDLE:
os << 'c';
break;
case LYX_VALIGN_BOTTOM:
case LYX_VALIGN_TOP:
os << 't';
break;
- case LYX_VALIGN_CENTER:
+ case LYX_VALIGN_MIDDLE:
os << 'm';
break;
case LYX_VALIGN_BOTTOM:
}
-int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
- LatexRunParams const & runparams) const
+int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const & buf,
+ OutputParams const & runparams) const
{
if (!is_long_tabular)
return 0;
}
-bool LyXTabular::isValidRow(int const row) const
+bool LyXTabular::isValidRow(int row) const
{
if (!is_long_tabular)
return true;
- return (!row_info[row].endhead && !row_info[row].endfirsthead &&
- !row_info[row].endfoot && !row_info[row].endlastfoot);
+ return !row_info[row].endhead && !row_info[row].endfirsthead &&
+ !row_info[row].endfoot && !row_info[row].endlastfoot;
}
-int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf,
- LatexRunParams const & runparams) const
+int LyXTabular::TeXRow(ostream & os, int i, Buffer const & buf,
+ OutputParams const & runparams) const
{
int ret = 0;
int cell = getCellNumber(i, 0);
ret += TeXCellPreamble(os, cell);
InsetText & inset = getCellInset(cell);
- bool rtl = inset.paragraphs.begin()->isRightToLeftPar(buf->params) &&
- !inset.paragraphs.begin()->empty() && getPWidth(cell).zero();
+ Paragraph & par = inset.paragraphs().front();
+ bool rtl = par.isRightToLeftPar(buf.params())
+ && !par.empty()
+ && getPWidth(cell).zero();
if (rtl)
os << "\\R{";
}
-int LyXTabular::latex(Buffer const * buf, ostream & os,
- LatexRunParams const & runparams) const
+int LyXTabular::latex(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
int ret = 0;
case LYX_VALIGN_TOP:
os << 'p';
break;
- case LYX_VALIGN_CENTER:
+ case LYX_VALIGN_MIDDLE:
os << 'm';
break;
case LYX_VALIGN_BOTTOM:
}
-int LyXTabular::linuxdoc(Buffer const * buf, ostream & os) const
+int LyXTabular::linuxdoc(Buffer const & buf, ostream & os,
+ const OutputParams & runparams) const
{
os << "<tabular ca=\"";
for (int i = 0; i < columns_; ++i) {
if (isPartOfMultiColumn(i, j))
continue;
InsetText & inset = getCellInset(cell);
-
- ret += inset.linuxdoc(buf, os);
+
+ ret += inset.linuxdoc(buf, os, runparams);
if (isLastCellInRow(cell)) {
os << "@\n";
}
-int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const
+int LyXTabular::docbookRow(Buffer const & buf, ostream & os, int row,
+ OutputParams const & runparams) const
{
int ret = 0;
int cell = getFirstCellInRow(row);
case LYX_VALIGN_BOTTOM:
os << "bottom";
break;
- case LYX_VALIGN_CENTER:
+ case LYX_VALIGN_MIDDLE:
os << "middle";
}
os << '"';
}
os << '>';
- ret += getCellInset(cell).docbook(buf, os, true);
+ OutputParams runp = runparams;
+ runp.mixed_content = true;
+ ret += getCellInset(cell).docbook(buf, os, runp);
os << "</entry>\n";
++cell;
}
}
-int LyXTabular::docbook(Buffer const * buf, ostream & os,
- bool /*mixcont*/) const
+int LyXTabular::docbook(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
int ret = 0;
os << "center";
break;
}
- os << "\">\n";
+ os << '"';
+ if (runparams.flavor == OutputParams::XML)
+ os << '/';
+ os << ">\n";
++ret;
}
++ret;
for (int i = 0; i < rows_; ++i) {
if (row_info[i].endhead || row_info[i].endfirsthead) {
- ret += docbookRow(buf, os, i);
+ ret += docbookRow(buf, os, i, runparams);
}
}
os << "</thead>\n";
++ret;
for (int i = 0; i < rows_; ++i) {
if (row_info[i].endfoot || row_info[i].endlastfoot) {
- ret += docbookRow(buf, os, i);
+ ret += docbookRow(buf, os, i, runparams);
}
}
os << "</tfoot>\n";
++ret;
for (int i = 0; i < rows_; ++i) {
if (isValidRow(i)) {
- ret += docbookRow(buf, os, i);
+ ret += docbookRow(buf, os, i, runparams);
}
}
os << "</tbody>\n";
}
int column = column_of_cell(i);
int len = clen[column];
- while (isPartOfMultiColumn(row, ++column))
+ while (column < columns_ - 1
+ && isPartOfMultiColumn(row, ++column))
len += clen[column] + 4;
os << string(len, ch);
if (topLine(i)) {
}
int column = column_of_cell(i);
int len = clen[column];
- while (isPartOfMultiColumn(row, ++column))
+ while (column < columns_ -1
+ && isPartOfMultiColumn(row, ++column))
len += clen[column] + 4;
os << string(len, ch);
if (bottomLine(i)) {
}
-int LyXTabular::asciiPrintCell(Buffer const * buf, ostream & os,
+int LyXTabular::asciiPrintCell(Buffer const & buf, ostream & os,
+ OutputParams const & runparams,
int cell, int row, int column,
vector<unsigned int> const & clen,
bool onlydata) const
{
ostringstream sstr;
- int ret = getCellInset(cell).ascii(buf, sstr, 0);
+ int ret = getCellInset(cell).plaintext(buf, sstr, runparams);
if (onlydata) {
os << sstr.str();
unsigned int len1 = sstr.str().length();
unsigned int len2 = clen[column];
- while (isPartOfMultiColumn(row, ++column))
+ while (column < columns_ -1
+ && isPartOfMultiColumn(row, ++column))
len2 += clen[column] + 4;
len2 -= len1;
}
-int LyXTabular::ascii(Buffer const * buf, ostream & os, int const depth,
- bool onlydata, unsigned char delim) const
+int LyXTabular::plaintext(Buffer const & buf, ostream & os,
+ OutputParams const & runparams,
+ int const depth,
+ bool onlydata, unsigned char delim) const
{
int ret = 0;
clen[j] = 0;
for (int i = 0; i < rows_; ++i) {
int cell = getCellNumber(i, j);
- if (isMultiColumn(cell, true))
+ if (isMultiColumnReal(cell))
continue;
ostringstream sstr;
- getCellInset(cell).ascii(buf, sstr, 0);
+ getCellInset(cell).plaintext(buf, sstr, runparams);
if (clen[j] < sstr.str().length())
clen[j] = sstr.str().length();
}
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))
+ if (!isMultiColumnReal(cell) || isPartOfMultiColumn(i, j))
continue;
ostringstream sstr;
- getCellInset(cell).ascii(buf, sstr, 0);
+ 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)
continue;
if (onlydata && j > 0)
os << delim;
- ret += asciiPrintCell(buf, os, cell, i, j, clen, onlydata);
+ ret += asciiPrintCell(buf, os, runparams,
+ cell, i, j, clen, onlydata);
++cell;
}
os << endl;
InsetText & LyXTabular::getCellInset(int cell) const
{
- cur_cell = cell;
return cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
}
InsetText & LyXTabular::getCellInset(int row, int column) const
{
- cur_cell = getCellNumber(row, column);
return cell_info[row][column].inset;
}
-int LyXTabular::getCellFromInset(InsetOld const * inset, int maybe_cell) const
+int LyXTabular::getCellFromInset(InsetBase const * inset) const
{
// is this inset part of the tabular?
- if (!inset || inset->owner() != owner_) {
- lyxerr << "this is not a cell of the tabular!" << endl;
- Assert(0);
- }
-
- const int save_cur_cell = cur_cell;
- int cell = cur_cell;
- if (&getCellInset(cell) != inset) {
- cell = maybe_cell;
- if (cell == -1 || &getCellInset(cell) != inset) {
- cell = -1;
- }
+ if (!inset) {
+ lyxerr << "Error: this is not a cell of the tabular!" << endl;
+ BOOST_ASSERT(false);
}
- if (cell == -1) {
- for (cell = getNumberOfCells(); cell >= 0; --cell) {
- if (&getCellInset(cell) == inset)
- break;
+ for (int cell = 0, n = getNumberOfCells(); cell < n; ++cell)
+ if (&getCellInset(cell) == inset) {
+ lyxerr[Debug::INSETTEXT] << "LyXTabular::getCellFromInset: "
+ << "cell=" << cell << endl;
+ return cell;
}
- lyxerr[Debug::INSETTEXT]
- << "LyXTabular::getCellFromInset: "
- << "cell=" << cell
- << ", cur_cell=" << save_cur_cell
- << ", maybe_cell=" << maybe_cell
- << endl;
- // We should have found a cell at this point
- if (cell == -1) {
- lyxerr << "LyXTabular::getCellFromInset: "
- << "Cell not found!" << endl;
- }
- }
- return cell;
+ // We should have found a cell at this point
+ lyxerr << "LyXTabular::getCellFromInset: Cell of inset "
+ << inset << " not found!" << endl;
+ BOOST_ASSERT(false);
+ // shut up compiler
+ return 0;
}
}
-void LyXTabular::getLabelList(std::vector<string> & list) const
+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)
- getCellInset(i, j).getLabelList(list);
+ getCellInset(i, j).getLabelList(buffer, list);
}
LyXTabular::BoxType LyXTabular::useParbox(int cell) const
{
- ParagraphList const & parlist = getCellInset(cell).paragraphs;
+ ParagraphList const & parlist = getCellInset(cell).paragraphs();
ParagraphList::const_iterator cit = parlist.begin();
ParagraphList::const_iterator end = parlist.end();
projects / lyx.git / blobdiff