X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.C;h=a2cac72c8799463b0ed11de612856f8b1e98d8c2;hb=501f1dd61b6c0beb927151ecf331f78848261b59;hp=d38a35714dc56a303e2f4d7c0da129be3e15495c;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git diff --git a/src/tabular.C b/src/tabular.C index d38a35714d..a2cac72c87 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -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,11 +35,12 @@ #include "frontends/Alert.h" #include "gettext.h" #include "tabular_funcs.h" -#include "lyxtextclasslist.h" +#include "lyxlex.h" #include #include +using std::abs; using std::ostream; using std::istream; using std::getline; @@ -269,7 +270,9 @@ void LyXTabular::AppendRow(BufferParams const & bp, int cell) cell_info = c_info; ++row; for (int j = 0; j < columns_; ++j) { - cell_info[row][j].inset.clear(); + cell_info[row][j].inset.clear(false); + if (bp.tracking_changes) + cell_info[row][j].inset.markNew(true); } #endif Reinit(); @@ -320,8 +323,9 @@ void LyXTabular::AppendColumn(BufferParams const & bp, int cell) cell_info = c_info; //++column; for (int i = 0; i < rows_; ++i) { - //cell_info[i][column].inset.clear(); - cell_info[i][column + 1].inset.clear(); + cell_info[i][column + 1].inset.clear(false); + if (bp.tracking_changes) + cell_info[i][column + 1].inset.markNew(true); } Reinit(); } @@ -471,7 +475,7 @@ bool LyXTabular::LeftLine(int cell, bool onlycolumn) const #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 @@ -479,7 +483,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 @@ -494,7 +498,7 @@ bool LyXTabular::RightLine(int cell, bool onlycolumn) const #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 @@ -502,7 +506,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 @@ -750,8 +754,9 @@ bool LyXTabular::SetColumnPWidth(int cell, LyXLength const & width) 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); + // This should not ne necessary anymore + // 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).zero(); // because of multicolumns! @@ -1204,8 +1209,8 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is, Init(buf->params, rows_arg, columns_arg); l_getline(is, line); if (!prefixIs(line, " got" << - line << ")" << endl; + lyxerr << "Wrong tabular format (expected got" + << line << ')' << endl; return; } getTokenValue(line, "rotate", rotate); @@ -1244,8 +1249,8 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is, for (int j = 0; j < columns_; ++j) { l_getline(is,line); if (!prefixIs(line," got" << - line << ")" << endl; + lyxerr << "Wrong tabular format (expected got" + << line << ')' << endl; return; } getTokenValue(line, "alignment", column_info[j].alignment); @@ -1259,8 +1264,8 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is, for (int i = 0; i < rows_; ++i) { l_getline(is, line); if (!prefixIs(line, " got" << - line << ")" << endl; + lyxerr << "Wrong tabular format (expected got" + << line << ')' << endl; return; } getTokenValue(line, "topline", row_info[i].top_line); @@ -1273,8 +1278,8 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is, for (int j = 0; j < columns_; ++j) { l_getline(is, line); if (!prefixIs(line, " got" << - line << ")" << endl; + lyxerr << "Wrong tabular format (expected got" + << line << ')' << endl; return; } getTokenValue(line, "multicolumn", cell_info[i][j].multicolumn); @@ -1294,15 +1299,15 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is, l_getline(is, line); } if (!prefixIs(line, "")) { - lyxerr << "Wrong tabular format (expected got" << - line << ")" << endl; + lyxerr << "Wrong tabular format (expected got" + << line << ')' << endl; return; } } l_getline(is, line); if (!prefixIs(line, "")) { - lyxerr << "Wrong tabular format (expected got" << - line << ")" << endl; + lyxerr << "Wrong tabular format (expected got" + << line << ')' << endl; return; } } @@ -1448,7 +1453,8 @@ void LyXTabular::OldFormatRead(BufferParams const & bp, Paragraph * par = new Paragraph; Paragraph * return_par = 0; - par->layout(textclasslist[bp.textclass].defaultLayoutName()); + par->layout(bp.getLyXTextClass().defaultLayout()); + string tmptok; int pos = 0; Paragraph::depth_type depth = 0; @@ -1461,14 +1467,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, @@ -1555,7 +1558,7 @@ void LyXTabular::SetMultiColumn(Buffer const * buffer, int cell, int number) 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(); + cellinfo_of_cell(cell+i)->inset.clear(false); } #else for (number--; number > 0; --number) { @@ -1997,16 +2000,18 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const if (!GetPWidth(cell).zero()) { switch (GetVAlignment(cell)) { case LYX_VALIGN_TOP: - os << "p"; + os << 'p'; break; case LYX_VALIGN_CENTER: - os << "m"; + os << 'm'; break; case LYX_VALIGN_BOTTOM: - os << "b"; + os << 'b'; break; } - os << "{" << GetPWidth(cell).asLatexString() << '}'; + os << '{' + << GetPWidth(cell).asLatexString() + << '}'; } else { switch (GetAlignment(cell)) { case LYX_ALIGN_LEFT: @@ -2032,13 +2037,13 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const os << "\\parbox["; switch (GetVAlignment(cell)) { case LYX_VALIGN_TOP: - os << "t"; + os << 't'; break; case LYX_VALIGN_CENTER: - os << "c"; + os << 'c'; break; case LYX_VALIGN_BOTTOM: - os << "b"; + os << 'b'; break; } os << "]{" << GetPWidth(cell).asLatexString() << "}{"; @@ -2046,13 +2051,13 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const os << "\\begin{minipage}["; switch (GetVAlignment(cell)) { case LYX_VALIGN_TOP: - os << "t"; + os << 't'; break; case LYX_VALIGN_CENTER: - os << "m"; + os << 'm'; break; case LYX_VALIGN_BOTTOM: - os << "b"; + os << 'b'; break; } os << "]{" << GetPWidth(cell).asLatexString() << "}\n"; @@ -2068,7 +2073,7 @@ int LyXTabular::TeXCellPostamble(ostream & os, int cell) const // usual cells if (GetUsebox(cell) == BOX_PARBOX) - os << "}"; + os << '}'; else if (GetUsebox(cell) == BOX_MINIPAGE) { os << "%\n\\end{minipage}"; ret += 2; @@ -2198,13 +2203,13 @@ 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{"; ret += inset->latex(buf, os, fragile, fp); if (rtl) - os << "}"; + os << '}'; ret += TeXCellPostamble(os, cell); if (!IsLastCellInRow(cell)) { // not last cell in row @@ -2213,7 +2218,7 @@ int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf, } ++cell; } - os << "\\\\\n"; + os << "\\tabularnewline\n"; ++ret; ret += TeXBottomHLine(os, i); return ret; @@ -2244,18 +2249,35 @@ int LyXTabular::latex(Buffer const * buf, if (column_info[i].left_line) os << '|'; if (!column_info[i].p_width.zero()) { + switch (column_info[i].alignment) { + case LYX_ALIGN_LEFT: + os << ">{\\raggedright}"; + break; + case LYX_ALIGN_RIGHT: + os << ">{\\raggedleft}"; + break; + case LYX_ALIGN_CENTER: + os << ">{\\centering}"; + break; + case LYX_ALIGN_NONE: + case LYX_ALIGN_BLOCK: + case LYX_ALIGN_LAYOUT: + case LYX_ALIGN_SPECIAL: + break; + } + switch (column_info[i].valignment) { case LYX_VALIGN_TOP: - os << "p"; + os << 'p'; break; case LYX_VALIGN_CENTER: - os << "m"; + os << 'm'; break; case LYX_VALIGN_BOTTOM: - os << "b"; + os << 'b'; break; } - os << "{" + os << '{' << column_info[i].p_width.asLatexString() << '}'; } else { @@ -2264,8 +2286,8 @@ int LyXTabular::latex(Buffer const * buf, os << 'l'; break; case LYX_ALIGN_RIGHT: - os << 'r'; - break; + os << 'r'; + break; default: os << 'c'; break; @@ -2345,15 +2367,15 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const case LYX_VALIGN_CENTER: os << "middle"; } - os << "\""; + os << '"'; if (IsMultiColumn(cell)) { os << " namest=\"col" << j << "\" "; - os << "nameend=\"col" << j + cells_in_multicolumn(cell) - 1<< "\""; + os << "nameend=\"col" << j + cells_in_multicolumn(cell) - 1<< '"'; } - os << ">"; - ret += GetCellInset(cell)->docbook(buf, os); + os << '>'; + ret += GetCellInset(cell)->docbook(buf, os, true); os << "\n"; ++cell; } @@ -2362,7 +2384,8 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const } -int LyXTabular::docBook(Buffer const * buf, ostream & os) const +int LyXTabular::docbook(Buffer const * buf, ostream & os, + bool /*mixcont*/) const { int ret = 0; @@ -2403,7 +2426,7 @@ int LyXTabular::docBook(Buffer const * buf, ostream & os) const ret += docbookRow(buf, os, i); } } - os << "\n"; + os << "\n"; ++ret; } // output footer info @@ -2578,11 +2601,9 @@ int LyXTabular::asciiPrintCell(Buffer const * buf, ostream & os, break; } - for (unsigned int i = 0; i < len1; ++i) - os << " "; - os << sstr.str(); - for (unsigned int i = 0; i < len2; ++i) - os << " "; + os << string(len1, ' ') + << sstr.str() + << string(len2, ' '); if (RightLine(cell)) os << " |"; else @@ -2722,12 +2743,15 @@ int LyXTabular::GetCellFromInset(Inset const * inset, int maybe_cell) const void LyXTabular::Validate(LaTeXFeatures & features) const { + features.require("NeedTabularnewline"); if (IsLongTabular()) features.require("longtable"); if (NeedRotating()) features.require("rotating"); for (int cell = 0; cell < numberofcells; ++cell) { - if (GetVAlignment(cell) != LYX_VALIGN_TOP) + if ( (GetVAlignment(cell) != LYX_VALIGN_TOP) || + ( !(GetPWidth(cell).zero())&&!(IsMultiColumn(cell)) ) + ) features.require("array"); GetCellInset(cell)->validate(features); }