X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=d036dd191d3b3e5f8ff124a6cda6c2063bd7d34d;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=2f13a107d21d609f78fc463efa299774170b95f2;hpb=d8691dd2c4cf8e365c544e535a6c6d08aa231c8d;p=lilypond.git

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 2f13a107d2..d036dd191d 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,90 +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>
-  
- */
-
-#ifndef SIMPLE_SPACER_HH
-#define SIMPLE_SPACER_HH
-
-#include "parray.hh"
-#include "lily-proto.hh"
-
-
-struct Spring_description
-{
-  Real ideal_f_;
-  Real hooke_f_;
-  bool active_b_;
-
-  Real block_force_f_;
-
-  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.
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-      Compress until the next constraint blocks,
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-      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.
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-   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
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-   c4                   c4           c4                  c4
-   veryveryverylongsyllable2         veryveryverylongsyllable2
-   " "4                 veryveryverylongsyllable2        syllable4
-
-
-   can be further compressed to
-
-
-   c4    c4                        c4   c4
-   veryveryverylongsyllable2       veryveryverylongsyllable2
-   " "4  veryveryverylongsyllable2      syllable4
+#ifndef SIMPLE_SPACER_HH
+#define SIMPLE_SPACER_HH
 
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "spring.hh"
+#include "smobs.hh"
 
-   Perhaps this is not a bad thing, because the 1st looks better anyway.  */
-struct Simple_spacer
+class Simple_spacer : public Simple_smob<Simple_spacer>
 {
-  Array<Spring_description> springs_;
-
-  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 (Spring const &);
+  Real range_ideal_len (int l, int r) const;
+  Real range_stiffness (int l, int r, bool stretch) const;
+  Real configuration_length (Real) const;
+  vector<Real> spring_positions () const;
+
+  void set_force (Real force);
+  Real force () const;
+  Real force_penalty (bool ragged) const;
+  bool fits () const;
+
+
+private:
+  Real expand_line ();
+  Real compress_line ();
+  Real rod_force (int l, int r, Real dist);
+
+  vector<Spring> springs_;
+  Real line_len_;
+  Real force_;
+  bool ragged_;
+  bool fits_;
 };
 
-#endif /* SIMPLE_SPACER_HH */
+/* 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 */