X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=ca709a6133e0e54f19ab62cd8f7ab837f4bae257;hb=cb0b407e567feca71cbc5f9479a06b266c69a26c;hp=90784e4c743cff3b5692f95a36101698f977af36;hpb=9589d04a2647157e73c188f55cd4094b7e6dcc26;p=lilypond.git

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 90784e4c74..ca709a6133 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--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 SIMPLE_SPACER_HH
@@ -14,31 +25,31 @@
 #include "spring.hh"
 #include "smobs.hh"
 
-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 (Spring const&);
+  void add_spring (Spring const &);
   Real range_ideal_len (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;
+  std::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> springs_;
+  std::vector<Spring> springs_;
   Real line_len_;
   Real force_;
   bool ragged_;
@@ -46,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);
+std::vector<Real> get_line_forces (std::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 (std::vector<Grob *> const &columns,
+                                           Real line_len,
+                                           Real indent,
+                                           bool ragged);
 
 #endif /* SIMPLE_SPACER_HH */
-