]> git.donarmstrong.com Git - lilypond.git/commitdiff
Avoid NaN with springs of zero length.
authorJoe Neeman <joeneeman@gmail.com>
Tue, 18 Dec 2007 01:15:56 +0000 (12:15 +1100)
committerJoe Neeman <joeneeman@gmail.com>
Wed, 23 Jan 2008 08:37:02 +0000 (09:37 +0100)
lily/simple-spacer.cc

index 9129361cbd86702f3524bedec164a49aac27eee9..4da2ac9a87d3439893e93f57dc951b82dc4d6458 100644 (file)
@@ -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;
     }