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

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 2f12339490..16c9494ed6 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,93 +1,70 @@
-/*   
+/*
   simple-spacer.hh -- declare Simple_spacer
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 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_f_;
-  Real hooke_f_;
-  bool active_b_;
-
-  Real block_force_f_;
+  Real ideal_;
+  Real inverse_hooke_;
+  bool is_active_;
+  Real block_force_;
 
   Real length (Real force) const;
   Spring_description ();
 
-  bool sane_b () const;
+  bool is_sane () const;
 };
 
-/**
-   A simple spacing constraint solver. The approach:
-
-   Stretch the line uniformly until none of the constraints (rods)
-   block.  It then is very wide.
-
-
-      Compress until the next constraint blocks,
-
-      Mark the springs over the constrained part to be non-active.
-      
-   Repeat with the smaller set of non-active constraints, until all
-   constraints blocked, or until the line is as short as desired.
-
-   This is much simpler, and much much faster than full scale
-   Constrained QP. On the other hand, a situation like this will not
-   be typeset as dense as possible, because
-
-   c4                   c4           c4                  c4
-   veryveryverylongsyllable2         veryveryverylongsyllable2
-   " "4                 veryveryverylongsyllable2        syllable4
-
-
-   can be further compressed to
-
-
-   c4    c4                        c4   c4
-   veryveryverylongsyllable2       veryveryverylongsyllable2
-   " "4  veryveryverylongsyllable2      syllable4
-
-
-   Perhaps this is not a bad thing, because the 1st looks better anyway.  */
-struct Simple_spacer
+class Simple_spacer
 {
-  Array<Spring_description> springs_;
-  Link_array<Item> spaced_cols_;
-  Link_array<Item> all_cols_; 
-
-  
-  Real force_f_;
-  Real indent_f_;
-  Real line_len_f_;
-  Real default_space_f_;
-
+public:
+  std::vector<Spring_description> springs_;
+  Real force_;
+  Real indent_;
+  Real line_len_;
+  Real default_space_;
+  int active_count_;
 
   Simple_spacer ();
 
-  void do_wide_springs (Column_x_positions*) const;
-  void solve (Column_x_positions *) const;
-  void add_columns (Link_array<Item>);
   void my_solve_linelen ();
   void my_solve_natural_len ();
   Real active_springs_stiffness () const;
   Real range_stiffness (int, int) const;
   void add_rod (int l, int r, Real dist);
-  Real range_ideal_len (int l, int r)const;
+  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 active_b () const;
+  bool is_active () 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 &);
 };
 
 #endif /* SIMPLE_SPACER_HH */