* The grand 2005-2006 replace.

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

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 66be64c8dfa5bae836fe2860614f3778c161f6a0..083aca8cbe03d187d8fc58da0351a16eaabe7a13 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "break-algorithm.hh"
@@ -14,12 +14,11 @@
 #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 ();
+  Link_array<Grob> all = pscore_->root_system ()->columns ();
   Array<int> retval;
 
   for (int i = 0; i < all.size (); i++)
@@ -36,7 +35,7 @@ Break_algorithm::find_break_indices () const
 Link_array<Grob>
 Break_algorithm::find_breaks () const
 {
-  Link_array<Grob> all = pscore_->system_->columns ();
+  Link_array<Grob> all = pscore_->root_system ()->columns ();
   Link_array<Grob> retval;
 
   for (int i = 0; i < all.size (); i++)
@@ -68,9 +67,7 @@ Break_algorithm::generate_spacing_problem (Link_array<Grob> const &curline,
     sort out how interfacing this should work;
   */
   if (line.is_empty ())
-    {
-      sp->line_len_ = -1;
-    }
+    sp->line_len_ = -1;
   else
     sp->line_len_ = line.length ();
 
@@ -88,7 +85,7 @@ void
 Break_algorithm::set_pscore (Paper_score *s)
 {
   pscore_ = s;
-  linewidth_ = s->layout_->get_dimension (ly_symbol2scm ("linewidth"));
+  linewidth_ = s->layout ()->get_dimension (ly_symbol2scm ("linewidth"));
 }
 
 Array<Column_x_positions>
@@ -99,3 +96,6 @@ Break_algorithm::solve () const
   return h;
 }
 
+Break_algorithm::~Break_algorithm ()
+{
+}