/* This file is part of
- * ======================================================
+ * ======================================================
*
* LyX, The Document Processor
*
* Copyright (C) 1995 Matthias Ettrich
* Copyright (C) 1995-1998 The LyX Team.
*
- *======================================================
+ * ======================================================
*/
#include <config.h>
delete[] columnofcell;
delete[] column_info;
delete[] row_info;
- for (i=0; i<rows; i++) {
+ for (i = 0; i<rows; i++) {
delete[] cell_info[i]; // verify that this shoudn't be freed with delete
}
delete[] cell_info;
LyXTable *result = new LyXTable(rows, columns);
int row, column;;
- for (row=0; row<rows; row++){
- for (column=0; column<columns;column++){
+ for (row = 0; row<rows; row++){
+ for (column = 0; column<columns;column++){
result->cell_info[row][column] = cell_info[row][column];
}
}
- for (row=0; row<rows; row++){
+ for (row = 0; row<rows; row++){
result->row_info[row] = row_info[row];
}
- for (column=0; column<columns; column++){
+ for (column = 0; column<columns; column++){
result->column_info[column].left_line = column_info[column].left_line;
result->column_info[column].right_line = column_info[column].right_line;
result->column_info[column].alignment = column_info[column].alignment;
}
result->SetLongTable(is_long_table);
- result->rotate=rotate;
+ result->rotate = rotate;
result->Reinit();
return result;
}
/* activates all lines and sets all widths to 0 */
void LyXTable::Init(int rows_arg, int columns_arg)
{
- int i,j,cellno;
+ int i, j, cellno;
rows = rows_arg;
columns = columns_arg;
column_info = new columnstruct[columns];
cell_info = new cellstruct*[rows];
cellno = 0;
- for (i=0; i<rows;i++) {
+ for (i = 0; i<rows;i++) {
cell_info[i] = new cellstruct[columns];
row_info[i].top_line = true;
row_info[i].bottom_line = false;
row_info[i].is_cont_row = false;
row_info[i].newpage = false;
- for (j=0; j<columns; j++) {
+ for (j = 0; j<columns; j++) {
cell_info[i][j].cellno = cellno++;
cell_info[i][j].width_of_cell = 0;
cell_info[i][j].multicolumn = LyXTable::CELL_NORMAL;
row_info[i-1].bottom_line = true;
row_info[0].bottom_line = true;
- for (i=0; i<columns;i++) {
+ for (i = 0; i<columns;i++) {
column_info[i].left_line = true;
column_info[i].right_line = false;
column_info[i].alignment = LYX_ALIGN_CENTER;
cellstruct** cell_info2 = new cellstruct*[rows+1];
int i;
- for (i=0; i <= row; i++) {
+ for (i = 0; i <= row; i++) {
cell_info2[i] = cell_info[i];
row_info2[i] = row_info[i];
}
- for (i=rows-1; i >= row; i--) {
+ for (i = rows-1; i >= row; i--) {
cell_info2[i+1] = cell_info[i];
row_info2[i+1] = row_info[i];
}
- for (i=row;row_info[i].is_cont_row;i--);
- if (((row+1)>=rows) || !row_info[row+1].is_cont_row)
+ for (i = row;row_info[i].is_cont_row;i--);
+ if (((row+1)>= rows) || !row_info[row+1].is_cont_row)
row_info2[row+1].is_cont_row = false;
row_info2[row+1].top_line = row_info[i].top_line;
cell_info2[row+1] = new cellstruct[columns];
- for (i=0; i<columns; i++) {
+ for (i = 0; i<columns; i++) {
cell_info2[row+1][i].width_of_cell = 0;
cell_info2[row+1][i] = cell_info2[row][i];
}
int i;
delete[] cell_info[row];
- for (i=0; i < row; i++) {
+ for (i = 0; i < row; i++) {
cell_info2[i] = cell_info[i];
row_info2[i] = row_info[i];
}
if (row_info[i].is_cont_row)
row_info2[i-1].bottom_line = row_info[i].bottom_line;
- for (i=row; i < rows - 1; i++) {
+ for (i = row; i < rows - 1; i++) {
cell_info2[i] = cell_info[i+1];
row_info2[i] = row_info[i+1];
}
void LyXTable::AppendColumn(int cell)
{
- int i,j;
+ int i, j;
columnstruct *column_info2 = new columnstruct[columns+1];
int column = right_column_of_cell(cell);
- for (i=0; i<=column; i++){
+ for (i = 0; i<= column; i++){
column_info2[i] = column_info[i];
}
- for (i=columns-1; i>=column; i--){
+ for (i = columns-1; i>= column; i--){
column_info2[i+1] = column_info[i];
}
delete[] column_info;
column_info = column_info2;
- for (i=0; i<rows;i++){
+ for (i = 0; i<rows;i++){
cellstruct* tmp = cell_info[i];
cell_info[i] = new cellstruct[columns+1];
- for (j=0; j<=column; j++){
- cell_info[i][j]=tmp[j];
+ for (j = 0; j<= column; j++){
+ cell_info[i][j] = tmp[j];
}
- for (j=column; j<columns; j++){
- cell_info[i][j+1]=tmp[j];
+ for (j = column; j<columns; j++){
+ cell_info[i][j+1] = tmp[j];
}
// care about multicolumns
if (cell_info[i][column+1].multicolumn
- ==LyXTable::CELL_BEGIN_OF_MULTICOLUMN){
- cell_info[i][column+1].multicolumn =
+ == LyXTable::CELL_BEGIN_OF_MULTICOLUMN){
+ cell_info[i][column+1].multicolumn =
LyXTable::CELL_PART_OF_MULTICOLUMN;
}
if (column + 1 == columns
|| cell_info[i][column+2].multicolumn
- !=LyXTable::CELL_PART_OF_MULTICOLUMN){
- cell_info[i][column+1].multicolumn =
+ != LyXTable::CELL_PART_OF_MULTICOLUMN){
+ cell_info[i][column+1].multicolumn =
LyXTable::CELL_NORMAL;
}
void LyXTable::Reinit()
{
- int i,j;
+ int i, j;
- for (i=0; i<rows;i++) {
- for (j=0; j<columns; j++) {
+ for (i = 0; i<rows;i++) {
+ for (j = 0; j<columns; j++) {
cell_info[i][j].width_of_cell = 0;
if ((i+1 < rows) && !row_info[i+1].is_cont_row)
cell_info[i][j].has_cont_row = false;
}
}
- for (i=0; i<columns;i++) {
+ for (i = 0; i<columns;i++) {
calculate_width_of_column(i);
}
calculate_width_of_table();
void LyXTable::set_row_column_number_info()
{
int row = 0;
- int c= 0;
+ int c = 0;
int column = 0;
numberofcells = -1;
- for (row=0; row<rows; ++row) {
- for (column=0; column<columns; ++column) {
+ for (row = 0; row<rows; ++row) {
+ for (column = 0; column<columns; ++column) {
if (cell_info[row][column].multicolumn
!= LyXTable::CELL_PART_OF_MULTICOLUMN)
++numberofcells;
columnofcell = new int[numberofcells];
while (c < numberofcells && row < rows && column < columns) {
- rowofcell[c]=row;
- columnofcell[c]=column;
+ rowofcell[c] = row;
+ columnofcell[c] = column;
c++;
do{
column++;
int LyXTable::NumberOfCellsInRow(int cell)
{
int row = row_of_cell(cell);
- int i=0;
+ int i = 0;
int result = 0;
- for (i=0; i<columns; i++){
+ for (i = 0; i<columns; i++){
if (cell_info[row][i].multicolumn != LyXTable::CELL_PART_OF_MULTICOLUMN)
result++;
}
/* returns 1 if there is a topline, returns 0 if not */
bool LyXTable::TopLine(int cell)
{
- int row=row_of_cell(cell);
+ int row = row_of_cell(cell);
if (IsContRow(cell))
return TopLine(cell_info[row-1][column_of_cell(cell)].cellno);
if(cell >= numberofcells)
return false;
- int row=row_of_cell(cell);
+ int row = row_of_cell(cell);
if (RowHasContRow(cell))
return BottomLine(cell_info[row+1][column_of_cell(cell)].cellno);
int bottom = 1;
int column;
if (row){
- for (column=0;column < columns-1 && bottom;column++){
+ for (column = 0;column < columns-1 && bottom;column++){
switch (cell_info[row-1][column].multicolumn){
case LyXTable::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 (column = 0;column < columns-1 && top;column++){
switch (cell_info[row][column].multicolumn){
case LyXTable::CELL_BEGIN_OF_MULTICOLUMN:
top = cell_info[row][column].top_line;
int column1 = column_of_cell(cell);
int column2 = right_column_of_cell(cell);
int i;
- int result=0;
- for (i=column1; i<=column2;i++){
+ int result = 0;
+ for (i = column1; i<= column2;i++){
result += column_info[i].width_of_column;
}
return result;
int column1 = column_of_cell(cell);
int column2 = right_column_of_cell(cell);
int i;
- int width=0;
+ int width = 0;
// first set columns to 0 so we can calculate the right width
- for (i=column1; i<=column2;i++) {
+ for (i = column1; i<= column2;i++) {
cell_info[row][i].width_of_cell = 0;
}
// set the width to MAX_WIDTH until width > 0
width = (new_width + 2*WIDTH_OF_LINE);
- for (i=column1; (i<column2) && (width > 0);i++){
+ for (i = column1; (i<column2) && (width > 0);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 (i == column2) {
cell_info[row][i].width_of_cell = width;
}
return true;
i;
// first set columns to 0 so we can calculate the right width
- for (i=column1; i<=column2;++i)
+ for (i = column1; i<= column2;++i)
cell_info[row][i].width_of_cell = 0;
- for(i=cell+1;(i<numberofcells) && (!IsMultiColumn(i));++i)
+ for(i = cell+1;(i<numberofcells) && (!IsMultiColumn(i));++i)
;
if (i < numberofcells)
- recalculateMulticolCells(i,GetWidthOfCell(i)-(2*WIDTH_OF_LINE));
- SetWidthOfMulticolCell(cell,new_width);
+ recalculateMulticolCells(i, GetWidthOfCell(i)-(2*WIDTH_OF_LINE));
+ SetWidthOfMulticolCell(cell, new_width);
}
/* returns 1 if a complete update is necessary, otherwise 0 */
{
int row = row_of_cell(cell);
int column1 = column_of_cell(cell);
- int tmp=0;
- int width=0;
+ int tmp = 0;
+ int width = 0;
if (IsMultiColumn(cell)) {
tmp = SetWidthOfMulticolCell(cell, new_width);
}
if (tmp) {
int i;
- for(i=0; i<columns;++i)
+ for(i = 0; 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)
- recalculateMulticolCells(i,GetWidthOfCell(i)-(2*WIDTH_OF_LINE));
- for(i=0; i<columns;++i)
+ recalculateMulticolCells(i, GetWidthOfCell(i)-(2*WIDTH_OF_LINE));
+ for(i = 0; i<columns;++i)
calculate_width_of_column(i);
calculate_width_of_table();
return true;
cellinfo_of_cell(fvcell)->p_width = width;
} else {
column_info[column_of_cell(fvcell)].p_width = width;
- SetAlignment(cell,LYX_ALIGN_LEFT);
+ if (!width.empty()) // do this only if there is a width
+ SetAlignment(cell, LYX_ALIGN_LEFT);
}
return true;
}
bool LyXTable::SetAllLines(int cell, bool line)
{
- SetTopLine(cell,line);
- SetBottomLine(cell,line);
- SetRightLine(cell,line);
- SetLeftLine(cell,line);
+ SetTopLine(cell, line);
+ SetBottomLine(cell, line);
+ SetRightLine(cell, line);
+ SetLeftLine(cell, line);
return true;
}
int row = row_of_cell(cell);
if (IsContRow(cell))
- SetTopLine(cell_info[row-1][column_of_cell(cell)].cellno,line);
+ SetTopLine(cell_info[row-1][column_of_cell(cell)].cellno, line);
else if (!IsMultiColumn(cell))
row_info[row].top_line = line;
else
int row = row_of_cell(cell);
if (RowHasContRow(cell))
- SetBottomLine(cell_info[row+1][column_of_cell(cell)].cellno,line);
+ SetBottomLine(cell_info[row+1][column_of_cell(cell)].cellno, line);
else if (!IsMultiColumn(cell))
row_info[row_of_cell(cell)].bottom_line = line;
else
int column1 = column_of_cell(cell);
int column2 = right_column_of_cell(cell);
int i;
- int result=0;
- for (i=column1; i<=column2;i++){
+ int result = 0;
+ for (i = column1; i<= column2;i++){
result += cell_info[row][i].width_of_cell;
}
int i, max;
int old_column_width = column_info[column].width_of_column;
max = 0;
- for (i=0; i<rows; i++) {
+ for (i = 0; i<rows; i++) {
if (cell_info[i][column].width_of_cell > max) {
max = cell_info[i][column].width_of_cell;
}
int i, max;
int old_column_width = column_info[column].width_of_column;
max = 0;
- for (i=0; i<rows; ++i) {
- if (!IsMultiColumn(GetCellNumber(column,i)) &&
+ for (i = 0; i<rows; ++i) {
+ if (!IsMultiColumn(GetCellNumber(column, i)) &&
(cell_info[i][column].width_of_cell > max)) {
max = cell_info[i][column].width_of_cell;
}
void LyXTable::calculate_width_of_table()
{
- int i;
width_of_table = 0;
- for (i=0; i<columns;i++) {
+ for (int i = 0; i < columns; ++i) {
width_of_table += column_info[i].width_of_column;
}
}
void LyXTable::Write(FILE* file)
{
- int i,j;
+ int i, j;
fprintf(file, "multicol5\n");
fprintf(file, "%d %d %d %d %d %d %d %d\n", rows, columns, is_long_table,
rotate, endhead, endfirsthead, endfoot, endlastfoot);
- for (i=0; i<rows; i++){
+ for (i = 0; i<rows; i++){
fprintf(file, "%d %d %d %d\n", row_info[i].top_line,
row_info[i].bottom_line, row_info[i].is_cont_row,
row_info[i].newpage);
}
- for (i=0; i<columns; i++){
+ for (i = 0; i<columns; i++){
fprintf(file, "%d %d %d \"%s\" \"%s\"\n",
column_info[i].alignment, column_info[i].left_line,
column_info[i].right_line,
column_info[i].align_special.c_str());
}
- for (i=0; i<rows;i++){
- for (j=0;j<columns;j++){
+ for (i = 0; i<rows;i++){
+ for (j = 0;j<columns;j++){
fprintf(file, "%d %d %d %d %d %d %d \"%s\" \"%s\"\n",
cell_info[i][j].multicolumn,
cell_info[i][j].alignment,
}
}
-#ifdef WITH_WARNINGS
-#warning Clean up this code in 0.13 (Jug)
-#endif
void LyXTable::Read(FILE* file)
{
int version;
- int i,j;
+ int i, j;
int rows_arg = 0;
int columns_arg = 0;
int is_long_table_arg = false;
version = atoi(s.c_str()+8);
else
version = 1;
- a=b=c=d=-1;
- if (version > 2) {
- fgets(vtmp,sizeof(vtmp),file);
- sscanf(vtmp, "%d %d %d %d %d %d %d %d\n", &rows_arg, &columns_arg,
- &is_long_table_arg, &rotate_arg, &a, &b, &c, &d);
- } else
- fscanf(file, "%d %d\n",
- &rows_arg, &columns_arg);
+#ifdef WITH_WARNINGS
+#warning Insert a error message window here that this format is not supported anymore
+#endif
+ if (version < 5) {
+ fprintf(stderr, "Tabular format < 5 is not supported anymore\n"
+ "Get an older version of LyX (< 1.1.x) for conversion!\n");
+ return;
+ }
+ a = b = c = d = -1;
+ fgets(vtmp, sizeof(vtmp), file);
+ sscanf(vtmp, "%d %d %d %d %d %d %d %d\n", &rows_arg, &columns_arg,
+ &is_long_table_arg, &rotate_arg, &a, &b, &c, &d);
Init(rows_arg, columns_arg);
SetLongTable(is_long_table_arg);
SetRotateTable(rotate_arg);
endfirsthead = b;
endfoot = c;
endlastfoot = d;
- for (i=0; i<rows; i++){
- a=b=c=d=e=f=g=h=0;
- fgets(vtmp,sizeof(vtmp),file);
+ for (i = 0; i<rows; i++){
+ a = b = c = d = e = f = g = h = 0;
+ fgets(vtmp, sizeof(vtmp), file);
sscanf(vtmp, "%d %d %d %d\n",
&a, &b, &c, &d);
row_info[i].top_line = a;
row_info[i].is_cont_row = c;
row_info[i].newpage = d;
}
- for (i=0; i<columns; i++){
+ for (i = 0; i<columns; i++){
*stmp = 0;
*atmp = 0;
- fgets(vtmp,sizeof(vtmp),file);
+ fgets(vtmp, sizeof(vtmp), file);
sscanf(vtmp, "%d %d %d %s %s", &a, &b, &c, stmp, atmp);
column_info[i].alignment = (char) a;
column_info[i].left_line = b;
} else if (*stmp)
column_info[i].p_width = stmp;
}
- if (version == 1){
- for (i=0; i<rows;i++){
- for (j=0;j<columns;j++){
- fscanf(file, "%d %d\n", &a, &b);
- cell_info[i][j].multicolumn = (char) a;
- cell_info[i][j].alignment = (char) b;
- }
- }
- } else if (version < 4) {
- for (i=0; i<rows;i++){
- for (j=0;j<columns;j++){
- fscanf(file, "%d %d %d %d\n", &a, &b, &c, &d);
- cell_info[i][j].multicolumn = (char) a;
- cell_info[i][j].alignment = (char) b;
- cell_info[i][j].top_line = (char) c;
- cell_info[i][j].bottom_line = (char) d;
- }
- }
- } else {
- for (i=0; i<rows;i++){
- for (j=0;j<columns;j++){
- *stmp = 0;
- *atmp = 0;
- a=b=c=d=e=f=g=0;
- fgets(vtmp,sizeof(vtmp),file);
- sscanf(vtmp, "%d %d %d %d %d %d %d %s %s\n",
- &a, &b, &c, &d, &e, &f, &g, stmp, atmp);
- cell_info[i][j].multicolumn = (char) a;
- cell_info[i][j].alignment = (char) b;
- cell_info[i][j].top_line = (char) c;
- cell_info[i][j].bottom_line = (char) d;
- cell_info[i][j].has_cont_row = (bool) e;
- cell_info[i][j].rotate = (bool) f;
- cell_info[i][j].linebreaks = (bool) g;
- // this is only to see if I have an empty string first
- // this clause should be always TRUE!!!
- if (*stmp == '"') {
- *stmp = 0;
- *atmp = 0;
- if (stmp[1] == '"')
- sscanf(vtmp,"%*d %*d %*d %*d %*d %*d %*d %*s \"%[^\"]\"",
- atmp);
- else // otherwise after the first empty "" read is aborded
- sscanf(vtmp,"%*d %*d %*d %*d %*d %*d %*d \"%[^\"]\" \"%[^\"]\"",
- stmp, atmp);
- cell_info[i][j].align_special = stmp;
- cell_info[i][j].p_width = atmp;
- } else if (*stmp)
- cell_info[i][j].align_special = stmp;
- }
- }
+ for (i = 0; i<rows;i++){
+ for (j = 0;j<columns;j++){
+ *stmp = 0;
+ *atmp = 0;
+ a = b = c = d = e = f = g = 0;
+ fgets(vtmp, sizeof(vtmp), file);
+ sscanf(vtmp, "%d %d %d %d %d %d %d %s %s\n",
+ &a, &b, &c, &d, &e, &f, &g, stmp, atmp);
+ cell_info[i][j].multicolumn = (char) a;
+ cell_info[i][j].alignment = (char) b;
+ cell_info[i][j].top_line = (char) c;
+ cell_info[i][j].bottom_line = (char) d;
+ cell_info[i][j].has_cont_row = (bool) e;
+ cell_info[i][j].rotate = (bool) f;
+ cell_info[i][j].linebreaks = (bool) g;
+ // this is only to see if I have an empty string first
+ // this clause should be always TRUE!!!
+ if (*stmp == '"') {
+ *stmp = 0;
+ *atmp = 0;
+ if (stmp[1] == '"')
+ sscanf(vtmp, "%*d %*d %*d %*d %*d %*d %*d %*s \"%[^\"]\"",
+ atmp);
+ else // otherwise after the first empty "" read is aborded
+ sscanf(vtmp, "%*d %*d %*d %*d %*d %*d %*d \"%[^\"]\" \"%[^\"]\"",
+ stmp, atmp);
+ cell_info[i][j].align_special = stmp;
+ cell_info[i][j].p_width = atmp;
+ } else if (*stmp)
+ cell_info[i][j].align_special = stmp;
+ }
}
set_row_column_number_info();
}
// cell <0 will tex the preamble
// returns the number of printed newlines
-int LyXTable::TexEndOfCell(string& file, int cell)
+int LyXTable::TexEndOfCell(string & file, int cell)
{
int i;
int ret = 0;
int tmp; // tmp2;
- int fcell,nvcell;
+ int fcell, nvcell;
if (ShouldBeVeryLastCell(cell)) {
// the very end at the very beginning
if (Linebreaks(cell))
tmp = 0;
fcell = cell;
while (!IsFirstCell(fcell))fcell--;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
+ for (i = 0; i < NumberOfCellsInRow(fcell); i++){
if (BottomLine(fcell+i))
tmp++;
}
file += "\\hline ";
} else {
tmp = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
+ for (i = 0; i < NumberOfCellsInRow(fcell); i++){
if (BottomLine(fcell+i)){
file += "\\cline{";
file += tostr(column_of_cell(fcell+i)+1);
file += "\\begin{longtable}{";
else
file += "\\begin{tabular}{";
- for (i=0; i<columns;i++){
+ for (i = 0; i<columns;i++){
if (column_info[i].left_line)
file += '|';
if (!column_info[i].align_special.empty()) {
tmp = 0;
if (GetNumberOfCells()){
fcell = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
+ for (i = 0; i < NumberOfCellsInRow(fcell); i++){
if (TopLine(fcell+i))
tmp++;
}
file += "\\hline ";
} else {
tmp = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
+ for (i = 0; i < NumberOfCellsInRow(fcell); i++){
if (TopLine(fcell+i)){
file += "\\cline{";
file += tostr(column_of_cell(fcell+i)+1);
}
if (IsLastCell(cell)) {
int row = row_of_cell(cell);
- string hline1,hline2;
+ string hline1, hline2;
bool print_hline = true;
- bool pr_top_hline,flag1,flag2;
+ bool pr_top_hline, flag1, flag2;
flag1 = IsLongTable() &&
((row == endhead) || (row == endfirsthead) ||
(row == endfoot) || (row == endlastfoot));
fcell = cell;
while (!IsFirstCell(fcell))
fcell--;
- for (i=0; i < NumberOfCellsInRow(cell); i++){
+ for (i = 0; i < NumberOfCellsInRow(cell); i++){
if (BottomLine(fcell+i))
tmp++;
}
hline1 = "\\hline ";
} else {
tmp = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
+ for (i = 0; i < NumberOfCellsInRow(fcell); i++){
if (BottomLine(fcell+i)){
file += "\\cline{";
file += tostr(column_of_cell(fcell+i)+1);
if (nvcell < numberofcells && (cell < GetNumberOfCells()-1) &&
!ShouldBeVeryLastCell(cell)) {
fcell = nvcell;
-#if 0
- // Now jump all ContRows
- while (IsContRow(fcell))
- fcell++;
- while (!IsFirstCell(fcell))
- fcell--;
-#endif
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
+ for (i = 0; i < NumberOfCellsInRow(fcell); i++){
if (TopLine(fcell+i))
tmp++;
}
}
else {
tmp = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
+ for (i = 0; i < NumberOfCellsInRow(fcell); i++){
if (TopLine(fcell+i)){
if (print_hline) {
file += "\\cline{";
}
if (RightLine(nvcell))
file += '|';
- //if (column_of_cell(cell+2)!=0 && LeftLine(cell+2))
+ //if (column_of_cell(cell+2)!= 0 && LeftLine(cell+2))
if (((nvcell+1) < numberofcells) &&
(NextVirtualCell(nvcell+1) < numberofcells) &&
- (column_of_cell(NextVirtualCell(nvcell+1))!=0) &&
+ (column_of_cell(NextVirtualCell(nvcell+1))!= 0) &&
LeftLine(NextVirtualCell(nvcell+1)))
file += '|';
file += "}{";
// returns the number of printed newlines
int LyXTable::RoffEndOfCell(FILE* file, int cell)
{
- int i,j;
+ int i, j;
int ret = 0;
if (cell == GetNumberOfCells() - 1){
// the very end at the very beginning
if (CellHasContRow(cell) >= 0) {
- fprintf(file,"\nT}");
+ fprintf(file, "\nT}");
ret++;
}
fprintf(file, "\n");
fprintf(file, ".TE\n.pl 1c");
} else {
if (cell < 0){
- int fcell=0;
+ int fcell = 0;
// preamble
fprintf(file, "\n.pl 500c\n.TS\n");
- for (j=0; j<rows; j++) {
- for (i=0; i<columns;i++,fcell++) {
+ for (j = 0; j<rows; j++) {
+ for (i = 0; i<columns;i++, fcell++) {
if (column_info[i].left_line)
fprintf(file, " | ");
- if (cell_info[j][i].multicolumn==CELL_PART_OF_MULTICOLUMN)
+ if (cell_info[j][i].multicolumn == CELL_PART_OF_MULTICOLUMN)
fprintf(file, "s");
else {
switch (column_info[i].alignment) {
fprintf(file, ".\n");
ret++;
if (row_info[0].top_line) {
- fprintf(file,"_\n");
+ fprintf(file, "_\n");
ret++;
}
if (CellHasContRow(0) >= 0) {
- fprintf(file,"T{\n");
+ fprintf(file, "T{\n");
ret++;
}
} else {
// usual cells
if (CellHasContRow(cell) >= 0) {
- fprintf(file,"\nT}");
+ fprintf(file, "\nT}");
ret++;
}
if (right_column_of_cell(cell) == columns -1){
fprintf(file, "\t");
if ((cell < GetNumberOfCells() - 1) &&
(CellHasContRow(cell+1) >= 0)) {
- fprintf(file,"T{\n");
+ fprintf(file, "T{\n");
ret++;
}
}
return ret;
}
-const char *LyXTable::getDocBookAlign(int cell, bool isColumn)
+char const *LyXTable::getDocBookAlign(int cell, bool isColumn)
{
int i;
if (isColumn)
// cell <0 will tex the preamble
// returns the number of printed newlines
-int LyXTable::DocBookEndOfCell(string& file, int cell, int &depth)
+int LyXTable::DocBookEndOfCell(string & file, int cell, int &depth)
{
int i;
int ret = 0;
//int tmp; // tmp2; //Â unused
int nvcell; // fcell; //Â unused
if (ShouldBeVeryLastCell(cell)) {
-#if 0
- // the very end at the very beginning
- if (Linebreaks(cell))
- file += "\\smallskip{}}";
- if (IsMultiColumn(cell))
- file += '}';
- if (RotateCell(cell)) {
- file += "\n\\end{sideways}";
- ret++;
- }
- file += "\\\\\n";
- ret++;
-
- tmp = 0;
- fcell = cell;
- while (!IsFirstCell(fcell))fcell--;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
- if (BottomLine(fcell+i))
- tmp++;
- }
- if (tmp == NumberOfCellsInRow(fcell)){
- file += "\\hline ";
- } else {
- tmp = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
- if (BottomLine(fcell+i)){
- file += "\\cline{";
- file += column_of_cell(fcell+i)+1;
- file += '-';
- file += right_column_of_cell(fcell+i)+1;
- file += "} ";
- tmp = 1;
- }
- }
- }
- if (tmp){
- file += '\n';
- ret++;
- }
-#endif
addNewlineAndDepth(file,--depth);
file += "</ENTRY>";
addNewlineAndDepth(file,--depth);
else
file += "</TGROUP>";
addNewlineAndDepth(file,--depth);
-#if 0
- if (rotate) {
- file += "\n\\end{sideways}";
- ret++;
- }
-#endif
ret += 4;
} else {
nvcell = NextVirtualCell(cell+1);
file += "' COLSEP='1' ROWSEP='1'>";
addNewlineAndDepth(file,++depth);
ret++;
- for (i=0; i<columns;i++) {
+ for (i = 0; i < columns; ++i) {
file += "<COLSPEC ALIGN='";
file += getDocBookAlign(i, true);
file += "' COLNAME='col";
file += tostr(i+1);
file += "' COLNUM='";
file += tostr(i+1);
- file += "' COLSEP='";
+ file += "' COLSEP= '";
if (i == (columns-1)) {
file += '1';
} else {
file += '0';
}
file += "'>";
- addNewlineAndDepth(file,depth);
+ addNewlineAndDepth(file, depth);
ret++;
#ifdef NOT_HANDLED_YET_AS_I_DONT_KNOW_HOW
if (column_info[i].left_line)
file += '|';
#endif
}
-#if 0
- tmp = 0;
- if (GetNumberOfCells()) {
- fcell = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
- if (TopLine(fcell+i))
- tmp++;
- }
- if (tmp == NumberOfCellsInRow(fcell)){
- file += "\\hline ";
- } else {
- tmp = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
- if (TopLine(fcell+i)){
- file += "\\cline{";
- file += column_of_cell(fcell+i)+1;
- file += '-';
- file += right_column_of_cell(fcell+i)+1;
- file += "} ";
- tmp = 1;
- }
- }
- }
- if (tmp){
- file += '\n';
- ret++;
- }
- }
- if (RotateCell(0)) {
- file += "\\begin{sideways}\n";
- ret++;
- }
-#endif
file += "<TBODY>";
addNewlineAndDepth(file,++depth);
file += "<ROW>";
addNewlineAndDepth(file,++depth);
- file += "<ENTRY ALIGN='";
+ file += "<ENTRY ALIGN= '";
file += getDocBookAlign(0);
file += "'";
if (IsMultiColumn(0)) {
- file += " NAMEST='col1' NAMEEND='col";
+ file += " NAMEST= 'col1' NAMEEND= 'col";
file += tostr(cells_in_multicolumn(0));
file += "'";
}
addNewlineAndDepth(file,++depth);
ret += 3;
} else {
-#if 0
- // usual cells
- if (Linebreaks(cell))
- file += "\\smallskip{}}";
- if (IsMultiColumn(cell)){
- file += '}';
- }
- if (RotateCell(cell)) {
- file += "\n\\end{sideways}";
- ret++;
- }
-#endif
if (IsLastCell(cell)) {
addNewlineAndDepth(file,--depth);
file += "</ENTRY>";
addNewlineAndDepth(file,--depth);
file += "</ROW>";
- addNewlineAndDepth(file,depth);
+ addNewlineAndDepth(file, depth);
file += "<ROW>";
addNewlineAndDepth(file,++depth);
- file += "<ENTRY ALIGN='";
+ file += "<ENTRY ALIGN= '";
file += getDocBookAlign(cell+1);
- file += "' VALIGN='middle'";
+ file += "' VALIGN= 'middle'";
if (IsMultiColumn(cell+1)) {
- file += " NAMEST='col";
+ file += " NAMEST= 'col";
file += tostr(column_of_cell(cell+1) + 1);
- file += "' NAMEEND='col";
+ file += "' NAMEEND= 'col";
file += tostr(column_of_cell(cell+1) +
cells_in_multicolumn(cell+1));
file += "'";
file += ">";
addNewlineAndDepth(file,++depth);
ret += 4;
-#if 0
- int row = row_of_cell(cell);
- string hline1,hline2;
- bool print_hline = true;
- bool pr_top_hline,flag1,flag2;
- flag1 = IsLongTable() &&
- ((row == endhead) || (row == endfirsthead) ||
- (row == endfoot) || (row == endlastfoot));
- row++;
- flag2 = IsLongTable() &&
- ((row <= endhead) || (row <= endfirsthead) ||
- (row <= endfoot) || (row <= endlastfoot));
- row--;
- // print the bottom hline only if (otherwise it is doubled):
- // - is no LongTable
- // - there IS a first-header
- // - the next row is no special header/footer
- // & this row is no special header/footer
- // - the next row is a special header/footer
- // & this row is a special header/footer
- pr_top_hline = (flag1 && flag2) || (!flag1 && !flag2) ||
- (endfirsthead == endhead);
- file += "\\\\\n";
- ret++;
- tmp = 0;
- fcell = cell;
- while (!IsFirstCell(fcell))
- fcell--;
- for (i=0; i < NumberOfCellsInRow(cell); i++){
- if (BottomLine(fcell+i))
- tmp++;
- }
- if (tmp == NumberOfCellsInRow(cell)){
- file += "\\hline ";
- hline1 = "\\hline ";
- } else {
- tmp = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
- if (BottomLine(fcell+i)){
- file += "\\cline{";
- file += column_of_cell(fcell+i)+1;
- file += '-';
- file += right_column_of_cell(fcell+i)+1;
- file += "} ";
- hline1 += "\\cline{";
- hline1 += column_of_cell(fcell+i)+1;
- hline1 += '-';
- hline1 += right_column_of_cell(fcell+i)+1;
- hline1 += "} ";
- tmp = 1;
- }
- }
- }
- if (tmp){
- file += '\n';
- ret++;
- }
- if (IsLongTable() && (row == endfoot)) {
- file += "\\endfoot\n";
- ret++;
- print_hline = false; // no double line below footer
- }
- if (IsLongTable() && (row == endlastfoot)) {
- file += "\\endlastfoot\n";
- ret++;
- print_hline = false; // no double line below footer
- }
- if (IsLongTable() && row_info[row].newpage) {
- file += "\\newpage\n";
- ret++;
- print_hline = false; // no line below a \\newpage-command
- }
- tmp = 0;
- if (nvcell < numberofcells && (cell < GetNumberOfCells()-1) &&
- !ShouldBeVeryLastCell(cell)) {
- fcell = nvcell;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
- if (TopLine(fcell+i))
- tmp++;
- }
- if (tmp == NumberOfCellsInRow(fcell)){
- if (print_hline)
- file += "\\hline ";
- hline2 = "\\hline ";
- }
- else {
- tmp = 0;
- for (i=0; i < NumberOfCellsInRow(fcell); i++){
- if (TopLine(fcell+i)){
- if (print_hline) {
- file += "\\cline{";
- file += column_of_cell(fcell+i)+1;
- file += '-';
- file += right_column_of_cell(fcell+i)+1;
- file += "} ";
- }
- hline2 += "\\cline{";
- hline2 += column_of_cell(fcell+i)+1;
- hline2 += '-';
- hline2 += right_column_of_cell(fcell+i)+1;
- hline2 += "} ";
- tmp = 1;
- }
- }
- }
- if (tmp && print_hline){
- file += '\n';
- ret++;
- }
- }
- // the order here is important as if one defines two
- // or more things in one line only the first entry is
- // displayed the other are set to an empty-row. This
- // is important if I have a footer and want that the
- // lastfooter is NOT displayed!!!
- bool sflag2 = (row == endhead) || (row == endfirsthead) ||
- (row == endfoot) || (row == endlastfoot);
- row--;
-// sflag2 = IsLongTable() && (row >= 0) &&
-// (sflag2 || (row == endhead) || (row == endfirsthead));
- row += 2;
- bool sflag1 = IsLongTable() && (row != endhead) &&
- (row != endfirsthead) &&
- ((row == endfoot) || (row == endlastfoot));
- row--;
- if (IsLongTable() && (row == endhead)) {
- file += "\\endhead\n";
- ret++;
- }
- if (IsLongTable() && (row == endfirsthead)) {
- file += "\\endfirsthead\n";
- ret++;
- }
- if (sflag1) { // add the \hline for next foot row
- if (!hline1.empty()) {
- file += hline1 + '\n';
- ret++;
- }
- }
- // add the \hline for the first row
- if (pr_top_hline && sflag2) {
- if (!hline2.empty()) {
- file += hline2 + '\n';
- ret++;
- }
- }
- if (nvcell < numberofcells && RotateCell(nvcell)) {
- file += "\\begin{sideways}\n";
- ret++;
- }
-#endif
} else {
addNewlineAndDepth(file,--depth);
file += "</ENTRY>";
- addNewlineAndDepth(file,depth);
- file += "<ENTRY ALIGN='";
+ addNewlineAndDepth(file, depth);
+ file += "<ENTRY ALIGN= '";
file += getDocBookAlign(cell+1);
- file += "' VALIGN='middle'";
+ file += "' VALIGN= 'middle'";
if (IsMultiColumn(cell+1)) {
- file += " NAMEST='col";
+ file += " NAMEST= 'col";
file += tostr(column_of_cell(cell+1) + 1);
- file += "' NAMEEND='col";
+ file += "' NAMEEND= 'col";
file += tostr(column_of_cell(cell+1) +
cells_in_multicolumn(cell+1));
file += "'";
file += ">";
addNewlineAndDepth(file,++depth);
ret += 3;
-#if 0
- if (nvcell < numberofcells && RotateCell(nvcell)) {
- file += "\\begin{sideways}\n";
- ret++;
- }
-#endif
}
}
-#if 0
- if (nvcell < numberofcells && IsMultiColumn(nvcell)) {
- file += "\\multicolumn{";
- file += cells_in_multicolumn(nvcell);
- file += "}{";
- if (!cellinfo_of_cell(cell+1)->align_special.empty()) {
- file += cellinfo_of_cell(cell+1)->align_special;
- file += "}{";
- } else {
- if (LeftLine(nvcell))
- file += '|';
- if (!GetPWidth(nvcell).empty()) {
- file += "p{";
- file += GetPWidth(nvcell);
- file += '}';
- } else {
- switch (GetAlignment(nvcell)) {
- case LYX_ALIGN_LEFT: file += 'l'; break;
- case LYX_ALIGN_RIGHT: file += 'r'; break;
- default: file += 'c'; break;
- }
- }
- if (RightLine(nvcell))
- file += '|';
- //if (column_of_cell(cell+2)!=0 && LeftLine(cell+2))
- if (((nvcell+1) < numberofcells) &&
- (NextVirtualCell(nvcell+1) < numberofcells) &&
- (column_of_cell(NextVirtualCell(nvcell+1))!=0) &&
- LeftLine(NextVirtualCell(nvcell+1)))
- file += '|';
- file += "}{";
- }
- }
- if (nvcell < numberofcells && Linebreaks(nvcell)) {
-// !column_info[column_of_cell(nvcell)].p_width.empty()) {
- file += "\\parbox{";
- file += GetPWidth(nvcell);
- file += "}{\\smallskip{}";
- }
-#endif
}
return ret;
}
cellinfo_of_cell(fvcell)->top_line = row_info[row_of_cell(fvcell)].top_line;
cellinfo_of_cell(fvcell)->bottom_line = row_info[row_of_cell(fvcell)].bottom_line;
for (number--;number>0;number--){
- cellinfo_of_cell(fvcell+number)->multicolumn =
+ cellinfo_of_cell(fvcell+number)->multicolumn =
LyXTable::CELL_PART_OF_MULTICOLUMN;
new_width += cellinfo_of_cell(fvcell+number)->width_of_cell;
}
set_row_column_number_info();
- SetWidthOfCell(fvcell,new_width);
+ SetWidthOfCell(fvcell, new_width);
}
while (column < columns &&
cell_info[row][column].multicolumn
== LyXTable::CELL_PART_OF_MULTICOLUMN){
- cell_info[row][column].multicolumn =
+ cell_info[row][column].multicolumn =
LyXTable::CELL_NORMAL;
column++;
result++;
void LyXTable::delete_column(int column)
{
- int i,j;
+ int i, j;
columnstruct *column_info2 = new columnstruct[columns-1];
- for (i=0; i<column; i++){
+ for (i = 0; i<column; i++){
column_info2[i] = column_info[i];
}
- for (i=column; i<columns-1; i++){
+ for (i = column; i<columns-1; i++){
column_info2[i] = column_info[i+1];
}
delete[] column_info;
column_info = column_info2;
- for (i=0; i<rows;i++){
+ for (i = 0; i<rows;i++){
cellstruct* tmp = cell_info[i];
cell_info[i] = new cellstruct[columns-1];
- for (j=0; j<column; j++){
- cell_info[i][j]=tmp[j];
+ for (j = 0; j<column; j++){
+ cell_info[i][j] = tmp[j];
}
- for (j=column; j<columns-1; j++){
- cell_info[i][j]=tmp[j+1];
+ for (j = column; j<columns-1; j++){
+ cell_info[i][j] = tmp[j+1];
}
delete[] tmp;
}
{
if (rotate)
return true;
- for (int i=0; i<rows;i++){
- for (int j=0;j<columns;j++){
+ for (int i = 0; i<rows;i++){
+ for (int j = 0;j<columns;j++){
if (cell_info[i][j].rotate)
return true;
}
{
int row = row_of_cell(cell)+1;
- if (!RowHasContRow(cell) || (CellHasContRow(cell)>=0))
+ if (!RowHasContRow(cell) || (CellHasContRow(cell)>= 0))
AppendRow(cell);
row_info[row].is_cont_row = true;
row_info[row].top_line = false;
bool LyXTable::ShouldBeVeryLastRow(int cell)
{
- if (CellHasContRow(cell)>=0)
+ if (CellHasContRow(cell)>= 0)
return false;
int row = row_of_cell(cell)+1;
int column = column_of_cell(cell);
projects / lyx.git / blobdiff