From: Valentin Villenave <valentin@villenave.net>
Date: Mon, 14 Jan 2008 00:31:54 +0000 (+0100)
Subject: Revert "third patch from Joe: avoid NaN with springs of zero length"
X-Git-Tag: release/2.11.38-1~85
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6cfb9a639928d8c25eed7e113b8e98ec4e616609;p=lilypond.git

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

This reverts commit 5319128636bbc8f11284249364fda530334c81ba.

Signed-off-by: Valentin Villenave <v.villenave@gmail.com>
---

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 4da2ac9a87..9129361cbd 100644
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -105,12 +105,7 @@ 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++)
-	  {
-	    if (spring_dist)
-	      springs_[i].set_distance (springs_[i].distance () * dist / spring_dist);
-	    else
-	      springs_[i].set_distance (dist / (r - l));
-	  }
+	  springs_[i].set_distance (springs_[i].distance () * dist / spring_dist);
 
       return;
     }