anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-09 10:47:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* InsetTabular.cpp: fix logic of multirow top/bottom line output (bug #7578)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39733 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-09-23 12:36:37 +00:00
parent 90635e8caf
commit a5e152fdf7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/insets/InsetTabular.cpp
View File

@ -2057,8 +2057,8 @@ void Tabular::TeXTopHLine(otexstream & os, row_type row, string const lang) cons
// multirow, no line must be drawn. // multirow, no line must be drawn.
if (row != 0) if (row != 0)
if (isMultiRow(cellIndex(row, c)) if (isMultiRow(cellIndex(row, c))
&& isMultiRow(cellIndex(row - 1, c))) && cell_info[row][c].multirow != CELL_BEGIN_OF_MULTIROW)
topline[c] = false; topline[c] = false;
if (topline[c]) if (topline[c])
++nset; ++nset;
} }
@ -2117,13 +2117,14 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const lang) c
for (col_type c = 0; c < ncols(); ++c) { for (col_type c = 0; c < ncols(); ++c) {
bottomline.push_back(bottomLine(cellIndex(row, c))); bottomline.push_back(bottomLine(cellIndex(row, c)));
topline.push_back(!lastrow && topLine(cellIndex(row + 1, c))); topline.push_back(!lastrow && topLine(cellIndex(row + 1, c)));
// If cell is part of a multirow and not the last or first cell of the // If cell is part of a multirow and not the last cell of the
// multirow, no line must be drawn. // multirow, no line must be drawn.
if (!lastrow) if (!lastrow)
if (isMultiRow(cellIndex(row, c)) if (isMultiRow(cellIndex(row, c))
&& isMultiRow(cellIndex(row + 1, c))) { && isMultiRow(cellIndex(row + 1, c))
bottomline[c] = false; && cell_info[row + 1][c].multirow != CELL_BEGIN_OF_MULTIROW) {
topline[c] = false; bottomline[c] = false;
topline[c] = false;
} }
nextrowset &= topline[c]; nextrowset &= topline[c];
} }