*** empty log message ***

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

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index cf0f0b04fc964581e674c5490a09e7112a443661..2fe726b5b861e0c2de1956bb400f4151b62df5b4 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "paper-column.hh"
 #include "break-algorithm.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "system.hh"
 #include "paper-score.hh"
 #include "paper-column.hh"
@@ -25,7 +25,7 @@ Break_algorithm::find_break_indices () const
   Array<int> retval;
 
   for (int i=0; i < all.size (); i++)
-    if (Item::breakable_b (all[i]))
+    if (Item::is_breakable (all[i]))
       retval.push (i);
 
   if (linewidth_ <=0)
@@ -43,7 +43,7 @@ Break_algorithm::find_breaks () const
   Link_array<Grob> retval;
 
   for (int i=0; i < all.size (); i++)
-    if (Item::breakable_b (all[i]))
+    if (Item::is_breakable (all[i]))
       retval.push (all[i]);
 
   if (linewidth_ <=0)
@@ -54,19 +54,18 @@ Break_algorithm::find_breaks () const
 }
 
 
-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_realvar (ly_symbol2scm ("loose_column_distance"));        
+    used to be get_dimension (ly_symbol2scm ("loose_column_distance"));        
    */
   sp->default_space_ = 1.0;
-
-
   sp->indent_ = line[LEFT];
 
   /*
@@ -79,10 +78,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 +92,7 @@ void
 Break_algorithm::set_pscore (Paper_score*s)
 {
   pscore_ = s;
-  linewidth_ = s->paper_->get_realvar (ly_symbol2scm ("linewidth"));
+  linewidth_ = s->paper_->get_dimension (ly_symbol2scm ("linewidth"));
 }
 
 Array<Column_x_positions>