As reported in
http://www.lyx.org/trac/ticket/10270
LyX forbids incorrectly the float placement options.

The attached patch fixed this.

I don't think that a fileformat change is necessary but I could of course do this.

regards Uwe
 src/frontends/qt4/FloatPlacement.cpp | 12 ++++++------
 src/insets/InsetFloat.cpp            |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/frontends/qt4/FloatPlacement.cpp 
b/src/frontends/qt4/FloatPlacement.cpp
index b446c7c057..3ce414ed44 100644
--- a/src/frontends/qt4/FloatPlacement.cpp
+++ b/src/frontends/qt4/FloatPlacement.cpp
@@ -245,17 +245,17 @@ void FloatPlacement::checkAllowed() const
                bool const span = spanCB->isChecked();
                bool const sideways = sidewaysCB->isChecked();
                defaultsCB->setEnabled(!sideways);
-               topCB->setEnabled(!sideways && !defaults && !heredefinitely
+               topCB->setEnabled(!defaults && !heredefinitely
                                  && contains(allowed_placement_, 't'));
-               bottomCB->setEnabled(!sideways && !defaults && !span && 
!heredefinitely
+               bottomCB->setEnabled(!defaults && !span && !heredefinitely
                                     && contains(allowed_placement_, 'b'));
-               pageCB->setEnabled(!sideways && !defaults && !heredefinitely
+               pageCB->setEnabled(!defaults && !heredefinitely
                                   && contains(allowed_placement_, 'p'));
-               herepossiblyCB->setEnabled(!sideways && !defaults && !span && 
!heredefinitely
+               herepossiblyCB->setEnabled(!defaults && !span && !heredefinitely
                                           && contains(allowed_placement_, 
'h'));
-               heredefinitelyCB->setEnabled(!sideways && !defaults && !span
+               heredefinitelyCB->setEnabled(!defaults && !span
                                             && contains(allowed_placement_, 
'H'));
-               ignoreCB->setEnabled(!sideways && !defaults && ignore && 
!heredefinitely
+               ignoreCB->setEnabled(!defaults && ignore && !heredefinitely
                                     && contains(allowed_placement_, '!'));
                spanCB->setEnabled(allows_wide_ && (!sideways || 
standardfloat_));
                sidewaysCB->setEnabled(allows_sideways_);
diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 7a95178227..c3feb0e5ba 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -390,7 +390,7 @@ void InsetFloat::latex(otexstream & os, OutputParams const 
& runparams_in) const
                os.texrow().start(runparams.lastid, runparams.lastpos);
        // We only output placement if different from the def_placement.
        // sidewaysfloats always use their own page
-       if (!placement.empty() && !params_.sideways)
+       if (!placement.empty())
                os << '[' << from_ascii(placement) << ']';
        os << '\n';
 

Reply via email to