release: 1.5.29

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

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 3337bff317a95f570e15a14b6314022e3f34377f..e14cdcdb4a852bdaf1a1c677b5a9001c700e83bd 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "paper-column.hh"
@@ -22,13 +22,11 @@
 Array<int>
 Break_algorithm::find_break_indices () const
 {
-  Link_array<Paper_column> all = pscore_l_->line_l_->column_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 (linewidth_f_ <=0)
@@ -39,15 +37,14 @@ Break_algorithm::find_break_indices () const
 }
 
 
-Link_array<Paper_column>
+Link_array<Grob>
 Break_algorithm::find_breaks () const
 {
-  Link_array<Paper_column> all = pscore_l_->line_l_->column_l_arr ();
-    
-  Link_array<Paper_column> 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 (linewidth_f_ <=0)
@@ -59,19 +56,23 @@ Break_algorithm::find_breaks () const
 
 
 Simple_spacer*
-Break_algorithm::generate_spacing_problem (Link_array<Paper_column> curline, Interval line) const
+Break_algorithm::generate_spacing_problem (Link_array<Grob> curline, Interval line) const
 {
   Simple_spacer * sp =  new Simple_spacer;
-  Paper_def * d = pscore_l_->paper_l_;
-  sp->compression_energy_factor_f_ = d->get_var ("compression_energy_factor");
-  sp->default_space_f_ = d->get_var ("loose_column_distance");
+
+  /*
+    this is hardcoded, but this shouldn't happen anyway.
+    used to be get_var ("loose_column_distance");        
+   */
+  sp->default_space_f_ = 1.0;
+
 
   sp->indent_f_ = line[LEFT];
 
   /*
     sort out how interfacing this should work;
    */
-  if (line.empty_b())
+  if (line.empty_b ())
     {
      sp->line_len_f_ = -1;
     }
@@ -94,7 +95,7 @@ void
 Break_algorithm::set_pscore (Paper_score*s)
 {
   pscore_l_ = s;
-  linewidth_f_ = s->paper_l_->get_var("linewidth");
+  linewidth_f_ = s->paper_l_->get_var ("linewidth");
 }
 
 Array<Column_x_positions>