#include "DispatchResult.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
+#include "InsetIterator.h"
#include "InsetList.h"
#include "Language.h"
#include "LaTeXFeatures.h"
{ Tabular::LONGTABULAR_ALIGN_RIGHT, "longtabular-align-right", false },
{ Tabular::SET_DECIMAL_POINT, "set-decimal-point", true },
{ Tabular::SET_TABULAR_WIDTH, "set-tabular-width", true },
+ { Tabular::SET_INNER_LINES, "set-inner-lines", false },
{ Tabular::LAST_ACTION, "", false }
};
return "parbox";
case Tabular::BOX_MINIPAGE:
return "minipage";
+ case Tabular::BOX_VARWIDTH:
+ return "varwidth";
}
return string();
}
num = Tabular::BOX_PARBOX;
else if (str == "minipage")
num = Tabular::BOX_MINIPAGE;
+ else if (str == "varwidth")
+ num = Tabular::BOX_VARWIDTH;
else
return false;
return true;
setBottomLine(i, bottomLine(j));
setTopLine(i, topLine(j));
setLeftLine(i, leftLine(j));
+ setRightLine(i, rightLine(j));
if (rightLine(i) && rightLine(j)) {
- setRightLine(i, true);
setRightLine(j, false);
}
if (buffer().params().track_changes)
}
-bool Tabular::leftLine(idx_type cell) const
+bool Tabular::leftLine(idx_type cell, bool const ignore_bt) const
{
- if (use_booktabs)
+ if (use_booktabs && !ignore_bt)
return false;
return cellInfo(cell).left_line;
}
-bool Tabular::rightLine(idx_type cell) const
+bool Tabular::rightLine(idx_type cell, bool const ignore_bt) const
{
- if (use_booktabs)
+ if (use_booktabs && !ignore_bt)
return false;
return cellInfo(cell).right_line;
}
cur.pop();
}
-}
+} // namespace
void Tabular::setColumnPWidth(Cursor & cur, idx_type cell,
bool Tabular::needRotating() const
{
- if (rotate)
+ if (rotate && !is_long_tabular)
return true;
for (row_type r = 0; r < nrows(); ++r)
for (col_type c = 0; c < ncols(); ++c)
}
-// FIXME: Remove this routine because we cannot insert \parboxes when the user
-// adds line breaks, see bug 4886.
Tabular::BoxType Tabular::getUsebox(idx_type cell) const
{
- if ((!column_info[cellColumn(cell)].p_width.zero() && !isMultiColumn(cell)) ||
- (isMultiColumn(cell) && !cellInfo(cell).p_width.zero()))
+ if (getRotateCell(cell) == 0
+ && ((!column_info[cellColumn(cell)].p_width.zero() && !isMultiColumn(cell)) ||
+ (isMultiColumn(cell) && !cellInfo(cell).p_width.zero())))
return BOX_NONE;
if (cellInfo(cell).usebox > 1)
return cellInfo(cell).usebox;
}
-void Tabular::TeXTopHLine(otexstream & os, row_type row, string const & lang) const
+void Tabular::TeXTopHLine(otexstream & os, row_type row, string const & lang,
+ list<col_type> columns) const
{
// we only output complete row lines and the 1st row here, the rest
// is done in Tabular::TeXBottomHLine(...)
// get for each column the topline (if any)
- vector<bool> topline;
+ map<col_type, bool> topline;
col_type nset = 0;
- for (col_type c = 0; c < ncols(); ++c) {
- topline.push_back(topLine(cellIndex(row, c)));
+ for (auto const & c : columns) {
+ topline[c] = topLine(cellIndex(row, c));
// If cell is part of a multirow and not the first cell of the
// multirow, no line must be drawn.
if (row != 0)
if (isMultiRow(cellIndex(row, c))
&& cell_info[row][c].multirow != CELL_BEGIN_OF_MULTIROW)
topline[c] = false;
- if (topline[c])
+ if (topline.find(c) != topline.end() && topline.find(c)->second)
++nset;
}
os << "\\hline ";
}
} else if (row == 0) {
- for (col_type c = 0; c < ncols(); ++c) {
- if (topline[c]) {
+ for (auto & c : columns) {
+ if (topline.find(c)->second) {
col_type offset = 0;
for (col_type j = 0 ; j < c; ++j)
if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
os << (use_booktabs ? "\\cmidrule{" : "\\cline{") << c + 1 + offset << '-';
col_type cstart = c;
- for ( ; c < ncols() && topline[c]; ++c) {}
+ for ( ; c < ncols() && topline.find(c)->second; ++c) {}
for (col_type j = cstart ; j < c ; ++j)
if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
}
-void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const & lang) const
+void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const & lang,
+ list<col_type> columns) const
{
// we output bottomlines of row r and the toplines of row r+1
// if the latter do not span the whole tabular
// get the bottomlines of row r, and toplines in next row
bool lastrow = row == nrows() - 1;
- vector<bool> bottomline, topline;
+ map<col_type, bool> bottomline, topline;
bool nextrowset = true;
- for (col_type c = 0; c < ncols(); ++c) {
- bottomline.push_back(bottomLine(cellIndex(row, c)));
- topline.push_back(!lastrow && topLine(cellIndex(row + 1, c)));
+ for (auto const & c : columns) {
+ bottomline[c] = bottomLine(cellIndex(row, c));
+ topline[c] = !lastrow && topLine(cellIndex(row + 1, c));
// If cell is part of a multirow and not the last cell of the
// multirow, no line must be drawn.
if (!lastrow)
bottomline[c] = false;
topline[c] = false;
}
- nextrowset &= topline[c];
+ nextrowset &= topline.find(c) != topline.end() && topline.find(c)->second;
}
// combine this row's bottom lines and next row's toplines if necessary
col_type nset = 0;
- for (col_type c = 0; c < ncols(); ++c) {
+ for (auto const & c : columns) {
if (!nextrowset)
- bottomline[c] = bottomline[c] || topline[c];
- if (bottomline[c])
+ bottomline[c] = bottomline.find(c)->second || topline.find(c)->second;
+ if (bottomline.find(c)->second)
++nset;
}
else
os << "\\hline ";
} else {
- for (col_type c = 0; c < ncols(); ++c) {
- if (bottomline[c]) {
+ for (auto & c : columns) {
+ if (bottomline.find(c)->second) {
col_type offset = 0;
for (col_type j = 0 ; j < c; ++j)
if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
os << (use_booktabs ? "\\cmidrule{" : "\\cline{") << c + 1 + offset << '-';
col_type cstart = c;
- for ( ; c < ncols() && bottomline[c]; ++c) {}
+ for ( ; c < ncols() && bottomline.find(c)->second; ++c) {}
for (col_type j = cstart ; j < c ; ++j)
if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
void Tabular::TeXCellPreamble(otexstream & os, idx_type cell,
- bool & ismulticol, bool & ismultirow) const
+ bool & ismulticol, bool & ismultirow,
+ bool const bidi) const
{
row_type const r = cellRow(cell);
if (is_long_tabular && row_info[r].caption)
LyXAlignment align = getAlignment(cell, !isMultiColumn(cell));
// figure out how to set the lines
// we always set double lines to the right of the cell
+ // or left in bidi RTL, respectively.
col_type const c = cellColumn(cell);
col_type const nextcol = c + columnSpan(cell);
+ bool const decimal = column_info[c].alignment == LYX_ALIGN_DECIMAL;
bool colright = columnRightLine(c);
bool colleft = columnLeftLine(c);
bool nextcolleft = nextcol < ncols() && columnLeftLine(nextcol);
bool coldouble = colright && nextcolleft;
bool celldouble = rightLine(cell) && nextcellleft;
- ismulticol = isMultiColumn(cell)
- || (c == 0 && colleft != leftLine(cell))
- || ((colright || nextcolleft) && !rightLine(cell) && !nextcellleft)
- || (!colright && !nextcolleft && (rightLine(cell) || nextcellleft))
- || (coldouble != celldouble);
+ ismulticol = (isMultiColumn(cell)
+ || (c == 0 && colleft != leftLine(cell))
+ || ((colright || nextcolleft) && !rightLine(cell) && !nextcellleft)
+ || (!colright && !nextcolleft && (rightLine(cell) || nextcellleft))
+ || (coldouble != celldouble))
+ && !decimal;
// we center in multicol when no decimal point
- if (column_info[c].alignment == LYX_ALIGN_DECIMAL) {
+ if (decimal) {
docstring const align_d = column_info[c].decimal_point;
DocIterator const dit = separatorPos(cellInset(cell), align_d);
- ismulticol |= !dit;
+ bool const nosep = !dit;
+ ismulticol |= nosep;
+ celldouble &= nosep;
}
// up counter by 1 for each decimally aligned col since they use 2 latex cols
int latexcolspan = columnSpan(cell);
- for(col_type col = c; col < c + columnSpan(cell); ++col)
+ for (col_type col = c; col < c + columnSpan(cell); ++col)
if (column_info[col].alignment == LYX_ALIGN_DECIMAL)
++latexcolspan;
if (ismulticol) {
os << "\\multicolumn{" << latexcolspan << "}{";
- if (c ==0 && leftLine(cell))
+ if (((bidi && c == getLastCellInRow(cellRow(0)) && rightLine(cell))
+ || (!bidi && c == 0 && leftLine(cell))))
+ os << '|';
+ if (bidi && celldouble)
+ // add extra vertical line if we want a double one
os << '|';
if (!cellInfo(cell).align_special.empty()) {
os << cellInfo(cell).align_special;
}
} // end if else !getPWidth
} // end if else !cellinfo_of_cell
- if (rightLine(cell) || nextcellleft)
+ if ((bidi && leftLine(cell)) || (!bidi && rightLine(cell)) || nextcellleft)
os << '|';
- if (celldouble)
+ if (!bidi && celldouble)
// add extra vertical line if we want a double one
os << '|';
os << "}{";
}
os << "]{" << from_ascii(getPWidth(cell).asLatexString())
<< "}\n";
+ } else if (getUsebox(cell) == BOX_VARWIDTH) {
+ os << "\\begin{varwidth}[";
+ switch (valign) {
+ case LYX_VALIGN_TOP:
+ os << 't';
+ break;
+ case LYX_VALIGN_MIDDLE:
+ os << 'm';
+ break;
+ case LYX_VALIGN_BOTTOM:
+ os << 'b';
+ break;
}
+ os << "]{\\linewidth}\n";
+}
}
os << '}';
else if (getUsebox(cell) == BOX_MINIPAGE)
os << breakln << "\\end{minipage}";
+ else if (getUsebox(cell) == BOX_VARWIDTH)
+ os << breakln << "\\end{varwidth}";
if (getRotateCell(cell) != 0)
os << breakln << "\\end{turn}";
if (ismultirow)
void Tabular::TeXLongtableHeaderFooter(otexstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams,
+ list<col_type> columns) const
{
if (!is_long_tabular)
return;
if (row_info[r].caption &&
!row_info[r].endfirsthead && !row_info[r].endhead &&
!row_info[r].endfoot && !row_info[r].endlastfoot)
- TeXRow(os, r, runparams);
+ TeXRow(os, r, runparams, columns);
}
}
// output first header info
os << "\\hline\n";
for (row_type r = 0; r < nrows(); ++r) {
if (row_info[r].endfirsthead)
- TeXRow(os, r, runparams);
+ TeXRow(os, r, runparams, columns);
}
if (endfirsthead.bottomDL)
os << "\\hline\n";
os << "\\hline\n";
for (row_type r = 0; r < nrows(); ++r) {
if (row_info[r].endhead)
- TeXRow(os, r, runparams);
+ TeXRow(os, r, runparams, columns);
}
if (endhead.bottomDL)
os << "\\hline\n";
os << "\\hline\n";
for (row_type r = 0; r < nrows(); ++r) {
if (row_info[r].endfoot)
- TeXRow(os, r, runparams);
+ TeXRow(os, r, runparams, columns);
}
if (endfoot.bottomDL)
os << "\\hline\n";
os << "\\hline\n";
for (row_type r = 0; r < nrows(); ++r) {
if (row_info[r].endlastfoot)
- TeXRow(os, r, runparams);
+ TeXRow(os, r, runparams, columns);
}
if (endlastfoot.bottomDL)
os << "\\hline\n";
void Tabular::TeXRow(otexstream & os, row_type row,
- OutputParams const & runparams) const
+ OutputParams const & runparams,
+ list<col_type> columns) const
{
idx_type cell = cellIndex(row, 0);
InsetTableCell const * inset = cellInset(cell);
string const lang = par.getParLanguage(buffer().params())->lang();
//output the top line
- TeXTopHLine(os, row, lang);
+ TeXTopHLine(os, row, lang, columns);
if (row_info[row].top_space_default) {
if (use_booktabs)
}
bool ismulticol = false;
bool ismultirow = false;
- for (col_type c = 0; c < ncols(); ++c) {
+
+ // The bidi package (loaded by polyglossia) reverses RTL table columns
+ bool const bidi_rtl =
+ runparams.local_font->isRightToLeft()
+ && runparams.use_polyglossia;
+ idx_type lastcell =
+ bidi_rtl ? getFirstCellInRow(row) : getLastCellInRow(row);
+
+ for (auto const & c : columns) {
if (isPartOfMultiColumn(row, c))
continue;
if (isPartOfMultiRow(row, c)
&& column_info[c].alignment != LYX_ALIGN_DECIMAL) {
- if (cell != getLastCellInRow(row))
+ if (cell != lastcell)
os << " & ";
continue;
}
- TeXCellPreamble(os, cell, ismulticol, ismultirow);
+ TeXCellPreamble(os, cell, ismulticol, ismultirow, bidi_rtl);
InsetTableCell const * inset = cellInset(cell);
Paragraph const & par = inset->paragraphs().front();
head.setMacrocontextPositionRecursive(dit);
bool hassep = false;
InsetTableCell tail = splitCell(head, column_info[c].decimal_point, hassep);
- head.latex(os, newrp);
if (hassep) {
- os << '&';
tail.setBuffer(head.buffer());
dit.pop_back();
dit.push_back(CursorSlice(tail));
tail.setMacrocontextPositionRecursive(dit);
- tail.latex(os, newrp);
+ }
+ if (bidi_rtl) {
+ if (hassep) {
+ tail.latex(os, newrp);
+ os << '&';
+ }
+ head.latex(os, newrp);
+ } else {
+ head.latex(os, newrp);
+ if (hassep) {
+ os << '&';
+ tail.latex(os, newrp);
+ }
+ }
+ } else if (ltCaption(row)) {
+ // Inside longtable caption rows, we must only output the caption inset
+ // with its content and omit anything outside of that (see #10791)
+ InsetIterator it = inset_iterator_begin(*const_cast<InsetTableCell *>(inset));
+ InsetIterator i_end = inset_iterator_end(*const_cast<InsetTableCell *>(inset));
+ for (; it != i_end; ++it) {
+ if (it->lyxCode() != CAPTION_CODE)
+ continue;
+ it->latex(os, runparams);
+ break;
}
} else if (!isPartOfMultiRow(row, c)) {
if (!runparams.nice)
os << '}';
TeXCellPostamble(os, cell, ismulticol, ismultirow);
- if (cell != getLastCellInRow(row)) { // not last cell in row
+ if (cell != lastcell) { // not last cell in row
if (runparams.nice)
os << " & ";
else
os << '\n';
//output the bottom line
- TeXBottomHLine(os, row, lang);
+ TeXBottomHLine(os, row, lang, columns);
if (row_info[row].interline_space_default) {
if (use_booktabs)
if (!TexRow::isNone(pos))
os.texrow().start(pos);
- if (rotate != 0)
- os << "\\begin{turn}{" << convert<string>(rotate) << "}\n";
+ if (rotate != 0) {
+ if (is_long_tabular)
+ os << "\\begin{landscape}\n";
+ else
+ os << "\\begin{turn}{" << convert<string>(rotate) << "}\n";
+ }
if (is_long_tabular) {
os << "\\begin{longtable}";
os << "[l]";
break;
case LYX_LONGTABULAR_ALIGN_CENTER:
+ os << "[c]";
break;
case LYX_LONGTABULAR_ALIGN_RIGHT:
os << "[r]";
if (is_tabular_star)
os << "@{\\extracolsep{\\fill}}";
- for (col_type c = 0; c < ncols(); ++c) {
- if (columnLeftLine(c))
+ // The bidi package (loaded by polyglossia) swaps the column
+ // order for RTL (#9686). Thus we use this list.
+ bool const bidi_rtl =
+ runparams.local_font->isRightToLeft()
+ && runparams.use_polyglossia;
+ list<col_type> columns;
+ for (col_type cl = 0; cl < ncols(); ++cl) {
+ if (bidi_rtl)
+ columns.push_front(cl);
+ else
+ columns.push_back(cl);
+ }
+
+ for (auto const & c : columns) {
+ if ((bidi_rtl && columnRightLine(c)) || (!bidi_rtl && columnLeftLine(c)))
os << '|';
if (!column_info[c].align_special.empty()) {
os << column_info[c].align_special;
case LYX_ALIGN_LAYOUT:
case LYX_ALIGN_SPECIAL:
break;
- case LYX_ALIGN_DECIMAL:
- os << ">{\\raggedleft}";
+ case LYX_ALIGN_DECIMAL: {
+ if (bidi_rtl)
+ os << ">{\\raggedright}";
+ else
+ os << ">{\\raggedleft}";
decimal = true;
break;
}
+ }
char valign = 'p';
switch (column_info[c].valignment) {
}
} // end if else !column_info[i].p_width
} // end if else !column_info[i].align_special
- if (columnRightLine(c))
+ if ((bidi_rtl && columnLeftLine(c)) || (!bidi_rtl && columnRightLine(c)))
os << '|';
}
os << "}\n";
- TeXLongtableHeaderFooter(os, runparams);
+ TeXLongtableHeaderFooter(os, runparams, columns);
//+---------------------------------------------------------------------
//+ the single row and columns (cells) +
for (row_type r = 0; r < nrows(); ++r) {
if (isValidRow(r)) {
- TeXRow(os, r, runparams);
+ TeXRow(os, r, runparams, columns);
if (is_long_tabular && row_info[r].newpage)
os << "\\newpage\n";
}
os << "\\end{tabular}";
}
- if (rotate != 0)
- os << breakln << "\\end{turn}";
+ if (rotate != 0) {
+ if (is_long_tabular)
+ os << breakln << "\\end{landscape}";
+ else
+ os << breakln << "\\end{turn}";
+ }
if (!TexRow::isNone(pos))
os.texrow().start(pos);
continue;
stringstream attr;
-
+
Length const cwidth = column_info[c].p_width;
if (!cwidth.zero()) {
string const hwidth = cwidth.asHTMLString();
attr << "style =\"width: " << hwidth << ";\" ";
}
-
+
attr << "align='";
switch (getAlignment(cell)) {
case LYX_ALIGN_LEFT:
features.require("booktabs");
if (is_long_tabular)
features.require("longtable");
+ if (rotate && is_long_tabular)
+ features.require("lscape");
if (needRotating())
features.require("rotating");
for (idx_type cell = 0; cell < numberofcells; ++cell) {
if (isMultiRow(cell))
features.require("multirow");
+ if (getUsebox(cell) == BOX_VARWIDTH)
+ features.require("varwidth");
if (getVAlignment(cell) != LYX_VALIGN_TOP
|| !getPWidth(cell).zero())
features.require("array");
+ // Tell footnote that we need a savenote
+ // environment in non-long tables or
+ // longtable headers/footers
+ else if (!is_long_tabular && !features.inFloat())
+ features.saveNoteEnv("tabular");
+ else if (!isValidRow(cellRow(cell)))
+ features.saveNoteEnv("longtable");
+
cellInset(cell)->validate(features);
+ features.saveNoteEnv(string());
}
}
ParagraphList const & parlist = cellInset(cell)->paragraphs();
ParagraphList::const_iterator cit = parlist.begin();
ParagraphList::const_iterator end = parlist.end();
+ bool const turned = getRotateCell(cell) != 0;
for (; cit != end; ++cit)
for (int i = 0; i < cit->size(); ++i)
if (cit->isNewline(i))
- return BOX_PARBOX;
+ return turned ? BOX_VARWIDTH : BOX_PARBOX;
return BOX_NONE;
}
}
+namespace {
+
+void tabline(PainterInfo const & pi, int x1, int y1, int x2, int y2,
+ bool drawline, bool heavy = false)
+{
+ ColorCode const col = drawline ? Color_tabularline : Color_tabularonoffline;
+ pi.pain.line(x1, y1, x2, y2, pi.textColor(col),
+ drawline ? Painter::line_solid : Painter::line_onoffdash,
+ (heavy ? 2 : 1) * Painter::thin_line);
+}
+
+}
+
+
void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y,
row_type row, idx_type cell) const
{
y -= tabular.rowAscent(row);
int const w = tabular.cellWidth(cell);
int const h = tabular.cellHeight(cell);
- Color const linecolor = pi.textColor(Color_tabularline);
- Color const gridcolor = pi.textColor(Color_tabularonoffline);
+
+ col_type const col = tabular.cellColumn(cell);
// Top
bool drawline = tabular.topLine(cell)
|| (row > 0 && tabular.bottomLine(tabular.cellAbove(cell)));
- pi.pain.line(x, y, x + w, y,
- drawline ? linecolor : gridcolor,
- drawline ? Painter::line_solid : Painter::line_onoffdash);
+ bool heavy = tabular.use_booktabs && row == 0 && tabular.rowTopLine(row);
+ tabline(pi, x, y, x + w, y, drawline, heavy);
// Bottom
drawline = tabular.bottomLine(cell);
- pi.pain.line(x, y + h, x + w, y + h,
- drawline ? linecolor : gridcolor,
- drawline ? Painter::line_solid : Painter::line_onoffdash);
+ row_type const lastrow = tabular.nrows() - 1;
+ // Consider multi-rows
+ row_type r = row;
+ while (r < lastrow && tabular.isMultiRow(tabular.cellIndex(r, col))
+ && tabular.isPartOfMultiRow(r + 1, col))
+ r++;
+ heavy = tabular.use_booktabs
+ && ((row == lastrow && tabular.rowBottomLine(row))
+ || (r == lastrow && tabular.rowBottomLine(r)));
+ tabline(pi, x, y + h, x + w, y + h, drawline, heavy);
// Left
- col_type const col = tabular.cellColumn(cell);
drawline = tabular.leftLine(cell)
|| (col > 0 && tabular.rightLine(tabular.cellIndex(row, col - 1)));
- pi.pain.line(x, y, x, y + h,
- drawline ? linecolor : gridcolor,
- drawline ? Painter::line_solid : Painter::line_onoffdash);
+ tabline(pi, x, y, x, y + h, drawline);
// Right
x -= tabular.interColumnSpace(cell);
drawline = tabular.rightLine(cell)
|| (next_cell_col < tabular.ncols()
&& tabular.leftLine(tabular.cellIndex(row, next_cell_col)));
- pi.pain.line(x + w, y, x + w, y + h,
- drawline ? linecolor : gridcolor,
- drawline ? Painter::line_solid : Painter::line_onoffdash);
+ tabline(pi, x + w, y, x + w, y + h, drawline);
}
case Tabular::SET_ALL_LINES:
case Tabular::UNSET_ALL_LINES:
+ case Tabular::SET_INNER_LINES:
case Tabular::SET_BORDER_LINES:
status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx())));
break;
// therefore allow always left but right and center only if there is no width
case Tabular::M_ALIGN_LEFT:
flag = false;
+ // fall through
case Tabular::ALIGN_LEFT:
status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_LEFT);
break;
case Tabular::M_ALIGN_RIGHT:
flag = false;
+ // fall through
case Tabular::ALIGN_RIGHT:
status.setEnabled(!(tabular.isMultiRow(cur.idx())
&& !tabular.getPWidth(cur.idx()).zero()));
case Tabular::M_ALIGN_CENTER:
flag = false;
+ // fall through
case Tabular::ALIGN_CENTER:
status.setEnabled(!(tabular.isMultiRow(cur.idx())
&& !tabular.getPWidth(cur.idx()).zero()));
case Tabular::M_VALIGN_TOP:
flag = false;
+ // fall through
case Tabular::VALIGN_TOP:
status.setEnabled(!tabular.getPWidth(cur.idx()).zero()
&& !tabular.isMultiRow(cur.idx()));
case Tabular::M_VALIGN_BOTTOM:
flag = false;
+ // fall through
case Tabular::VALIGN_BOTTOM:
status.setEnabled(!tabular.getPWidth(cur.idx()).zero()
&& !tabular.isMultiRow(cur.idx()));
case Tabular::M_VALIGN_MIDDLE:
flag = false;
+ // fall through
case Tabular::VALIGN_MIDDLE:
status.setEnabled(!tabular.getPWidth(cur.idx()).zero()
&& !tabular.isMultiRow(cur.idx()));
if (&cur.inset() != this)
break;
string action = cmd.getArg(0);
- string arg = cmd.getLongArg(1);
+ string arg = cmd.getLongArg(1);
return getFeatureStatus(cur, action, arg, status);
}
status.setEnabled(false);
return true;
}
- // Fall back
+ // fall through
case LFUN_NEWLINE_INSERT: {
if (tabular.getPWidth(cur.idx()).zero()) {
status.setEnabled(false);
row_type sel_row_start;
row_type sel_row_end;
bool setLines = false;
+ bool setLinesInnerOnly = false;
LyXAlignment setAlign = LYX_ALIGN_LEFT;
Tabular::VAlignment setVAlign = Tabular::LYX_VALIGN_TOP;
case Tabular::SET_PWIDTH: {
Length const len(value);
- tabular.setColumnPWidth(cur, cur.idx(), len);
- if (len.zero()
- && tabular.getAlignment(cur.idx(), true) == LYX_ALIGN_BLOCK)
- tabularFeatures(cur, Tabular::ALIGN_CENTER, string());
+ for (col_type c = sel_col_start; c <= sel_col_end; ++c) {
+ tabular.setColumnPWidth(cur, tabular.cellIndex(row, c), len);
+ if (len.zero()
+ && tabular.getAlignment(tabular.cellIndex(row, c), true) == LYX_ALIGN_BLOCK)
+ tabularFeatures(cur, Tabular::ALIGN_CENTER, string());
+ }
break;
}
case Tabular::M_VALIGN_BOTTOM:
case Tabular::M_VALIGN_MIDDLE:
flag = false;
+ // fall through
case Tabular::VALIGN_TOP:
case Tabular::VALIGN_BOTTOM:
case Tabular::VALIGN_MIDDLE:
break;
}
+ case Tabular::SET_INNER_LINES:
+ setLinesInnerOnly = true;
+ // fall through
case Tabular::SET_ALL_LINES:
setLines = true;
+ // fall through
case Tabular::UNSET_ALL_LINES:
for (row_type r = sel_row_start; r <= sel_row_end; ++r)
for (col_type c = sel_col_start; c <= sel_col_end; ++c) {
idx_type const cell = tabular.cellIndex(r, c);
- tabular.setTopLine(cell, setLines);
- tabular.setBottomLine(cell, setLines);
- tabular.setRightLine(cell, setLines);
- tabular.setLeftLine(cell, setLines);
+ if (!setLinesInnerOnly || r != sel_row_start)
+ tabular.setTopLine(cell, setLines);
+ if ((!setLinesInnerOnly || r != sel_row_end)
+ && (!setLines || r == sel_row_end))
+ tabular.setBottomLine(cell, setLines);
+ if ((!setLinesInnerOnly || c != sel_col_end)
+ && (!setLines || c == sel_col_end))
+ tabular.setRightLine(cell, setLines);
+ if ((!setLinesInnerOnly || c != sel_col_start))
+ tabular.setLeftLine(cell, setLines);
}
break;
tabular.longtabular_alignment = Tabular::LYX_LONGTABULAR_ALIGN_RIGHT;
break;
-
-
case Tabular::SET_ROTATE_CELL:
for (row_type r = sel_row_start; r <= sel_row_end; ++r)
for (col_type c = sel_col_start; c <= sel_col_end; ++c)
case Tabular::UNSET_LTFIRSTHEAD:
flag = false;
+ // fall through
case Tabular::SET_LTFIRSTHEAD:
tabular.getRowOfLTFirstHead(row, ltt);
checkLongtableSpecial(ltt, value, flag);
case Tabular::UNSET_LTHEAD:
flag = false;
+ // fall through
case Tabular::SET_LTHEAD:
tabular.getRowOfLTHead(row, ltt);
checkLongtableSpecial(ltt, value, flag);
case Tabular::UNSET_LTFOOT:
flag = false;
+ // fall through
case Tabular::SET_LTFOOT:
tabular.getRowOfLTFoot(row, ltt);
checkLongtableSpecial(ltt, value, flag);
case Tabular::UNSET_LTLASTFOOT:
flag = false;
+ // fall through
case Tabular::SET_LTLASTFOOT:
tabular.getRowOfLTLastFoot(row, ltt);
checkLongtableSpecial(ltt, value, flag);
case Tabular::UNSET_LTNEWPAGE:
flag = false;
+ // fall through
case Tabular::SET_LTNEWPAGE:
tabular.setLTNewPage(row, flag);
break;
inset->setChange(Change(buffer().params().track_changes ?
Change::INSERTED : Change::UNCHANGED));
cur.pos() = 0;
+ cur.pit() = 0;
}
}
return true;
projects / lyx.git / blobdiff