X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspring.hh;h=d6fda83d32f91c76f7b8fd4c6b34c9309d748334;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=11989b3ad03c6735fdf21e26afb4fb29a3f76578;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 11989b3ad0..d6fda83d32 100644
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -1,9 +1,20 @@
 /*
-  spring.hh -- declare Spring, Column_spring
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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/>.
 */
 
 #ifndef SPRING_HH
@@ -12,33 +23,47 @@
 #include "lily-proto.hh"
 #include "smobs.hh"
 
-struct Spring_smob
+class Spring
 {
-  Grob *other_;
   Real distance_;
-  bool expand_only_b_;
-  Real inverse_strength_;
+  Real min_distance_;
 
-  DECLARE_SIMPLE_SMOBS (Spring_smob);
-public:
-  Spring_smob ();
-};
-DECLARE_UNSMOB (Spring_smob, spring);
+  Real inverse_stretch_strength_;
+  Real inverse_compress_strength_;
 
-struct Spring
-{
-  Drul_array<Item *> item_drul_;
-  Real distance_;
-  bool expand_only_b_;
-
-  /*
-    TODO: make 2 strengths: one for stretching, and one for shrinking.
-  */
-  Real inverse_strength_;
-  void add_to_cols ();
-  void set_to_cols ();
+  Real blocking_force_;
+
+  void update_blocking_force ();
+
+  DECLARE_SIMPLE_SMOBS (Spring);
+public:
   Spring ();
+  Spring (Real distance, Real min_distance);
+
+  Real distance () const {return distance_;}
+  Real min_distance () const {return min_distance_;}
+  Real inverse_stretch_strength () const {return inverse_stretch_strength_;}
+  Real inverse_compress_strength () const {return inverse_compress_strength_;}
+  Real blocking_force () const {return blocking_force_;}
+
+  Real length (Real f) const;
+
+  void set_distance (Real);
+  void set_min_distance (Real);
+  void ensure_min_distance (Real);
+  void set_inverse_stretch_strength (Real);
+  void set_inverse_compress_strength (Real);
+  void set_blocking_force (Real);
+  void set_default_strength ();
+  void set_default_compress_strength ();
+  void set_default_stretch_strength ();
+
+  void operator *= (Real);
+  bool operator > (Spring const &) const;
 };
+DECLARE_UNSMOB (Spring, spring);
+
+Spring merge_springs (vector<Spring> const &springs);
 
 #endif /* SPRING_HH */