The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 99ada23d979d4ff1bc076541b3028fc8a0f2f1a6 Author: Pavel Sanda <[email protected]> Date: Thu May 31 14:02:40 2012 +0200 Backport f6921819. diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 090dca8..2a011e4 100644 --- a/src/frontends/qt4/GuiTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -555,6 +555,8 @@ docstring GuiTabular::dialogToParams() const // if (newpageCB->isChecked()) setParam(param_str, Tabular::SET_LTNEWPAGE); + else + setParam(param_str, Tabular::UNSET_LTNEWPAGE); // if (captionStatusCB->isChecked()) setParam(param_str, Tabular::SET_LTCAPTION); diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 3c97de5..1e91d5c 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -165,6 +165,7 @@ TabularFeature tabularFeature[] = { Tabular::SET_LTLASTFOOT, "set-ltlastfoot", true }, { Tabular::UNSET_LTLASTFOOT, "unset-ltlastfoot", true }, { Tabular::SET_LTNEWPAGE, "set-ltnewpage", false }, + { Tabular::UNSET_LTNEWPAGE, "unset-ltnewpage", false }, { Tabular::TOGGLE_LTCAPTION, "toggle-ltcaption", false }, { Tabular::SET_LTCAPTION, "set-ltcaption", false }, { Tabular::UNSET_LTCAPTION, "unset-ltcaption", false }, @@ -4641,6 +4642,9 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd, case Tabular::UNSET_LTHEAD: status.setOnOff(!tabular.getRowOfLTHead(sel_row_start, dummyltt)); break; + case Tabular::UNSET_LTNEWPAGE: + status.setOnOff(!tabular.getLTNewPage(sel_row_start)); + break; case Tabular::SET_LTFOOT: status.setEnabled(sel_row_start == sel_row_end @@ -5657,8 +5661,10 @@ void InsetTabular::tabularFeatures(Cursor & cur, tabular.setLTFoot(row, flag, ltt, true); break; + case Tabular::UNSET_LTNEWPAGE: + flag = false; case Tabular::SET_LTNEWPAGE: - tabular.setLTNewPage(row, !tabular.getLTNewPage(row)); + tabular.setLTNewPage(row, flag); break; case Tabular::SET_LTCAPTION: { diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index 3a3f63a..bc4542c 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -233,6 +233,7 @@ public: UNSET_LTLASTFOOT, /// SET_LTNEWPAGE, + UNSET_LTNEWPAGE, /// TOGGLE_LTCAPTION, /// diff --git a/status.20x b/status.20x index 9343bff..cb76a89 100644 --- a/status.20x +++ b/status.20x @@ -223,6 +223,8 @@ What's new - Fix cursor bug when using backspace after the spellchecker replaced a word. +- Fix "Page break on current row" in tabular dialog (bug 8180). + * DOCUMENTATION AND LOCALIZATION ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiTabular.cpp | 2 ++ src/insets/InsetTabular.cpp | 8 +++++++- src/insets/InsetTabular.h | 1 + status.20x | 2 ++ 4 files changed, 12 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
