Run grand replace for 2015.

[lilypond.git] / lily / include / simple-spacer.hh

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 648b9e3f64eda9324900a1915eb7eb9eb2f80594..d036dd191d3b3e5f8ff124a6cda6c2063bd7d34d 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 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
@@ -25,24 +25,24 @@
 #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;
 
+  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 ();
@@ -57,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 */
-