X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=71b1045acad3258367239265ab21403fe939fd22;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=1f6fc479c09714833435adfe94c2441a16f2ec8b;hpb=6ae532ffb4350961d3901a42b67d1db620f925a5;p=lilypond.git

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 1f6fc479c0..71b1045aca 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,48 +1,72 @@
-/*   
-  simple-spacer.hh -- declare 
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  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
+  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
 #define SIMPLE_SPACER_HH
 
-#include "real.hh"
-#include "array.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
-#include "list.hh"
-#include "drul-array.hh"
+#include "spring.hh"
+#include "smobs.hh"
 
-struct Rod_info {
-  Real distance_f_;
-  Drul_array<int> cols_;
-};
+class Simple_spacer
+{
+public:
+  Simple_spacer ();
 
-struct Spring_info {
-  /// the ideal distance
-  Real space_f_;
+  void solve (Real line_len, bool ragged);
+  void add_rod (int l, int r, Real dist);
+  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;
 
-  /// Hooke's constant: how strong are the "springs" attached to columns
-  Real hooke_f_;
-
-  Real blocking_stretch_f_;
-  Rod_info * blocking_rod_l_;
-  void set (Idealspacing *);
-  Spring_info();
-};
+  void set_force (Real force);
+  Real force () const;
+  Real force_penalty (bool ragged) const;
+  bool fits () const;
 
+  DECLARE_SIMPLE_SMOBS (Simple_spacer);
 
-class Simple_spring_spacer {
-  Array<Spring_info> springs_;
-  Pointer_list<Rod_info*> rods_;
+private:
+  Real expand_line ();
+  Real compress_line ();
+  Real rod_force (int l, int r, Real dist);
 
-  void init ();
-  Array<Real> solve ();
-  
+  vector<Spring> springs_;
+  Real line_len_;
+  Real force_;
+  bool ragged_;
+  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,
+                                           bool ragged);
+
 #endif /* SIMPLE_SPACER_HH */