X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=ae3206ac5f70c0c75ae452e27542872e7eb90136;hb=c89f780d0c5c221e766ee6e818dcd85307fffaae;hp=8115e25587d81df6221b0d83babe6b5187602397;hpb=20091095d3ac112fa0d0c55c8e2b8092584be4b2;p=lilypond.git

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 8115e25587..ae3206ac5f 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,91 +1,81 @@
-/*   
+/*
   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--2007 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_;
+  Real block_force_;
 
   Real length (Real force) const;
   Spring_description ();
 
-  bool sane_b () 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
+  bool is_sane () const;
 
-   c4                   c4           c4                  c4
-   veryveryverylongsyllable2         veryveryverylongsyllable2
-   " "4                 veryveryverylongsyllable2        syllable4
-
-
-   can be further compressed to
-
-
-   c4    c4                        c4   c4
-   veryveryverylongsyllable2       veryveryverylongsyllable2
-   " "4  veryveryverylongsyllable2      syllable4
+  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_;
+  }
+};
 
-   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<Grob> spaced_cols_;
-  Link_array<Grob> loose_cols_;
-  Real force_f_;
-  Real indent_f_;
-  Real line_len_f_;
-  Real default_space_f_;
-
-
+public:
   Simple_spacer ();
-  
-  void solve (Column_x_positions *) const;
-  void add_columns (Link_array<Grob>);
-  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 (Real) const;
+  vector<Real> spring_positions () const;
+
+  Real force () const;
+  Real force_penalty (bool ragged) const;
+  bool fits () const;
+
+  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,
+			      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 */