anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

take care of overlooked contingency

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23945 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2008-03-25 11:40:16 +00:00
parent fb25ff1819
commit 5e6343c9d1
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/insets/InsetTabular.cpp
View File

@ -1863,9 +1863,10 @@ int Tabular::TeXCellPreamble(odocstream & os, idx_type cell) const
Tabular::VAlignment valign = getVAlignment(cell, !isMultiColumn(cell)); Tabular::VAlignment valign = getVAlignment(cell, !isMultiColumn(cell));
LyXAlignment align = getAlignment(cell, !isMultiColumn(cell)); LyXAlignment align = getAlignment(cell, !isMultiColumn(cell));
col_type c = cellColumn(cell); col_type c = cellColumn(cell);
if (isMultiColumn(cell) bool needmulticol = (leftLine(cell) && !columnLeftLine(c))
|| (leftLine(cell) && !columnLeftLine(c)) || (rightLine(cell) && !columnRightLine(c))
|| (rightLine(cell) && !columnRightLine(c))) { || (!rightLine(cell) && c < columnCount() -1 && columnLeftLine(c + 1));
if (isMultiColumn(cell) || needmulticol) {
os << "\\multicolumn{" << columnSpan(cell) << "}{"; os << "\\multicolumn{" << columnSpan(cell) << "}{";
if (leftLine(cell)) if (leftLine(cell))
os << '|'; os << '|';
@ -1901,7 +1902,8 @@ int Tabular::TeXCellPreamble(odocstream & os, idx_type cell) const
} }
} // end if else !getPWidth } // end if else !getPWidth
} // end if else !cellinfo_of_cell } // end if else !cellinfo_of_cell
if (rightLine(cell)) if (rightLine(cell) || (!rightLine(cell)
&& c < columnCount() -1 && columnLeftLine(c + 1)))
os << '|'; os << '|';
os << "}{"; os << "}{";
} }
@ -1953,9 +1955,10 @@ int Tabular::TeXCellPostamble(odocstream & os, idx_type cell) const
ret += 2; ret += 2;
} }
col_type c = cellColumn(cell); col_type c = cellColumn(cell);
if (isMultiColumn(cell) bool needmulticol = (leftLine(cell) && !columnLeftLine(c))
|| (leftLine(cell) && !columnLeftLine(c)) || (rightLine(cell) && !columnRightLine(c))
|| (rightLine(cell) && !columnRightLine(c))) { || (!rightLine(cell) && c < columnCount() -1 && columnLeftLine(c + 1));
if (isMultiColumn(cell) || needmulticol) {
os << '}'; os << '}';
} }
if (getRotateCell(cell)) { if (getRotateCell(cell)) {