#include "debug.h"
#include "LaTeXFeatures.h"
#include "lyxlex.h"
+#include "outputparams.h"
#include "paragraph.h"
#include "insets/insettabular.h"
#include "support/lstrings.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
+#include <sstream>
using lyx::support::ltrim;
using lyx::support::prefixIs;
using std::ostream;
using std::ostringstream;
using std::vector;
+using std::string;
#ifndef CXX_GLOBAL_CSTD
using std::strlen;
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;
// activates all lines and sets all widths to 0
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)));
-
- int cellno = 0;
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
- cell_info[i][j].inset.setDrawFrame(InsetText::LOCKED);
- cell_info[i][j].cellno = cellno++;
- }
+ 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;
- rowofcell.clear();
- columnofcell.clear();
- set_row_column_number_info();
is_long_tabular = false;
rotate = false;
}
-void LyXTabular::setOwner(InsetTabular * inset)
+void LyXTabular::fixCellNums()
{
- for (int i = 0; i < rows_; ++i)
- for (int j = 0; j < columns_; ++j)
- cell_info[i][j].inset.setOwner(inset);
+ int cellno = 0;
+ for (int i = 0; i < rows_; ++i) {
+ for (int j = 0; j < columns_; ++j) {
+ // 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;
+ }
+
+ set_row_column_number_info();
}
// 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 old(rows_ - 1);
+ for (int i = 0; i < rows_ - 1; ++i)
+ swap(cell_info[i], old[i]);
- cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
- cellstruct(bp)));
+ cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp)));
for (int i = 0; i <= row; ++i)
- for (int j = 0; j < columns_; ++j)
- c_info[i][j] = cell_info[i][j];
+ swap(cell_info[i], old[i]);
+ for (int i = row + 2; i < rows_; ++i)
+ swap(cell_info[i], old[i - 1]);
- for (int i = row + 1; i < rows_; ++i)
+ if (bp.tracking_changes)
for (int j = 0; j < columns_; ++j)
- c_info[i][j] = cell_info[i-1][j];
+ cell_info[row + 1][j].inset.markNew(true);
- 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
+ set_row_column_number_info();
}
row_info.erase(row_info.begin() + row);
cell_info.erase(cell_info.begin() + row);
--rows_;
+ 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 (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);
if (bp.tracking_changes)
cell_info[i][column + 1].inset.markNew(true);
}
+ fixCellNums();
}
for (int i = 0; i < rows_; ++i)
cell_info[i].erase(cell_info[i].begin() + column);
--columns_;
+ fixCellNums();
}
-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) {
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::isLastRow(int cell) const
{
- return (row_of_cell(cell) == rows_ - 1);
+ return row_of_cell(cell) == rows_ - 1;
}
<< ">\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";
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::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;
int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const & buf,
- LatexRunParams const & runparams) const
+ OutputParams const & runparams) const
{
if (!is_long_tabular)
return 0;
int LyXTabular::TeXRow(ostream & os, int i, Buffer const & buf,
- LatexRunParams const & runparams) const
+ OutputParams const & runparams) const
{
int ret = 0;
int cell = getCellNumber(i, 0);
- BufferParams const & bufferparams = buf.params();
ret += TeXTopHLine(os, i);
for (int j = 0; j < columns_; ++j) {
ret += TeXCellPreamble(os, cell);
InsetText & inset = getCellInset(cell);
- bool rtl = inset.paragraphs.begin()->isRightToLeftPar(bufferparams) &&
- !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
+ OutputParams const & runparams) const
{
int ret = 0;
}
-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) {
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);
}
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
+ 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,
+ 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;
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();
}
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;
}
-int LyXTabular::getCellFromInset(InsetOld const * inset) const
+int LyXTabular::getCellFromInset(InsetBase const * inset) const
{
// is this inset part of the tabular?
if (!inset) {
lyxerr << "Error: this is not a cell of the tabular!" << endl;
- return -1;
+ BOOST_ASSERT(false);
}
- for (int cell = getNumberOfCells(); cell >= 0; --cell)
+ for (int cell = 0, n = getNumberOfCells(); cell < n; ++cell)
if (&getCellInset(cell) == inset) {
lyxerr[Debug::INSETTEXT] << "LyXTabular::getCellFromInset: "
<< "cell=" << cell << endl;
}
// We should have found a cell at this point
- lyxerr << "LyXTabular::getCellFromInset: Cell not found!" << endl;
- return -1;
+ lyxerr << "LyXTabular::getCellFromInset: Cell of inset "
+ << inset << " not found!" << endl;
+ BOOST_ASSERT(false);
+ // shut up compiler
+ return 0;
}
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