X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=ae3206ac5f70c0c75ae452e27542872e7eb90136;hb=8c0213576d4f811c826a828c38fe418ab50b66ce;hp=c122c64e2cc11445bc277a9c40f75c4caca5be23;hpb=76014fe170f4217374f4726d54c2a46c60f73e67;p=lilypond.git

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index c122c64e2c..ae3206ac5f 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,18 +1,81 @@
-/*   
+/*
   simple-spacer.hh -- declare Simple_spacer
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SIMPLE_SPACER_HH
 #define SIMPLE_SPACER_HH
 
-class Simple_spacer {
+#include "std-vector.hh"
+#include "lily-proto.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
+{
+public:
+  Simple_spacer ();
+
+  void solve (Real line_len, bool ragged);
+  void add_rod (int l, int r, Real dist);
+  void add_spring (Real, Real);
+  Real range_ideal_len (int l, int r) const;
+  Real range_stiffness (int l, int r) const;
+  Real configuration_length (Real) const;
+  vector<Real> spring_positions () const;
+
+  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_;
+  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 */