Run grand-replace (issue 3765)

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

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index b5aeeb200d9e28f02a17eafa2d43dbcede37779c..71b1045acad3258367239265ab21403fe939fd22 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2014 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
@@ -30,8 +30,6 @@ class Simple_spacer
 public:
   Simple_spacer ();
 
-  bool minimal_;
-
   void solve (Real line_len, bool ragged);
   void add_rod (int l, int r, Real dist);
   void add_spring (Spring const &);
@@ -40,15 +38,14 @@ public:
   Real configuration_length (Real) const;
   vector<Real> spring_positions () const;
 
+  void set_force (Real force);
   Real force () const;
-  Real line_len () 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);
@@ -60,6 +57,12 @@ private:
   bool fits_;
 };
 
+/* 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);
+
 Column_x_positions get_line_configuration (vector<Grob *> const &columns,
                                            Real line_len,
                                            Real indent,