X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=935cb94c6c260e72872b9261d34282f6432984ef;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=755bdb7008de2879c695f753f3f7fe495694951f;hpb=3b9d63b1f11e1c8cfb738d7aaf385282576f0043;p=lilypond.git

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 755bdb7008..935cb94c6c 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,74 +1,60 @@
-/*   
+/*
   simple-spacer.hh -- declare Simple_spacer
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SIMPLE_SPACER_HH
 #define SIMPLE_SPACER_HH
 
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
+#include "spring.hh"
 #include "smobs.hh"
 
-struct Spring_description
-{
-  Real ideal_;
-  Real hooke_;
-  bool is_active_;
-  Real block_force_;
-
-  Real length (Real force) const;
-  Spring_description ();
-
-  bool is_sane () const;
-};
-
 class Simple_spacer
 {
 public:
-  Array<Spring_description> springs_;
-  Real force_;
-  Real indent_;
-  Real line_len_;
-  Real default_space_;
-  int active_count_;
-
   Simple_spacer ();
-  
-  
-  void my_solve_linelen ();
-  void my_solve_natural_len ();
-  Real active_springs_stiffness () const;
-  Real range_stiffness (int, int) const;
+
+  void solve (Real line_len, bool ragged);
   void add_rod (int l, int r, Real dist);
-  void add_spring (Real, Real);
+  void add_spring (Spring const&);
   Real range_ideal_len (int l, int r) const;
-  Real active_blocking_force ()const;
-  Real configuration_length ()const;
-  void set_active_states ();
-  bool is_active () const;
+  Real range_stiffness (int l, int r, bool stretch) const;
+  Real configuration_length (Real) const;
+  vector<Real> spring_positions () const;
 
-  DECLARE_SIMPLE_SMOBS(Simple_spacer, );
-};
+  Real force () const;
+  Real force_penalty (bool ragged) const;
+  bool fits () const;
 
+  DECLARE_SIMPLE_SMOBS (Simple_spacer);
 
-struct Simple_spacer_wrapper
-{
-  Simple_spacer *spacer_;
-  Link_array<Grob> spaced_cols_;
-  Link_array<Grob> loose_cols_;
-
-  Simple_spacer_wrapper ();
-  void add_columns (Link_array<Grob> const &);
-  void solve (Column_x_positions *, bool);
-  ~Simple_spacer_wrapper();
 private:
-  Simple_spacer_wrapper(Simple_spacer_wrapper const&);
+  Real expand_line ();
+  Real compress_line ();
+  Real rod_force (int l, int r, Real dist);
+
+  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 */