Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

[lilypond.git] / lily / simple-spacer.cc

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index bb4104678a0aae8d0da4c868f30da383157bce94..115c2a73376acb5cc5894173259c77e97405d407 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -407,8 +407,10 @@ get_column_description (vector<Grob*> const &cols, vsize col_index, bool line_st
            description.end_rods_.push_back (Rod_description (j, scm_to_double (scm_cdar (s))));
        }
     }
+  
   if (!line_starter && to_boolean (col->get_property ("keep-inside-line")))
     description.keep_inside_line_ = col->extent (col, X_AXIS);
+
   description.break_permission_ = col->get_property ("line-break-permission");
   return description;
 }
@@ -479,8 +481,6 @@ get_line_forces (vector<Grob*> const &columns,
          Real f = spacer.force ();
          force[b * breaks.size () + c] = f - (f < 0 ? f*f*f*f*4 : 0);
 
-         if (end < cols.size () && cols[end].break_permission_ == force_break)
-           break;
          if (!spacer.fits ())
            {
              if (c == b + 1)
@@ -489,6 +489,8 @@ get_line_forces (vector<Grob*> const &columns,
                force[b * breaks.size () + c] = infinity_f;
              break;
            }
+         if (end < cols.size () && cols[end].break_permission_ == force_break)
+           break;
        }
     }
   return force;