diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 0e1c8499c8..f9a78e1d6b 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -4009,6 +4009,8 @@ void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y, int const w = tabular.cellWidth(cell); int const h = tabular.cellHeight(cell); + col_type const col = tabular.cellColumn(cell); + // Top bool drawline = tabular.topLine(cell) || (row > 0 && tabular.bottomLine(tabular.cellAbove(cell))); @@ -4017,12 +4019,18 @@ void InsetTabular::drawCellLines(PainterInfo & pi, int x, int y, // Bottom drawline = tabular.bottomLine(cell); - heavy = tabular.use_booktabs && row == tabular.nrows() - 1 - && tabular.rowBottomLine(row); + 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))); tabline(pi, x, y, x, y + h, drawline); diff --git a/status.23x b/status.23x index bfd25c1036..edfeea5175 100644 --- a/status.23x +++ b/status.23x @@ -176,6 +176,8 @@ What's new - Place the indentation bars correctly in full-screen mode (bug 11286). +- Fix display of formal table bottom line with multirows (bug 11445). + * INTERNALS