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 cfab8e643a5121eb1e5b0c2c9327a67a5bdcb3bb..47e8080ced6cb9b122e04210d3f7641da26ccb5f 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,48 +1,81 @@
-/*   
-  simple-spacer.hh -- declare 
-  
+/*
+  simple-spacer.hh -- declare Simple_spacer
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 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 "real.hh"
-#include "array.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
-#include "list.hh"
-#include "drul-array.hh"
+#include "smobs.hh"
 
-struct Rod_info {
-  Real distance_f_;
-  Drul_array<int> cols_;
-};
+struct Spring_description
+{
+  Real ideal_;
+  Real inverse_hooke_;
+  Real block_force_;
 
-struct Spring_info {
-  /// the ideal distance
-  Real space_f_;
+  Real length (Real force) const;
+  Spring_description ();
 
-  /// Hooke's constant: how strong are the "springs" attached to columns
-  Real hooke_f_;
+  bool is_sane () const;
 
-  Real blocking_stretch_f_;
-  Rod_info * blocking_rod_l_;
-  void set (Idealspacing *);
-  Spring_info();
+  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 () const;
+  vector<Real> spring_positions () const;
 
-class Simple_spring_spacer {
-  Array<Spring_info> springs_;
-  Pointer_list<Rod_info*> rods_;
+  Real force ();
+  bool fits ();
 
-  void init ();
-  Array<Real> solve ();
-  
+  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 */