X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=ae3206ac5f70c0c75ae452e27542872e7eb90136;hb=98c36749623f8f21fbd5804c8b33097f718ada5d;hp=16c9494ed6ff78229e2ddbbc24258906ad8e45f2;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 16c9494ed6..ae3206ac5f 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SIMPLE_SPACER_HH
@@ -17,55 +17,65 @@ struct Spring_description
 {
   Real ideal_;
   Real inverse_hooke_;
-  bool is_active_;
   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:
-  std::vector<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);
   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) 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_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 */