anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Need cellvarwidth also in left-aligned cells if they use newlines (#12587)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2022-10-11 16:01:29 +02:00
parent 2c72884f26
commit ac3562dbc9
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/insets/InsetTabular.cpp
View File

@ -3007,7 +3007,7 @@ void Tabular::TeXCellPreamble(otexstream & os, idx_type cell,
<< "}\n";
} else if (getUsebox(cell) == BOX_VARWIDTH
&& (getRotateCell(cell) != 0 || align != LYX_ALIGN_LEFT
|| valign != LYX_VALIGN_TOP)) {
|| valign != LYX_VALIGN_TOP || hasNewlines(cell))) {
os << "\\begin{cellvarwidth}[";
switch (valign) {
case LYX_VALIGN_TOP:
@ -3056,7 +3056,7 @@ void Tabular::TeXCellPostamble(otexstream & os, idx_type cell,
os << breakln << "\\end{minipage}";
else if (getUsebox(cell) == BOX_VARWIDTH
&& (getRotateCell(cell) != 0 || getAlignment(cell) != LYX_ALIGN_LEFT
|| getVAlignment(cell) != LYX_VALIGN_TOP))
|| getVAlignment(cell) != LYX_VALIGN_TOP || hasNewlines(cell)))
os << breakln << "\\end{cellvarwidth}";
if (getRotateCell(cell) != 0)
os << breakln << "\\end{turn}";
@ -4272,6 +4272,21 @@ Tabular::BoxType Tabular::useBox(idx_type cell) const
}
bool Tabular::hasNewlines(idx_type cell) const
{
ParagraphList const & parlist = cellInset(cell)->paragraphs();
ParagraphList::const_iterator cit = parlist.begin();
ParagraphList::const_iterator end = parlist.end();
for (; cit != end; ++cit)
for (int i = 0; i < cit->size(); ++i)
if (cit->isNewline(i))
return true;
return false;
}
/////////////////////////////////////////////////////////////////////
//
// InsetTableCell

2
src/insets/InsetTabular.h
View File

@ -919,6 +919,8 @@ public:
///
BoxType useBox(idx_type cell) const;
///
bool hasNewlines(idx_type cell) const;
///
bool isValidRow(row_type const row) const;
///
void TeXRow(otexstream &, row_type const row,