From: Valentin Villenave <valentin@villenave.net>
Date: Sun, 13 Jan 2008 18:00:04 +0000 (+0100)
Subject: third patch from Joe: avoid NaN with springs of zero length
X-Git-Tag: release/2.11.38-1~91
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cc511e8f926ae0f45f742b392577b38dda032db4;p=lilypond.git

third patch from Joe: avoid NaN with springs of zero length
---

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 9129361cbd..4da2ac9a87 100644
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -105,7 +105,12 @@ Simple_spacer::add_rod (int l, int r, Real dist)
       Real spring_dist = range_ideal_len (l, r);
       if (spring_dist < dist)
 	for (int i = l; i < r; i++)
-	  springs_[i].set_distance (springs_[i].distance () * dist / spring_dist);
+	  {
+	    if (spring_dist)
+	      springs_[i].set_distance (springs_[i].distance () * dist / spring_dist);
+	    else
+	      springs_[i].set_distance (dist / (r - l));
+	  }
 
       return;
     }