anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 06:19:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix cmidline trimming with multicolumns

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-04-03 16:35:08 +02:00
parent 6def81f30f
commit bf5d5e5d66
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/insets/InsetTabular.cpp
View File

@ -2403,6 +2403,11 @@ void Tabular::TeXTopHLine(otexstream & os, row_type row, string const & lang,
topltrims[c] = false;
toprtrims[c] = false;
}
// copy trimming to multicolumn parts
if (isPartOfMultiColumn(row, c)) {
topltrims[c] = topltrims[c-1];
toprtrims[c] = toprtrims[c-1];
}
if (topline.find(c) != topline.end() && topline.find(c)->second)
++nset;
if ((topltrims.find(c) != topltrims.end() && topltrims.find(c)->second)
@ -2426,6 +2431,11 @@ void Tabular::TeXTopHLine(otexstream & os, row_type row, string const & lang,
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)
++offset;
while (isPartOfMultiColumn(row, c))
++c;
string trim;
if (topltrims.find(c) != topltrims.end()
&& topltrims.find(c)->second)
@ -2433,9 +2443,13 @@ void Tabular::TeXTopHLine(otexstream & os, row_type row, string const & lang,
string const firstcol = convert<string>(c + 1 + offset);
col_type cstart = c;
for ( ; c < ncols() - 1 && topline.find(c)->second ; ++c) {
if (isMultiColumn(cellIndex(row, c))
&& c < ncols() - 1 && isPartOfMultiColumn(row, c + 1))
continue;
if (c > cstart && topltrims.find(c) != topltrims.end()
&& topltrims.find(c)->second) {
--c;
if (!isPartOfMultiColumn(row, c))
--c;
break;
} else if (toprtrims.find(c) != toprtrims.end()
&& toprtrims.find(c)->second)
@ -2504,6 +2518,14 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const & lang,
topltrims[c] = false;
toprtrims[c] = false;
}
// copy trimming in multicolumn parts
if (isPartOfMultiColumn(row, c)) {
topltrims[c] = topltrims[c-1];
toprtrims[c] = toprtrims[c-1];
bottomltrims[c] = bottomltrims[c-1];
bottomrtrims[c] = bottomrtrims[c-1];
}
nextrowset &= topline.find(c) != topline.end() && topline.find(c)->second;
}
@ -2541,7 +2563,8 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const & lang,
for (col_type j = 0 ; j < c; ++j)
if (column_info[j].alignment == LYX_ALIGN_DECIMAL)
++offset;
while (isPartOfMultiColumn(row, c))
++c;
string trim;
if (bottomltrims.find(c) != bottomltrims.end()
&& bottomltrims.find(c)->second)
@ -2549,9 +2572,14 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, string const & lang,
string const firstcol = convert<string>(c + 1 + offset);
col_type cstart = c;
for ( ; c < ncols() - 1 && bottomline.find(c)->second ; ++c) {
if (isMultiColumn(cellIndex(row, c))
&& c < ncols() - 1
&& isPartOfMultiColumn(row, c + 1))
continue;
if (c > cstart && bottomltrims.find(c) != bottomltrims.end()
&& bottomltrims.find(c)->second) {
--c;
&& bottomltrims.find(c)->second) {
if (!isPartOfMultiColumn(row, c))
--c;
break;
} else if (bottomrtrims.find(c) != bottomrtrims.end()
&& bottomrtrims.find(c)->second)