(LY_DEFINE): for ragged, we can end with

all springs tight, and still satisfy the constraints.

diff --git a/ChangeLog b/ChangeLog
index 5dbb46b742c23b3f5ea3367b8aae7a24013b0f96..f57954dcd321e469259ba395cbc791bbde6794a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/simple-spacer.cc (LY_DEFINE): for ragged, we can end with
+       all springs tight, and still satisfy the constraints.
+
 2004-10-25  Werner Lemberg  <wl@gnu.org>
 
        * scripts/lilypond-book.py: s/option-sep/option_sep/.

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 3026e488955c71ab4b1e5e2825516290dc923e62..eb20f0b1dadcb271b21ff1653a64b87027d25691 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -308,7 +308,7 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
     
   SCM force_return = SCM_BOOL_F;
   if (!isinf (spacer.force_)
-      && spacer.is_active ())
+      && (spacer.is_active () || is_ragged))
     {
       force_return = scm_from_double (spacer.force_);
     }