From f1cec322f1b063efc92b7d1543713a56e581ccd3 Mon Sep 17 00:00:00 2001 From: Edwin Leuven Date: Mon, 31 Mar 2008 12:09:24 +0000 Subject: [PATCH] fix bug http://bugzilla.lyx.org/show_bug.cgi?id=4688 nest sideways in multicolumn instead of other way around git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24071 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetTabular.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 5b07135ec2..e2c4bef099 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -1867,10 +1867,6 @@ int Tabular::TeXCellPreamble(odocstream & os, idx_type cell, bool & ismulticol) { int ret = 0; - if (getRotateCell(cell)) { - os << "\\begin{sideways}\n"; - ++ret; - } Tabular::VAlignment valign = getVAlignment(cell, !isMultiColumn(cell)); LyXAlignment align = getAlignment(cell, !isMultiColumn(cell)); // figure out how to set the lines @@ -1933,6 +1929,10 @@ int Tabular::TeXCellPreamble(odocstream & os, idx_type cell, bool & ismulticol) os << '|'; os << "}{"; } + if (getRotateCell(cell)) { + os << "\\begin{sideways}\n"; + ++ret; + } if (getUsebox(cell) == BOX_PARBOX) { os << "\\parbox["; switch (valign) { @@ -1980,13 +1980,13 @@ int Tabular::TeXCellPostamble(odocstream & os, idx_type cell, bool ismulticol) c os << "%\n\\end{minipage}"; ret += 2; } - if (ismulticol) { - os << '}'; - } if (getRotateCell(cell)) { os << "%\n\\end{sideways}"; ++ret; } + if (ismulticol) { + os << '}'; + } return ret; } -- 2.39.2