Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index c050f2f8ff64f12b36f0629a109c092c7d14af88..47e8080ced6cb9b122e04210d3f7641da26ccb5f 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,60 +1,81 @@
-/*   
+/*
   simple-spacer.hh -- declare Simple_spacer
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 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 "smobs.hh"
 
 struct Spring_description
 {
   Real ideal_;
-  Real hooke_;
-  bool active_b_;
-
+  Real inverse_hooke_;
   Real block_force_;
 
   Real length (Real force) const;
   Spring_description ();
 
-  bool sane_b () const;
+  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_;
+  }
 };
 
-struct Simple_spacer
+class Simple_spacer
 {
-  Array<Spring_description> springs_;
-  Link_array<Grob> spaced_cols_;
-  Link_array<Grob> loose_cols_;
-  Real force_;
-  Real indent_;
-  Real line_len_;
-  Real default_space_;
-  int active_count_;
-  bool compression_penalty_b_;
-  
+public:
   Simple_spacer ();
-  
-  void solve (Column_x_positions *, bool);
-  void add_columns (Link_array<Grob>const &);
-  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);
-  Real range_ideal_len (int l, int r)const;
-  Real active_blocking_force ()const;
-  Real configuration_length ()const;
-  void set_active_states ();
-  bool active_b () const;
+  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 () const;
+  vector<Real> spring_positions () const;
+
+  Real force ();
+  bool fits ();
+
+  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,
+                             vector<vsize> breaks,
+                             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 */