#include "bufferparams.h"
#include "debug.h"
#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
#include "lyxlex.h"
#include "paragraph.h"
}
-#warning for some strange reason, cellstruct does not seem to have copy-semantics
-
-// work around using 'swap' only...
-
void LyXTabular::appendRow(BufferParams const & bp, int cell)
{
++rows_;
{
++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 (cell_info[i][column + 1].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
+ cell_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;
+ || 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);
}
-int LyXTabular::linuxdoc(Buffer const & buf, ostream & os) const
+int LyXTabular::linuxdoc(Buffer const & buf, ostream & os,
+ const LatexRunParams & runparams) const
{
os << "<tabular ca=\"";
for (int i = 0; i < columns_; ++i) {
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,
+ LatexRunParams const & runparams) const
{
int ret = 0;
int cell = getFirstCellInRow(row);
}
os << '>';
- ret += getCellInset(cell).docbook(buf, os, true);
+ LatexRunParams 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
+ LatexRunParams const & runparams) const
{
int ret = 0;
++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 LyXTabular::asciiPrintCell(Buffer const & buf, ostream & os,
+ LatexRunParams 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).ascii(buf, sstr, runparams);
if (onlydata) {
os << sstr.str();
}
-int LyXTabular::ascii(Buffer const & buf, ostream & os, int const depth,
- bool onlydata, unsigned char delim) const
+int LyXTabular::ascii(Buffer const & buf, ostream & os,
+ LatexRunParams const & runparams,
+ int const depth,
+ bool onlydata, unsigned char delim) const
{
int ret = 0;
if (isMultiColumnReal(cell))
continue;
ostringstream sstr;
- getCellInset(cell).ascii(buf, sstr, 0);
+ getCellInset(cell).ascii(buf, sstr, runparams);
if (clen[j] < sstr.str().length())
clen[j] = sstr.str().length();
}
if (!isMultiColumnReal(cell) || isPartOfMultiColumn(i, j))
continue;
ostringstream sstr;
- getCellInset(cell).ascii(buf, sstr, 0);
+ getCellInset(cell).ascii(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;