Change the behavior of nested StaffGroupers.

[lilypond.git] / lily / simple-spacer.cc

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 9129361cbd86702f3524bedec164a49aac27eee9..14c7cbeebd113007989867aa65355a4b4c15320f 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -1,12 +1,23 @@
 /*
-  simple-spacer.cc -- implement Simple_spacer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   TODO:
   - add support for different stretch/shrink constants?
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <cstdio>
@@ -105,7 +116,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;
     }
@@ -211,7 +227,9 @@ Simple_spacer::compress_line ()
     {
       Spring sp = sorted_springs[i];
 
-      assert (sp.blocking_force () <= cur_force);
+      if (sp.blocking_force () > cur_force)
+       continue;
+
       if (isinf (sp.blocking_force ()))
        break;
 
@@ -229,7 +247,7 @@ Simple_spacer::compress_line ()
        }
       
       cur_len -= block_dist;
-      inv_hooke -= sp.inverse_compress_strength ();
+      inv_hooke -= compressed ? sp.inverse_compress_strength () : sp.inverse_stretch_strength ();
       cur_force = sp.blocking_force ();
     }