Don't let lyrics interfere with StaffGrouper.

[lilypond.git] / lily / spring.cc

diff --git a/lily/spring.cc b/lily/spring.cc
index f57695bfd732ec50f821465a570a088547eaf9d8..761ef2467bf0773c770b70a6410b7a2541de2ca1 100644 (file)
--- a/lily/spring.cc
+++ b/lily/spring.cc
@@ -1,9 +1,20 @@
 /*
-  spring.cc -- declare Spring
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2007--2010 Joe Neeman <joeneeman@gmail.com>
 
-  (c) 2007--2009 Joe Neeman <joeneeman@gmail.com>
+  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 "spring.hh"
@@ -22,6 +33,8 @@ Spring::Spring (Real dist, Real min_dist)
 {
   distance_ = 1.0;
   min_distance_ = 1.0;
+  inverse_stretch_strength_ = 1.0;
+  inverse_compress_strength_ = 1.0;
 
   set_distance (dist);
   set_min_distance (min_dist);
@@ -161,12 +174,24 @@ Spring::set_blocking_force (Real f)
 
 void
 Spring::set_default_strength ()
+{
+  set_default_stretch_strength ();
+  set_default_compress_strength ();
+}
+
+void
+Spring::set_default_compress_strength ()
 {
   inverse_compress_strength_ = (distance_ >= min_distance_) ? distance_ - min_distance_ : 0;
-  inverse_stretch_strength_ = distance_;
   update_blocking_force ();
 }
 
+void
+Spring::set_default_stretch_strength ()
+{
+  inverse_stretch_strength_ = distance_;
+}
+
 Real
 Spring::length (Real f) const
 {