anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid making tabular too large when using a caption in longtable mode

Browse Source 
This is a fixup to commit cdb9f043, which fixed bug #9757.

It is necessary to make a special case for inserting an InsetCaption
in a tabular cell, because this commonly happens in longtable mode.

Fixes bug #9945.
This commit is contained in:
Jean-Marc Lasgouttes 2016-01-28 14:27:05 +01:00
parent 78ce4edbd2
commit 8d091cfe78
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/TextMetrics.cpp
View File

@ -447,11 +447,17 @@ bool TextMetrics::redoParagraph(pit_type const pit)
breakRow(row, right_margin, pit);
setRowHeight(row, pit);
row.setChanged(false);
if (row_index || row.right_boundary() || row.endpos() < par.size())
// If there is more than one row or the row has been
// broken by a display inset or a newline, expand the text
// to the full allowable width. This setting here is
// needed for the computeRowMetrics() below.
if (row_index || row.endpos() < par.size()
|| (row.right_boundary() && par.inInset().lyxCode() != CELL_CODE))
/* If there is more than one row or the row has been
* broken by a display inset or a newline, expand the text
* to the full allowable width. This setting here is
* needed for the computeRowMetrics() below. In the case
* of a display inset, we do nothing when inside a table
* cell, because the tabular code is not prepared for
* that, and it triggers when using a caption in a
* longtable (see bugs #9945 and #9757).
*/
dim_.wid = max_width_;
int const max_row_width = max(dim_.wid, row.width());
computeRowMetrics(pit, row, max_row_width);