X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.C;h=68696aadd9d5457263079e8d33861969064b21eb;hb=29f01faa17495e3d80c08f234c8f049c7d699ac1;hp=9ca78ad16ff3f7a9c1d025165dda9bf508d9e7ab;hpb=f1b78fbf9f07947f1d42d92dab7f882734943848;p=lyx.git diff --git a/src/tabular.C b/src/tabular.C index 9ca78ad16f..68696aadd9 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -1,13 +1,13 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 2000-2002 The LyX Team. * * @author: Jürgen Vigna * - * ====================================================== + * ====================================================== */ #include @@ -25,7 +25,7 @@ #include "layout.h" #include "buffer.h" #include "BufferView.h" -#include "Painter.h" +#include "frontends/Painter.h" #include "LaTeXFeatures.h" #include "insets/insettabular.h" #include "insets/insettext.h" @@ -35,10 +35,12 @@ #include "frontends/Alert.h" #include "gettext.h" #include "tabular_funcs.h" +#include "lyxlex.h" #include #include +using std::abs; using std::ostream; using std::istream; using std::getline; @@ -75,7 +77,7 @@ LyXTabular::cellstruct::cellstruct(BufferParams const & bg) } -LyXTabular::rowstruct::rowstruct() +LyXTabular::rowstruct::rowstruct() { top_line = true; bottom_line = false; @@ -89,7 +91,7 @@ LyXTabular::rowstruct::rowstruct() } -LyXTabular::columnstruct::columnstruct() +LyXTabular::columnstruct::columnstruct() { left_line = true; right_line = false; @@ -119,7 +121,7 @@ LyXTabular::LyXTabular(BufferParams const & bp, LyXTabular::LyXTabular(BufferParams const & bp, InsetTabular * inset, LyXTabular const & lt, - bool same_id) + bool same_id) { owner_ = inset; cur_cell = -1; @@ -195,7 +197,7 @@ LyXTabular * LyXTabular::clone(BufferParams const & bp, } -/* activates all lines and sets all widths to 0 */ +/* activates all lines and sets all widths to 0 */ void LyXTabular::Init(BufferParams const & bp, int rows_arg, int columns_arg, LyXTabular const * lt) { @@ -226,7 +228,7 @@ void LyXTabular::Init(BufferParams const & bp, calculate_width_of_column(i); } column_info.back().right_line = true; - + calculate_width_of_tabular(); rowofcell = vector(); @@ -240,7 +242,7 @@ void LyXTabular::Init(BufferParams const & bp, void LyXTabular::AppendRow(BufferParams const & bp, int cell) { ++rows_; - + int row = row_of_cell(cell); row_vector::iterator rit = row_info.begin() + row; @@ -278,7 +280,7 @@ void LyXTabular::AppendRow(BufferParams const & bp, int cell) void LyXTabular::DeleteRow(int row) { if (rows_ == 1) return; // Not allowed to delete last row - + row_info.erase(row_info.begin() + row); //&row_info[row]); cell_info.erase(cell_info.begin() + row); //&cell_info[row]); --rows_; @@ -289,7 +291,7 @@ void LyXTabular::DeleteRow(int row) void LyXTabular::AppendColumn(BufferParams const & bp, int cell) { ++columns_; - + cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp))); int const column = column_of_cell(cell); @@ -332,7 +334,7 @@ void LyXTabular::DeleteColumn(int column) //if (!(columns_ - 1)) //return; if (columns_ == 1) return; // Not allowed to delete last column - + column_info.erase(column_info.begin() + column); for (int i = 0; i < rows_; ++i) { cell_info[i].erase(cell_info[i].begin() + column); @@ -358,7 +360,7 @@ void LyXTabular::Reinit(bool reset_widths) } } } - + for (int i = 0; i < columns_; ++i) { calculate_width_of_column(i); } @@ -437,11 +439,11 @@ int LyXTabular::NumberOfCellsInRow(int cell) const } -/* returns 1 if there is a topline, returns 0 if not */ +/* returns 1 if there is a topline, returns 0 if not */ bool LyXTabular::TopLine(int cell, bool onlycolumn) const { int const row = row_of_cell(cell); - + if (!onlycolumn && IsMultiColumn(cell)) return cellinfo_of_cell(cell)->top_line; return row_info[row].top_line; @@ -464,11 +466,13 @@ bool LyXTabular::BottomLine(int cell, bool onlycolumn) const bool LyXTabular::LeftLine(int cell, bool onlycolumn) const { - if (!onlycolumn && IsMultiColumn(cell)) { + if (!onlycolumn && IsMultiColumn(cell) && + (IsFirstCellInRow(cell) || IsMultiColumn(cell-1))) + { #ifdef SPECIAL_COLUM_HANDLING if (cellinfo_of_cell(cell)->align_special.empty()) return cellinfo_of_cell(cell)->left_line; - return prefixIs(frontStrip(cellinfo_of_cell(cell)->align_special), "|"); + return prefixIs(ltrim(cellinfo_of_cell(cell)->align_special), "|"); #else return cellinfo_of_cell(cell)->left_line; #endif @@ -476,7 +480,7 @@ bool LyXTabular::LeftLine(int cell, bool onlycolumn) const #ifdef SPECIAL_COLUM_HANDLING if (column_info[column_of_cell(cell)].align_special.empty()) return column_info[column_of_cell(cell)].left_line; - return prefixIs(frontStrip(column_info[column_of_cell(cell)].align_special), "|"); + return prefixIs(ltrim(column_info[column_of_cell(cell)].align_special), "|"); #else return column_info[column_of_cell(cell)].left_line; #endif @@ -485,11 +489,13 @@ bool LyXTabular::LeftLine(int cell, bool onlycolumn) const bool LyXTabular::RightLine(int cell, bool onlycolumn) const { - if (!onlycolumn && IsMultiColumn(cell)) { + if (!onlycolumn && IsMultiColumn(cell) && + (IsLastCellInRow(cell) || IsMultiColumn(cell+1))) + { #ifdef SPECIAL_COLUM_HANDLING if (cellinfo_of_cell(cell)->align_special.empty()) return cellinfo_of_cell(cell)->right_line; - return suffixIs(strip(cellinfo_of_cell(cell)->align_special), "|"); + return suffixIs(rtrim(cellinfo_of_cell(cell)->align_special), "|"); #else return cellinfo_of_cell(cell)->right_line; #endif @@ -497,7 +503,7 @@ bool LyXTabular::RightLine(int cell, bool onlycolumn) const #ifdef SPECIAL_COLUM_HANDLING if (column_info[column_of_cell(cell)].align_special.empty()) return column_info[right_column_of_cell(cell)].right_line; - return suffixIs(strip(column_info[column_of_cell(cell)].align_special), "|"); + return suffixIs(rtrim(column_info[column_of_cell(cell)].align_special), "|"); #else return column_info[right_column_of_cell(cell)].right_line; #endif @@ -534,7 +540,7 @@ bool LyXTabular::LeftAlreadyDrawed(int cell) const if (GetAdditionalWidth(cell_info[row][column].cellno)) return false; #ifdef SPECIAL_COLUM_HANDLING - return column_info[column].right_line; + return RightLine(cell_info[row][column].cellno); #else return RightLine(cell_info[row][column].cellno, true); #endif @@ -587,8 +593,8 @@ int LyXTabular::GetAdditionalWidth(int cell) const // used to get it back in text.C int const col = right_column_of_cell(cell); int const row = row_of_cell(cell); - if (col < columns_ - 1 && RightLine(cell, true) && - LeftLine(cell_info[row][col+1].cellno, true)) // column_info[col+1].left_line) + if (col < columns_ - 1 && RightLine(cell) && + LeftLine(cell_info[row][col+1].cellno)) // column_info[col+1].left_line) { return WIDTH_OF_LINE; } else { @@ -597,7 +603,7 @@ int LyXTabular::GetAdditionalWidth(int cell) const } -// returns the maximum over all rows +// returns the maximum over all rows int LyXTabular::GetWidthOfColumn(int cell) const { int const column1 = column_of_cell(cell); @@ -616,17 +622,17 @@ int LyXTabular::GetWidthOfTabular() const } -/* returns 1 if a complete update is necessary, otherwise 0 */ +/* returns 1 if a complete update is necessary, otherwise 0 */ bool LyXTabular::SetWidthOfMulticolCell(int cell, int new_width) { if (!IsMultiColumn(cell)) return false; - + int const row = row_of_cell(cell); int const column1 = column_of_cell(cell); int const column2 = right_column_of_cell(cell); int const old_val = cell_info[row][column2].width_of_cell; - + // first set columns to 0 so we can calculate the right width for (int i = column1; i <= column2; ++i) { cell_info[row][i].width_of_cell = 0; @@ -670,13 +676,13 @@ void LyXTabular::recalculateMulticolumnsOfColumn(int column) { int const cellno = cell_info[row][column].cellno; SetWidthOfMulticolCell(cellno, - GetWidthOfCell(cellno)-(2 * WIDTH_OF_LINE)); + GetWidthOfCell(cellno)-(2 * WIDTH_OF_LINE)); } } } -/* returns 1 if a complete update is necessary, otherwise 0 */ +/* returns 1 if a complete update is necessary, otherwise 0 */ bool LyXTabular::SetWidthOfCell(int cell, int new_width) { int const row = row_of_cell(cell); @@ -770,7 +776,7 @@ bool LyXTabular::SetMColumnPWidth(int cell, LyXLength const & width) bool LyXTabular::SetAlignSpecial(int cell, string const & special, - LyXTabular::Feature what) + LyXTabular::Feature what) { if (what == SET_SPECIAL_MULTI) cellinfo_of_cell(cell)->align_special = special; @@ -897,7 +903,7 @@ int LyXTabular::GetWidthOfCell(int cell) const int LyXTabular::GetBeginningOfTextInCell(int cell) const { int x = 0; - + switch (GetAlignment(cell)) { case LYX_ALIGN_CENTER: x += (GetWidthOfColumn(cell) - GetWidthOfCell(cell)) / 2; @@ -906,10 +912,10 @@ int LyXTabular::GetBeginningOfTextInCell(int cell) const x += GetWidthOfColumn(cell) - GetWidthOfCell(cell); // + GetAdditionalWidth(cell); break; - default: /* LYX_ALIGN_LEFT: nothing :-) */ + default: /* LYX_ALIGN_LEFT: nothing :-) */ break; } - + // the LaTeX Way :-( x += WIDTH_OF_LINE; return x; @@ -947,7 +953,7 @@ bool LyXTabular::calculate_width_of_column(int column) { int const old_column_width = column_info[column].width_of_column; int maximum = 0; - + for (int i = 0; i < rows_; ++i) { maximum = max(cell_info[i][column].width_of_cell, maximum); } @@ -1325,7 +1331,7 @@ void LyXTabular::OldFormatRead(BufferParams const & bp, int e = 0; int f = 0; int g = 0; - + istream & is = lex.getStream(); string s(fl); if (s.length() > 8) @@ -1390,7 +1396,7 @@ void LyXTabular::OldFormatRead(BufferParams const & bp, #else // ignore is buggy but we will use it later (Lgb) is.ignore(); // skip '"' -#endif +#endif getline(is, s1, '"'); #if 1 is >> ch; // skip '"' @@ -1443,6 +1449,8 @@ void LyXTabular::OldFormatRead(BufferParams const & bp, Paragraph * par = new Paragraph; Paragraph * return_par = 0; + par->layout(bp.getLyXTextClass().defaultLayout()); + string tmptok; int pos = 0; Paragraph::depth_type depth = 0; @@ -1455,14 +1463,11 @@ void LyXTabular::OldFormatRead(BufferParams const & bp, if (token.empty()) continue; if (token == "\\layout" - || token == "\\end_float" - || token == "\\end_deeper") { + || token == "\\end_float" // this should not exist anymore + || token == "\\end_inset" // as it is substituted by this + || token == "\\end_deeper") + { lex.pushToken(token); -#ifndef NO_COMPABILITY - // Here we need to insert the inset_ert_contents into the last - // cell of the tabular. - owner_->bufferOwner()->insertErtContents(par, pos); -#endif break; } if (owner_->bufferOwner()->parseSingleLyXformat2Token(lex, par, @@ -1537,15 +1542,25 @@ LyXTabular::cellstruct * LyXTabular::cellinfo_of_cell(int cell) const } -void LyXTabular::SetMultiColumn(int cell, int number) +void LyXTabular::SetMultiColumn(Buffer const * buffer, int cell, int number) { cellinfo_of_cell(cell)->multicolumn = CELL_BEGIN_OF_MULTICOLUMN; cellinfo_of_cell(cell)->alignment = column_info[column_of_cell(cell)].alignment; cellinfo_of_cell(cell)->top_line = row_info[row_of_cell(cell)].top_line; cellinfo_of_cell(cell)->bottom_line = row_info[row_of_cell(cell)].bottom_line; + cellinfo_of_cell(cell)->right_line = column_info[column_of_cell(cell+number-1)].right_line; +#if 1 + for (int i = 1; i < number; ++i) { + cellinfo_of_cell(cell+i)->multicolumn = CELL_PART_OF_MULTICOLUMN; + cellinfo_of_cell(cell)->inset.appendParagraphs(buffer->params, + cellinfo_of_cell(cell+i)->inset.paragraph()); + cellinfo_of_cell(cell+i)->inset.clear(); + } +#else for (number--; number > 0; --number) { cellinfo_of_cell(cell+number)->multicolumn = CELL_PART_OF_MULTICOLUMN; } +#endif set_row_column_number_info(); } @@ -1570,9 +1585,9 @@ int LyXTabular::UnsetMultiColumn(int cell) { int const row = row_of_cell(cell); int column = column_of_cell(cell); - + int result = 0; - + if (cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN) { cell_info[row][column].multicolumn = CELL_NORMAL; ++column; @@ -1972,7 +1987,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const os << cellinfo_of_cell(cell)->align_special << "}{"; } else { if (LeftLine(cell) && - (IsFirstCellInRow(cell) || + (IsFirstCellInRow(cell) || (!IsMultiColumn(cell-1) && !LeftLine(cell, true) && !RightLine(cell-1, true)))) { @@ -2069,7 +2084,7 @@ int LyXTabular::TeXCellPostamble(ostream & os, int cell) const int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf, - bool fragile, bool fp) const + bool fragile, bool fp) const { if (!is_long_tabular) return 0; @@ -2169,7 +2184,7 @@ bool LyXTabular::isValidRow(int const row) const int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf, - bool fragile, bool fp) const + bool fragile, bool fp) const { int ret = 0; int cell = GetCellNumber(i, 0); @@ -2182,7 +2197,7 @@ int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf, InsetText * inset = GetCellInset(cell); bool rtl = inset->paragraph()->isRightToLeftPar(buf->params) && - inset->paragraph()->size() > 0 && GetPWidth(cell).zero(); + !inset->paragraph()->empty() && GetPWidth(cell).zero(); if (rtl) os << "\\R{"; @@ -2224,7 +2239,7 @@ int LyXTabular::latex(Buffer const * buf, for (int i = 0; i < columns_; ++i) { if (!column_info[i].align_special.empty()) { os << column_info[i].align_special; - } else { + } else { if (column_info[i].left_line) os << '|'; if (!column_info[i].p_width.zero()) { @@ -2263,7 +2278,7 @@ int LyXTabular::latex(Buffer const * buf, ++ret; ret += TeXLongtableHeaderFooter(os, buf, fragile, fp); - + //+--------------------------------------------------------------------- //+ the single row and columns (cells) + //+--------------------------------------------------------------------- @@ -2299,7 +2314,7 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const { int ret = 0; int cell = GetFirstCellInRow(row); - + os << "\n"; for (int j = 0; j < columns_; ++j) { if (IsPartOfMultiColumn(row, j)) @@ -2337,16 +2352,17 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const } os << ">"; - ret += GetCellInset(cell)->docbook(buf, os); + ret += GetCellInset(cell)->docbook(buf, os, true); os << "\n"; ++cell; } os << "\n"; return ret; -} +} -int LyXTabular::docBook(Buffer const * buf, ostream & os) const +int LyXTabular::docbook(Buffer const * buf, ostream & os, + bool /*mixcont*/) const { int ret = 0; @@ -2356,7 +2372,7 @@ int LyXTabular::docBook(Buffer const * buf, ostream & os) const os << "\n"; - + for (int i = 0; i < columns_; ++i) { os << "\n"; + os << "\n"; ++ret; } // output footer info @@ -2430,7 +2446,7 @@ int LyXTabular::docBook(Buffer const * buf, ostream & os) const // ASCII export function and helpers //-- int LyXTabular::asciiTopHLine(ostream & os, int row, - vector const & clen) const + vector const & clen) const { int const fcell = GetFirstCellInRow(row); int const n = NumberOfCellsInRow(fcell) + fcell; @@ -2477,7 +2493,7 @@ int LyXTabular::asciiTopHLine(ostream & os, int row, int LyXTabular::asciiBottomHLine(ostream & os, int row, - vector const & clen) const + vector const & clen) const { int const fcell = GetFirstCellInRow(row); int const n = NumberOfCellsInRow(fcell) + fcell; @@ -2524,9 +2540,9 @@ int LyXTabular::asciiBottomHLine(ostream & os, int row, int LyXTabular::asciiPrintCell(Buffer const * buf, ostream & os, - int cell, int row, int column, - vector const & clen, - bool onlydata) const + int cell, int row, int column, + vector const & clen, + bool onlydata) const { ostringstream sstr; int ret = GetCellInset(cell)->ascii(buf, sstr, 0); @@ -2535,7 +2551,7 @@ int LyXTabular::asciiPrintCell(Buffer const * buf, ostream & os, os << sstr.str(); return ret; } - + if (LeftLine(cell)) os << "| "; else @@ -2672,7 +2688,7 @@ int LyXTabular::GetCellFromInset(Inset const * inset, int maybe_cell) const << "this is not a cell of the tabular!" << endl; return -1; } - + const int save_cur_cell = cur_cell; int cell = cur_cell; if (GetCellInset(cell) != inset) { @@ -2681,7 +2697,7 @@ int LyXTabular::GetCellFromInset(Inset const * inset, int maybe_cell) const cell = -1; } } - + if (cell == -1) { for (cell = GetNumberOfCells(); cell >= 0; --cell) { if (GetCellInset(cell) == inset) @@ -2690,7 +2706,7 @@ int LyXTabular::GetCellFromInset(Inset const * inset, int maybe_cell) const lyxerr[Debug::INSETTEXT] << "LyXTabular::GetCellFromInset: " << "cell=" << cell - << ", cur_cell=" << save_cur_cell + << ", cur_cell=" << save_cur_cell << ", maybe_cell=" << maybe_cell << endl; // We should have found a cell at this point @@ -2699,7 +2715,7 @@ int LyXTabular::GetCellFromInset(Inset const * inset, int maybe_cell) const << "Cell not found!" << endl; } } - + return cell; } @@ -2731,7 +2747,7 @@ vector const LyXTabular::getLabelList() const return label_list; } - + LyXTabular::BoxType LyXTabular::UseParbox(int cell) const { Paragraph * par = GetCellInset(cell)->paragraph();