release: 1.3.131

[lilypond.git] / lily / break-algorithm.cc

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 51486412c9bcbe3612d0b129c08a82e43ffaa901..320857f7b8e1bf4992cbc80c10c93a2dc4be8922 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "score-column.hh"
-#include "break.hh"
+#include "paper-column.hh"
+#include "break-algorithm.hh"
 #include "paper-def.hh"
 #include "debug.hh"
 #include "line-of-score.hh"
@@ -16,22 +16,20 @@
 #include "cpu-timer.hh"
 #include "command-request.hh"
 #include "simple-spacer.hh"
-
-
-
+#include "group-interface.hh"
 
 
 Array<int>
 Break_algorithm::find_break_indices () const
 {
-  Line_of_cols all (pscore_l_->col_l_arr_);
+  Link_array<Grob> all = pscore_l_->line_l_->column_l_arr ();
   Array<int> retval;
 
   for (int i=0; i < all.size (); i++)
-    if (all[i]->breakable_b ())
+    if (Item::breakable_b (all[i]))
       retval.push (i);
 
-  if (linelength <=0)
+  if (linewidth_f_ <=0)
     while (retval.size () >2)
       retval.del (1);
 
@@ -39,17 +37,17 @@ Break_algorithm::find_break_indices () const
 }
 
 
-Line_of_cols
+Link_array<Grob>
 Break_algorithm::find_breaks () const
 {
-  Line_of_cols all (pscore_l_->col_l_arr_);
-  Line_of_cols retval;
+  Link_array<Grob> all = pscore_l_->line_l_->column_l_arr ();
+  Link_array<Grob> retval;
 
   for (int i=0; i < all.size (); i++)
-    if (all[i]->breakable_b ())
+    if (Item::breakable_b (all[i]))
       retval.push (all[i]);
 
-  if (linelength <=0)
+  if (linewidth_f_ <=0)
     while (retval.size () >2)
       retval.del (1);
 
@@ -57,12 +55,17 @@ Break_algorithm::find_breaks () const
 }
 
 
-Line_spacer*
-Break_algorithm::generate_spacing_problem (Line_of_cols curline, Interval line) const
+Simple_spacer*
+Break_algorithm::generate_spacing_problem (Link_array<Grob> curline, Interval line) const
 {
-  Line_spacer * sp =  new Simple_spacer;
-  
-  sp->default_space_f_ = pscore_l_->paper_l_->get_var ("loose_column_distance");
+  Simple_spacer * sp =  new Simple_spacer;
+
+  /*
+    this is hardcoded, but this shouldn't happen anyway.
+    used to be g et_var ("loose_column_distance");        
+   */
+  sp->default_space_f_ = 1.0;
+
 
   sp->indent_f_ = line[LEFT];
 
@@ -77,7 +80,7 @@ Break_algorithm::generate_spacing_problem (Line_of_cols curline, Interval line)
     sp->line_len_f_ = line.length ();
   
   sp->add_columns (curline);
-  sp->prepare ();
+
 
   return sp;
 }
@@ -85,44 +88,14 @@ Break_algorithm::generate_spacing_problem (Line_of_cols curline, Interval line)
 Break_algorithm::Break_algorithm ()
 {
   pscore_l_ = 0;
-  get_line_spacer =0;
-  linelength = 0;
+  linewidth_f_ = 0;
 }
 
 void
 Break_algorithm::set_pscore (Paper_score*s)
 {
   pscore_l_ = s;
-  linelength = s->paper_l_->linewidth_f ();
-  do_set_pscore ();
-}
-
-bool
-Break_algorithm::feasible (Line_of_cols curline) const
-{
-  if (linelength <=  0)
-    return true;
-
-  for (int i=0; i < curline.size (); i++)
-    {
-      if (i && i < curline.size () -1
-         && ((dynamic_cast<Score_column*>(curline[i]))->break_penalty_i () >= Break_req::FORCE))
-       return false;
-    }
-  return true;
-}
-
-void
-Break_algorithm::problem_OK () const
-{
-  if (pscore_l_->col_l_arr_.empty ())
-    error (_("Score does not have any columns"));
-  OK ();
-}
-
-void
-Break_algorithm::OK () const
-{
+  linewidth_f_ = s->paper_l_->get_var("linewidth");
 }
 
 Array<Column_x_positions>
@@ -133,8 +106,3 @@ Break_algorithm::solve () const
   return h;
 }
 
-void
-Break_algorithm::do_set_pscore ()
-{
-
-}