X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=d036dd191d3b3e5f8ff124a6cda6c2063bd7d34d;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=758cd65b32c26a4809325f2dc7ed8a0a3f2f392b;hpb=d9f0a129bd864743b639c499366bbccf79d27323;p=lilypond.git

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 758cd65b32..d036dd191d 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,9 +1,20 @@
 /*
-  simple-spacer.hh -- declare Simple_spacer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2006 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 SIMPLE_SPACER_HH
@@ -11,54 +22,34 @@
 
 #include "std-vector.hh"
 #include "lily-proto.hh"
+#include "spring.hh"
 #include "smobs.hh"
 
-struct Spring_description
-{
-  Real ideal_;
-  Real inverse_hooke_;
-  Real block_force_;
-
-  Real length (Real force) const;
-  Spring_description ();
-
-  bool is_sane () const;
-
-  bool operator> (const Spring_description &s) const
-  {
-    return block_force_ > s.block_force_;
-  }
-
-  bool operator< (const Spring_description &s) const
-  {
-    return block_force_ < s.block_force_;
-  }
-};
-
-class Simple_spacer
+class Simple_spacer : public Simple_smob<Simple_spacer>
 {
 public:
   Simple_spacer ();
 
   void solve (Real line_len, bool ragged);
   void add_rod (int l, int r, Real dist);
-  void add_spring (Real, Real);
+  void add_spring (Spring const &);
   Real range_ideal_len (int l, int r) const;
-  Real range_stiffness (int l, int r) const;
+  Real range_stiffness (int l, int r, bool stretch) const;
   Real configuration_length (Real) const;
   vector<Real> spring_positions () const;
 
+  void set_force (Real force);
   Real force () const;
+  Real force_penalty (bool ragged) const;
   bool fits () const;
 
-  DECLARE_SIMPLE_SMOBS (Simple_spacer,);
 
 private:
   Real expand_line ();
   Real compress_line ();
   Real rod_force (int l, int r, Real dist);
 
-  vector<Spring_description> springs_;
+  vector<Spring> springs_;
   Real line_len_;
   Real force_;
   bool ragged_;
@@ -66,15 +57,14 @@ private:
 };
 
 /* returns a vector of dimensions breaks.size () * breaks.size () */
-vector<Real> get_line_forces (vector<Grob*> const &columns,
-			      Real line_len,
-			      Real indent,
-			      bool ragged);
+vector<Real> get_line_forces (vector<Grob *> const &columns,
+                              Real line_len,
+                              Real indent,
+                              bool ragged);
 
-Column_x_positions get_line_configuration (vector<Grob*> const &columns,
-					   Real line_len,
-					   Real indent,
-					   bool ragged);
+Column_x_positions get_line_configuration (vector<Grob *> const &columns,
+                                           Real line_len,
+                                           Real indent,
+                                           bool ragged);
 
 #endif /* SIMPLE_SPACER_HH */
-