X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fconstrained-breaking.hh;h=9aa5862761e4a4b78c5256524696721ac369b3da;hb=c10fb9a8db5ad8cc6ca3c0411bce1df6dc8bb48f;hp=8f2a4de2effeea35c0e0fc030069d39d01e5cecf;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh
index 8f2a4de2ef..9aa5862761 100644
--- a/lily/include/constrained-breaking.hh
+++ b/lily/include/constrained-breaking.hh
@@ -4,20 +4,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef CONSTRAINED_BREAKING_HH
 #define CONSTRAINED_BREAKING_HH
 
-#include "break-algorithm.hh"
 #include "lily-guile.hh"
+#include "matrix.hh"
+#include "prob.hh"
 
 struct Line_details {
   Real force_;
-  Real extent_;   /* Y-extent of the system */
-  Real padding_;  /* compulsory space after this system (if we're not last on a page) */
-  Real space_;    /* spring length (stretches over extent_ but not over padding_) */
+  Interval extent_;   /* Y-extent of the system */
+
+  Real padding_;  /* compulsory space after this system (if we're not
+		     last on a page) */
+  Real bottom_padding_;
+  Real space_;    /* spring length */
   Real inverse_hooke_;
 
   SCM break_permission_;
@@ -30,8 +34,8 @@ struct Line_details {
   Line_details ()
   {
     force_ = infinity_f;
-    extent_ = 0;
     padding_ = 0;
+    bottom_padding_ = 0;
     space_ = 0;
     inverse_hooke_ = 1;
     break_permission_ = ly_symbol2scm ("allow");
@@ -41,6 +45,22 @@ struct Line_details {
     page_penalty_ = 0;
     turn_penalty_ = 0;
   }
+
+  Line_details (Prob *pb)
+  {
+    force_ = 0;
+    extent_ = unsmob_stencil (pb->get_property ("stencil")) ->extent (Y_AXIS);
+    padding_ = robust_scm2double (pb->get_property ("next-padding"), 0);
+    bottom_padding_ = 0;
+    space_ = robust_scm2double (pb->get_property ("next-space"), 1.0);
+    inverse_hooke_ = 1.0;
+    break_permission_ = ly_symbol2scm ("allow");
+    page_permission_ = pb->get_property ("page-break-permission");
+    turn_permission_ = pb->get_property ("page-turn-permission");
+    break_penalty_ = 0;
+    page_penalty_ = robust_scm2double (pb->get_property ("page-break-penalty"), 0);
+    turn_penalty_ = robust_scm2double (pb->get_property ("page-turn-penalty"), 0);
+  }
 };
 
 /*
@@ -72,32 +92,33 @@ struct Constrained_break_node
 /*
    A dynamic programming solution to breaking scores into lines
 */
-class Constrained_breaking : public Break_algorithm
+class Constrained_breaking
 {
 public:
-  vector<Column_x_positions> solve ();
-  Constrained_breaking ();
-  Constrained_breaking (vector<vsize> const &start_col_posns);
+  vector<Column_x_positions> solve (vsize start, vsize end, vsize sys_count);
+  vector<Column_x_positions> best_solution (vsize start, vsize end);
+  vector<Line_details> line_details (vsize start, vsize end, vsize sys_count);
 
-  vector<Column_x_positions> get_solution(vsize start, vsize end, vsize sys_count);
-  vector<Line_details> get_details (vsize start, vsize end, vsize sys_count);
-  int get_max_systems (vsize start, vsize end);
-  int get_min_systems (vsize start, vsize end);
+  Constrained_breaking (Paper_score *ps);
+  Constrained_breaking (Paper_score *ps, vector<vsize> const &start_col_posns);
 
-  void resize (vsize systems);
+  int max_system_count (vsize start, vsize end);
+  int min_system_count (vsize start, vsize end);
 
 private:
+  Paper_score *pscore_;
   vsize valid_systems_;
   vsize systems_;
+  bool ragged_right_;
+  bool ragged_last_;
 
   /* the (i,j)th entry is the configuration for breaking between
     columns i and j */
-  vector<Line_details> lines_;
-  vsize lines_rank_;
+  Matrix<Line_details> lines_;
 
   /* the [i](j,k)th entry is the score for fitting the first k bars onto the
     first j systems, starting at the i'th allowed starting column */
-  vector<vector<Constrained_break_node> > state_;
+  vector<Matrix<Constrained_break_node> > state_;
 
   vector<vsize> start_;         /* the columns at which we might be asked to start breaking */
   vector<vsize> starting_breakpoints_; /* the corresponding index in breaks_ */
@@ -105,8 +126,11 @@ private:
   vector<Grob*> all_;
   vector<vsize> breaks_;
 
+  void initialize ();
+  void resize (vsize systems);
+
   Column_x_positions space_line (vsize start_col, vsize end_col);
-  void prepare_solution (vsize start, vsize end, vsize sys_count, vsize *rank, vsize *brk);
+  vsize prepare_solution (vsize start, vsize end, vsize sys_count);
 
   Real combine_demerits (Real force, Real prev_force);