X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-spacer.cc;h=fb928d393a25df84f57a72497aba85c2b6bbdacf;hb=35f48f6592df5dabe2b2c4633953eb1547fc6607;hp=b83f13aebf6afc8b02be252a4e5a0d12effd9fd8;hpb=7ba6b0e42d76063d7657325cea92d76d7701fb94;p=lilypond.git

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index b83f13aebf..fb928d393a 100644
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -333,15 +333,10 @@ Simple_spacer::solve (Column_x_positions *positions, bool ragged) const
   positions->config_.push (indent_f_);
   for (int i=0; i <springs_.size (); i++)
     {
-      if (ragged)
-        {
-	  // ragged right operation: do not apply any force
-	  positions->config_.push (positions->config_.top () + springs_[i].length (0.0));
-	}
-      else
-        {
-	  positions->config_.push (positions->config_.top () + springs_[i].length (force_f_));
-	}
+      Real  l = springs_[i].length ((ragged) ? 0.0 : force_f_);
+      positions->config_.push (positions->config_.top () + l);
+
+      assert (l >= 0);
     }
   positions->cols_ = spaced_cols_;
   positions->loose_cols_ = loose_cols_;