* mf/merge.pe.in: Set font names, version, license GPL.

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

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 5db8a7c08ed0927c23fe0b3beb9cbb48a744826e..120a55969e94ef181d112ba33f22cd1e937826ce 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -6,67 +6,62 @@
   (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "paper-column.hh"
 #include "break-algorithm.hh"
-#include "paper-def.hh"
+#include "paper-column.hh"
+#include "output-def.hh"
 #include "system.hh"
 #include "paper-score.hh"
 #include "paper-column.hh"
 #include "cpu-timer.hh"
-
 #include "simple-spacer.hh"
 #include "group-interface.hh"
 
-
 Array<int>
 Break_algorithm::find_break_indices () const
 {
   Link_array<Grob> all = pscore_->system_->columns ();
   Array<int> retval;
 
-  for (int i=0; i < all.size (); i++)
+  for (int i= 0; i < all.size (); i++)
     if (Item::is_breakable (all[i]))
       retval.push (i);
 
-  if (linewidth_ <=0)
-    while (retval.size () >2)
+  if (linewidth_ <= 0)
+    while (retval.size () > 2)
       retval.del (1);
 
   return retval;
 }
 
-
 Link_array<Grob>
 Break_algorithm::find_breaks () const
 {
   Link_array<Grob> all = pscore_->system_->columns ();
   Link_array<Grob> retval;
 
-  for (int i=0; i < all.size (); i++)
+  for (int i= 0; i < all.size (); i++)
     if (Item::is_breakable (all[i]))
       retval.push (all[i]);
 
-  if (linewidth_ <=0)
+  if (linewidth_ <= 0)
     while (retval.size () >2)
       retval.del (1);
 
   return retval;
 }
 
-
-Simple_spacer*
+Simple_spacer_wrapper*
 Break_algorithm::generate_spacing_problem (Link_array<Grob> const &curline,
                                           Interval line) const
 {
-  Simple_spacer * sp =  new Simple_spacer;
-
+  Simple_spacer_wrapper * spw =  new Simple_spacer_wrapper;
+  Simple_spacer * sp =  spw->spacer_;
+  
   /*
     this is hardcoded, but this shouldn't happen anyway.
     used to be get_dimension (ly_symbol2scm ("loose_column_distance"));        
    */
   sp->default_space_ = 1.0;
-
-
   sp->indent_ = line[LEFT];
 
   /*
@@ -79,10 +74,8 @@ Break_algorithm::generate_spacing_problem (Link_array<Grob> const &curline,
   else
     sp->line_len_ = line.length ();
   
-  sp->add_columns (curline);
-
-
-  return sp;
+  spw->add_columns (curline);
+  return spw;
 }
 
 Break_algorithm::Break_algorithm ()
@@ -95,7 +88,7 @@ void
 Break_algorithm::set_pscore (Paper_score*s)
 {
   pscore_ = s;
-  linewidth_ = s->paper_->get_dimension (ly_symbol2scm ("linewidth"));
+  linewidth_ = s->layout_->get_dimension (ly_symbol2scm ("linewidth"));
 }
 
 Array<Column_x_positions>