*
* LyX, The Document Processor
*
- * Copyright 2000 The LyX Team.
+ * Copyright 2000 The LyX Team.
+ *
+ * @author: Jürgen Vigna
*
* ======================================================
*/
#include <config.h>
-#include <algorithm>
-#include <cstdlib>
-
#ifdef __GNUG__
#pragma implementation
#endif
+#include <algorithm>
+#include <cstdlib>
+
#include "tabular.h"
#include "debug.h"
#include "vspace.h"
static int const WIDTH_OF_LINE = 5;
+extern BufferView * current_view;
+
/// Define a few methods for the inner structs
LyXTabular::cellstruct::cellstruct()
{
- cellno = 0; //should be initilaized correctly later.
+ cellno = 0;
width_of_cell = 0;
multicolumn = LyXTabular::CELL_NORMAL;
alignment = LYX_ALIGN_CENTER;
- top_line = true;
+ valignment = LYX_VALIGN_TOP;
+ top_line = false;
bottom_line = false;
+ left_line = false;
+ right_line = false;
+ usebox = BOX_NONE;
rotate = false;
- linebreaks = false;
- inset = 0;
-}
-
-
-LyXTabular::cellstruct::~cellstruct()
-{
- delete inset;
-}
-
-
-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;
-// if (cs.inset)
-// inset = static_cast<InsetText *>(cs.inset->Clone());
-}
-
-
-LyXTabular::cellstruct &
-LyXTabular::cellstruct::operator=(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;
- if (cs.inset)
- inset = static_cast<InsetText *>(cs.inset->Clone());
- return *this;
}
left_line = true;
right_line = false;
alignment = LYX_ALIGN_CENTER;
+ valignment = LYX_VALIGN_TOP;
width_of_column = 0;
}
{
owner_ = inset;
Init(lt.rows_, lt.columns_);
-
+#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)
operator=(lt);
}
-LyXTabular::LyXTabular(InsetTabular * inset, LyXLex & lex)
+LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex)
{
owner_ = inset;
- Read(lex);
+ Read(buf, lex);
}
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);
+ 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;
/* 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;
(rows_, vector<cellstruct>(columns_, cellstruct()));
// Jürgen, use iterators.
- for (i = 0; i < rows_; ++i) {
- for (j = 0; j < columns_; ++j) {
- if (!cell_info[i][j].inset)
- cell_info[i][j].inset = new InsetText(owner_->BufferOwner());
- cell_info[i][j].inset->setOwner(owner_);
- cell_info[i][j].inset->SetDrawLockedFrame(true);
+ int cellno = 0;
+ int i = 0;
+ for (; 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++;
}
}
- row_info[i-1].bottom_line = true;
+ 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;
+ column_info[columns_ - 1].right_line = true;
calculate_width_of_tabular();
columnofcell = 0;
set_row_column_number_info();
is_long_tabular = false;
- rotate = 0;
- endhead = -1;
- endfirsthead = -1;
- endfoot = -1;
- endlastfoot = -1;
+ rotate = false;
+ endhead = 0;
+ endfirsthead = 0;
+ endfoot = 0;
+ endlastfoot = 0;
}
void LyXTabular::AppendRow(int cell )
{
-// cell_vector::iterator cit = cell_info.begin() + row;
-// cell_info.insert(cit, vector<cellstruct>(columns_, cellstruct()));
-// cell_info.insert(cell_info.begin(), vector<cellstruct>(columns_, cellstruct()));
-
++rows_;
-// row_vector r_info = row_vector(rows_, rowstruct());
-
- cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
- cellstruct()));
int row = row_of_cell(cell);
- int i;
row_vector::iterator rit = row_info.begin() + row;
row_info.insert(rit, rowstruct());
- for(i = 0; i <= row; ++i) {
-// r_info[i] = row_info[i];
+#if 0
+ cell_vvector::iterator cit = cell_info.begin() + row;
+ cell_info.insert(cit, vector<cellstruct>(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(i = row+1; i < rows_; ++i) {
-// r_info[i] = row_info[i-1];
+ for(int i = row + 1; i < rows_; ++i) {
for(int j = 0; j < columns_; ++j) {
c_info[i][j] = cell_info[i-1][j];
}
}
-// row_info = r_info;
cell_info = c_info;
- for(i = 0; i < rows_; ++i) {
- for(int j = 0; j < columns_; ++j) {
- cell_info[i][j].inset = static_cast<InsetText *>(c_info[i][j].inset->Clone());
- }
- }
++row;
for (int j = 0; j < columns_; ++j) {
- cell_info[row][j].inset->clear();
+ cell_info[row][j].inset.clear();
}
+#endif
Reinit();
}
cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
cellstruct()));
int column = column_of_cell(cell);
- int i, j;
- column_vector::iterator cit = column_info.begin() + column;
+ column_vector::iterator cit = column_info.begin() + column + 1;
column_info.insert(cit, columnstruct());
- for (i = 0; i < rows_; ++i) {
- for (j = 0; j <= column; ++j) {
+ for (int i = 0; i < rows_; ++i) {
+ for (int j = 0; j <= column; ++j) {
c_info[i][j] = cell_info[i][j];
}
- for (j = column+1; j < columns_; ++j) {
- c_info[i][j] = cell_info[i][j-1];
+ 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 (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;
+ 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;
- for(i = 0; i < rows_; ++i) {
- for(j = 0; j < columns_; ++j) {
- cell_info[i][j].inset = static_cast<InsetText *>(c_info[i][j].inset->Clone());
- }
- }
++column;
- for (i = 0; i < rows_; ++i) {
- cell_info[i][column].inset->clear();
+ for (int i = 0; i < rows_; ++i) {
+ cell_info[i][column].inset.clear();
}
Reinit();
}
void LyXTabular::Reinit()
{
- int j;
-
- int i = 0;
-
// Jürgen, use iterators.
- for (; i < rows_; ++i) {
- for (j = 0; j < columns_; ++j) {
+ 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) {
+ for (int i = 0; i < columns_; ++i) {
calculate_width_of_column(i);
}
calculate_width_of_tabular();
for (column = 0; column<columns_; ++column) {
if (IsPartOfMultiColumn(row,column))
continue;
- cell_info[row][column].inset->SetAutoBreakRows(
+ cell_info[row][column].inset.SetAutoBreakRows(
!GetPWidth(GetCellNumber(row, column)).empty());
}
}
/* 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))
+ 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;
- if (IsMultiColumn(cell))
+ 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
{
+ 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
{
+ if (!onlycolumn && IsMultiColumn(cell))
+ return cellinfo_of_cell(cell)->right_line;
return column_info[right_column_of_cell(cell)].right_line;
}
int top = 1; // bool top = true; ??
int bottom = 1; // bool bottom = true; ??
- int column;
- for (column = 0; column < columns_ - 1 && bottom; ++column) {
+ 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;
bottom = row_info[row - 1].bottom_line;
}
}
- for (column = 0; column < columns_ - 1 && top; ++column) {
+ 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;
// 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 const column1 = column_of_cell(cell);
+ int const column2 = right_column_of_cell(cell);
int result = 0;
int i = column1;
for (; i <= column2; ++i) {
if (!IsMultiColumn(cell))
return false;
- 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;
}
// 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) {
+ for (i = column1; (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 (i == column2) {
+ 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;
/* 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 const row = row_of_cell(cell);
+ int const column1 = column_of_cell(cell);
+ bool tmp = false;
int width = 0;
- if (IsMultiColumn(cell)) {
+ 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);
tmp = calculate_width_of_column_NMC(column1);
}
if (tmp) {
- int i;
- for(i = 0; i<columns_;++i)
+ int i = 0;
+ for(; i<columns_; ++i)
calculate_width_of_column_NMC(i);
- for(i = 0; (i<numberofcells) && !IsMultiColumn(i); ++i)
+ for(i = 0; (i < numberofcells) && !IsMultiColumn(i); ++i)
;
- if (i<numberofcells)
+ if (i < numberofcells)
recalculateMulticolCells(i, GetWidthOfCell(i)-(2*WIDTH_OF_LINE));
- for(i = 0; i<columns_;++i)
+ for(i = 0; i < columns_; ++i)
calculate_width_of_column(i);
calculate_width_of_tabular();
return true;
}
-bool LyXTabular::SetAlignment(int cell, char align)
+bool LyXTabular::SetAlignment(int cell, char align, bool onlycolumn)
{
- if (!IsMultiColumn(cell))
+ if (!IsMultiColumn(cell) || onlycolumn)
column_info[column_of_cell(cell)].alignment = align;
- cellinfo_of_cell(cell)->alignment = align;
+ if (!onlycolumn)
+ cellinfo_of_cell(cell)->alignment = align;
return true;
}
-bool LyXTabular::SetPWidth(int cell, string const & width)
+bool LyXTabular::SetVAlignment(int cell, char 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) {
+ int c = GetCellNumber(i, j);
+ flag = !GetPWidth(c).empty(); // because of multicolumns!
+ GetCellInset(c)->SetAutoBreakRows(flag);
+ }
+ return true;
+}
+
+bool LyXTabular::SetMColumnPWidth(int cell, string const & width)
+{
+ bool const flag = !width.empty();
+
+ cellinfo_of_cell(cell)->p_width = width;
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;
- 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);
- }
+ return true;
}
- return true;
+ return false;
}
}
-bool LyXTabular::SetTopLine(int cell, bool line)
+bool LyXTabular::SetTopLine(int cell, bool line, bool onlycolumn)
{
- int row = row_of_cell(cell);
+ int const row = row_of_cell(cell);
- if (!IsMultiColumn(cell))
+ if (onlycolumn || !IsMultiColumn(cell))
row_info[row].top_line = line;
else
cellinfo_of_cell(cell)->top_line = line;
}
-bool LyXTabular::SetBottomLine(int cell, bool line)
+bool LyXTabular::SetBottomLine(int cell, bool line, bool onlycolumn)
{
- if (!IsMultiColumn(cell))
+ if (onlycolumn || !IsMultiColumn(cell))
row_info[row_of_cell(cell)].bottom_line = line;
else
cellinfo_of_cell(cell)->bottom_line = line;
}
-bool LyXTabular::SetLeftLine(int cell, bool line)
+bool LyXTabular::SetLeftLine(int cell, bool line, bool onlycolumn)
{
- column_info[column_of_cell(cell)].left_line = line;
+ 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::SetRightLine(int cell, bool line)
+bool LyXTabular::SetRightLine(int cell, bool line, bool onlycolumn)
{
- column_info[right_column_of_cell(cell)].right_line = line;
+ if (onlycolumn || !IsMultiColumn(cell))
+ column_info[right_column_of_cell(cell)].right_line = line;
+ else
+ cellinfo_of_cell(cell)->right_line = line;
return true;
}
-char LyXTabular::GetAlignment(int cell) const
+char LyXTabular::GetAlignment(int cell, bool onlycolumn) const
{
- if (IsMultiColumn(cell))
+ if (!onlycolumn && IsMultiColumn(cell))
return cellinfo_of_cell(cell)->alignment;
else
return column_info[column_of_cell(cell)].alignment;
}
-string LyXTabular::GetPWidth(int cell) const
+char LyXTabular::GetVAlignment(int cell, bool onlycolumn) const
+{
+ if (!onlycolumn && IsMultiColumn(cell))
+ return cellinfo_of_cell(cell)->valignment;
+ else
+ return column_info[column_of_cell(cell)].valignment;
+}
+
+
+string const LyXTabular::GetPWidth(int cell) const
{
if (IsMultiColumn(cell))
return cellinfo_of_cell(cell)->p_width;
}
-string LyXTabular::GetAlignSpecial(int cell, int what) const
+string const LyXTabular::GetColumnPWidth(int cell) const
+{
+ return column_info[column_of_cell(cell)].p_width;
+}
+
+
+string const LyXTabular::GetMColumnPWidth(int cell) const
+{
+ 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;
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 const row = row_of_cell(cell);
+ int const column1 = column_of_cell(cell);
+ int const column2 = right_column_of_cell(cell);
int result = 0;
- int i = column1;
- for (; i <= column2; ++i) {
+ for (int i = column1; i <= column2; ++i) {
result += cell_info[row][i].width_of_cell;
}
-
-// result += GetAdditionalWidth(cell);
-
return result;
}
bool LyXTabular::calculate_width_of_column(int column)
{
- int old_column_width = column_info[column].width_of_column;
+ int const old_column_width = column_info[column].width_of_column;
int maximum = 0;
for (int i = 0; i < rows_; ++i) {
}
+//
+// 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 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)) &&
+ if (!IsMultiColumn(GetCellNumber(i, column), true) &&
(cell_info[i][column].width_of_cell > max)) {
max = cell_info[i][column].width_of_cell;
}
int LyXTabular::right_column_of_cell(int cell) const
{
- int row = row_of_cell(cell);
+ 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)
}
-void LyXTabular::Write(ostream & os) const
+void LyXTabular::Write(Buffer const * buf, ostream & os) const
{
- int i, j;
-
// header line
os << "<LyXTabular version=1 rows=" << rows_ << " columns=" << columns_ <<
">" << endl;
" endhead=" << endhead << " endfirsthead=" << endfirsthead <<
" endfoot=" << endfoot << " endlastfoot=" << endlastfoot <<
">" << endl << endl;
- for (i = 0; i < rows_; ++i) {
+ for (int i = 0; i < rows_; ++i) {
os << "<Row topline=" << row_info[i].top_line <<
" bottomline=" << row_info[i].bottom_line <<
" newpage=" << row_info[i].newpage <<
">" << endl;
- for (j = 0; j < columns_; ++j) {
+ for (int j = 0; j < columns_; ++j) {
if (!i) {
os << "<Column alignment=" << column_info[j].alignment <<
+ " valignment=" << column_info[j].valignment <<
" leftline=" << column_info[j].left_line <<
" rightline=" << column_info[j].right_line <<
" width=\"" << VSpace(column_info[j].p_width).asLyXCommand() <<
}
os << "<Cell multicolumn=" << cell_info[i][j].multicolumn <<
" alignment=" << cell_info[i][j].alignment <<
+ " valignment=" << cell_info[i][j].valignment <<
" topline=" << cell_info[i][j].top_line <<
" bottomline=" << cell_info[i][j].bottom_line <<
+ " leftline=" << cell_info[i][j].left_line <<
+ " rightline=" << cell_info[i][j].right_line <<
" rotate=" << cell_info[i][j].rotate <<
- " linebreaks=" << cell_info[i][j].linebreaks <<
+ " usebox=" << (int)cell_info[i][j].usebox <<
" width=\"" << cell_info[i][j].p_width <<
"\" special=\"" << cell_info[i][j].align_special <<
"\">" << endl;
os << "\\begin_inset ";
- cell_info[i][j].inset->Write(os);
+ cell_info[i][j].inset.Write(buf, os);
os << "\n\\end_inset " << endl;
os << "</Cell>" << endl;
os << "</Column>" << endl;
}
+static inline
void l_getline(istream & is, string & str)
{
getline(is, str);
}
-void LyXTabular::Read(LyXLex & lex)
+void LyXTabular::Read(Buffer const * buf, LyXLex & lex)
{
string line;
istream & is = lex.getStream();
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);
+ getTokenValue(line, "islongtable", is_long_tabular);
+ getTokenValue(line, "endhead", endhead);
+ getTokenValue(line, "endfirsthead", endfirsthead);
+ getTokenValue(line, "endfoot", endfoot);
+ getTokenValue(line, "endlastfoot", endlastfoot);
int i, j;
for(i = 0; i < rows_; ++i) {
l_getline(is, line);
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);
+ getTokenValue(line, "topline", row_info[i].top_line);
+ getTokenValue(line, "bottomline", row_info[i].bottom_line);
+ getTokenValue(line, "newpage", row_info[i].newpage);
for (j = 0; j < columns_; ++j) {
l_getline(is,line);
if (!prefixIs(line,"<Column")) {
return;
}
if (!i) {
- (void)getTokenValue(line, "alignment", column_info[j].alignment);
- (void)getTokenValue(line, "leftline", column_info[j].left_line);
- (void)getTokenValue(line, "rightline", column_info[j].right_line);
- (void)getTokenValue(line, "width", column_info[j].p_width);
- (void)getTokenValue(line, "special", column_info[j].align_special);
+ 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);
}
l_getline(is, line);
if (!prefixIs(line, "<Cell")) {
line << ")" << endl;
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);
+ 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(lex);
+ cell_info[i][j].inset.Read(buf, lex);
l_getline(is, line);
}
if (line != "</Cell>") {
cell_info[i][j].top_line = static_cast<char>(c);
cell_info[i][j].bottom_line = static_cast<char>(d);
cell_info[i][j].rotate = static_cast<bool>(f);
- cell_info[i][j].linebreaks = static_cast<bool>(g);
+ cell_info[i][j].usebox = static_cast<bool>(g);
cell_info[i][j].align_special = s1;
cell_info[i][j].p_width = s2;
}
LyXParagraph * par = new LyXParagraph;
LyXParagraph * return_par = 0;
+#ifndef NEW_INSETS
LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE;
LyXParagraph::footnote_kind footnotekind = LyXParagraph::FOOTNOTE;
+#endif
string token, tmptok;
int pos = 0;
char depth = 0;
if (owner_->BufferOwner()->parseSingleLyXformat2Token(lex, par,
return_par,
token, pos,
- depth, font,
+ depth, font
+#ifndef NEW_INSETS
+ ,
footnoteflag,
- footnotekind))
+ footnotekind
+#endif
+ ))
{
// the_end read
lex.pushToken(token);
}
// now we have the par we should fill the insets with this!
int cell = 0;
- InsetText *inset = GetCellInset(cell);
+ InsetText * inset = GetCellInset(cell);
int row;
- for(int i=0; i < par->Last(); ++i) {
+ for(int i = 0; i < par->Last(); ++i) {
if (par->IsNewline(i)) {
++cell;
if (cell > GetNumberOfCells()) {
}
inset = GetCellInset(cell);
row = row_of_cell(cell);
- if (!cell_info[row_of_cell(cell)][column_of_cell(cell)].linebreaks)
+ if (!cell_info[row_of_cell(cell)][column_of_cell(cell)].usebox)
{
// insert a space instead
par->Erase(i);
par->InsertChar(i, ' ');
}
}
- par->CopyIntoMinibuffer(i);
+ par->CopyIntoMinibuffer(current_view->buffer()->params, i);
inset->par->InsertFromMinibuffer(inset->par->Last());
}
Reinit();
}
-char const * LyXTabular::GetDocBookAlign(int cell, bool isColumn) const
+string const LyXTabular::GetDocBookAlign(int cell, bool isColumn) const
{
int i = isColumn ? cell : column_of_cell(cell);
//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();
+ return cellinfo_of_cell(cell)->align_special;
} else {
switch (GetAlignment(cell)) {
case LYX_ALIGN_LEFT:
}
} else {
if (!column_info[i].align_special.empty()) {
- return column_info[i].align_special.c_str();
+ return column_info[i].align_special;
}
#ifdef IGNORE_THIS_FOR_NOW
else if (!column_info[i].p_width.empty()) {
}
-bool LyXTabular::IsMultiColumn(int cell) const
+bool LyXTabular::IsMultiColumn(int cell, bool real) const
{
- return (cellinfo_of_cell(cell)->multicolumn != LyXTabular::CELL_NORMAL);
+ return ((!real || (column_of_cell(cell) != right_column_of_cell(cell))) &&
+ (cellinfo_of_cell(cell)->multicolumn !=LyXTabular::CELL_NORMAL));
}
}
-void LyXTabular::SetRotateTabular(int what)
+void LyXTabular::SetRotateTabular(bool flag)
{
- rotate = what;
+ rotate = flag;
}
}
-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;
}
}
-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
+int 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;
+ 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;
+ if (endfirsthead == val)
+ endfirsthead = 0;
else
- endfirsthead = row;
+ endfirsthead = val;
} else {
- if (row == endhead)
- endhead = -1;
+ if (endhead == val)
+ endhead = 0;
else
- endhead = row;
+ endhead = val;
}
}
-bool LyXTabular::GetRowOfLTHead(int cell) const
+bool LyXTabular::GetRowOfLTHead(int cell, int & row) const
{
- if ((endhead+1) > rows_)
+ row = endhead;
+ if (abs(endhead) > rows_)
return false;
- return (row_of_cell(cell) == endhead);
+ 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_)
+ row = endfirsthead;
+ if (abs(endfirsthead) > rows_)
return false;
- return (row_of_cell(cell) == endfirsthead);
+ 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;
+ if (endlastfoot == val)
+ endlastfoot = 0;
else
- endlastfoot = row;
+ endlastfoot = val;
} else {
- if (row == endfoot)
- endfoot = -1;
+ if (endfoot == val)
+ endfoot = 0;
else
- endfoot = row;
+ endfoot = val;
}
}
-bool LyXTabular::GetRowOfLTFoot(int cell) const
+bool LyXTabular::GetRowOfLTFoot(int cell, int & row) const
{
+ row = endfoot;
if ((endfoot+1) > rows_)
return false;
- return (row_of_cell(cell) == endfoot);
+ 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_)
+ row = endlastfoot;
+ if (abs(endlastfoot) > rows_)
return false;
- return (row_of_cell(cell) == endlastfoot);
+ return (row_of_cell(cell) == (abs(endlastfoot)-1));
}
}
-void LyXTabular::SetAscentOfRow(int row, int height)
+bool LyXTabular::SetAscentOfRow(int row, int height)
{
- if (row >= rows_)
- return;
+ 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;
+ if ((row >= rows_) || (row_info[row].descent_of_row == height))
+ return false;
row_info[row].descent_of_row = height;
+ return true;
}
int LyXTabular::TeXBottomHLine(ostream & os, int row) const
{
- int fcell = GetFirstCellInRow(row);
- int n = NumberOfCellsInRow(fcell) + fcell;
+ int const fcell = GetFirstCellInRow(row);
+ int const n = NumberOfCellsInRow(fcell) + fcell;
int tmp = 0;
- int i;
- for (i = fcell; i < n; ++i) {
+ for (int i = fcell; i < n; ++i) {
if (BottomLine(i))
++tmp;
}
if (tmp == (n-fcell)){
os << "\\hline";
} else {
- for (i = fcell; i < n; ++i) {
+ for (int i = fcell; i < n; ++i) {
if (BottomLine(i)) {
os << "\\cline{"
<< column_of_cell(i) + 1
if (LeftLine(cell))
os << '|';
if (!GetPWidth(cell).empty()) {
- os << "p{" << GetPWidth(cell) << '}';
+ 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 << "}{";
}
}
- if (GetLinebreaks(cell)) {
- os << "\\parbox[t]{" << GetPWidth(cell) << "}{\\smallskip{}";
+ 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 ret = 0;
// usual cells
- if (GetLinebreaks(cell))
- os << "\\smallskip{}}";
+ 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 << endl << "\\end{sideways}";
+ os << "%\n\\end{sideways}";
++ret;
}
return ret;
}
-int LyXTabular::Latex(ostream & os, bool fragile, bool fp) const
+int LyXTabular::Latex(Buffer const * buf,
+ ostream & os, bool fragile, bool fp) const
{
+#warning Jürgen, this func should be split into more funcs (Lgb)
int ret = 0;
int i,j;
int cell = 0;
if (!column_info[i].align_special.empty()) {
os << column_info[i].align_special;
} else if (!column_info[i].p_width.empty()) {
- os << "p{"
+ 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 {
//+ the single row and columns (cells) +
//+---------------------------------------------------------------------
+ int bret;
for(i=0; i < rows_; ++i) {
ret += TeXTopHLine(os, i);
+ 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) {
+ if (i > 0)
+ ret += TeXBottomHLine(os, i-1);
+ 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 += GetCellInset(cell)->Latex(buf, os, fragile, fp);
ret += TeXCellPostamble(os, cell);
if (!IsLastCellInRow(cell)) { // not last cell in row
os << "&" << endl;
}
os << "\\\\" << endl;
ret += TeXBottomHLine(os, i);
+ bret = ret;
if (IsLongTabular()) {
- if (i == endhead) {
+ if ((endhead > 0) && (i == (endhead-1))) {
os << "\\endhead\n";
++ret;
}
- if (i == endfirsthead) {
+ if ((endfirsthead > 0) && (i == (endfirsthead-1))) {
os << "\\endfirsthead\n";
++ret;
}
- if (i == endfoot) {
+ if ((endfoot > 0) && (i == (endfoot-1))) {
os << "\\endfoot\n";
++ret;
}
- if (i == endlastfoot) {
+ 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;
InsetText * LyXTabular::GetCellInset(int cell) const
{
- return cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
+ return & cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
}
+
void LyXTabular::Validate(LaTeXFeatures & features) const
{
if (IsLongTabular())
features.longtable = true;
if (NeedRotating())
features.rotating = true;
- for(int cell = 0; cell < numberofcells; ++cell)
+ for(int cell = 0; cell < numberofcells; ++cell) {
+ if (GetVAlignment(cell) != LYX_VALIGN_TOP)
+ features.array = true;
GetCellInset(cell)->Validate(features);
+ }
+}
+
+
+bool LyXTabular::UseParbox(int cell) const
+{
+ LyXParagraph *par = GetCellInset(cell)->par;
+
+ for(;par; par = par->next) {
+ for(int i = 0; i < par->Last(); ++i) {
+ if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
+ return true;
+ }
+ }
+ return false;
}
projects / lyx.git / blobdiff