release: 1.1.32

[lilypond.git] / lily / break.cc

diff --git a/lily/break.cc b/lily/break.cc
index 9211bfcf1eada3af092c098e85bacfc9e1c24100..a836d62da329bdf7dd56b6320113f8c118fe2400 100644 (file)
--- a/lily/break.cc
+++ b/lily/break.cc
@@ -47,23 +47,11 @@ Col_stats::Col_stats ()
 
 /* **************************************************************** */
 
-Line_of_cols
-Break_algorithm::all_cols () const
-{
-  Line_of_cols retval;
-  for (PCursor<Paper_column*> c (pscore_l_->col_p_list_.top ());
-       c.ok (); c++)
-    {
-
-      retval.push (c);
-    }
-  return retval;
-}
 
 Array<int>
 Break_algorithm::find_break_indices () const
 {
-  Line_of_cols all (all_cols ());
+  Line_of_cols all (pscore_l_->col_l_arr_);
   Array<int> retval;
 
   for (int i=0; i < all.size (); i++)
@@ -81,7 +69,7 @@ Break_algorithm::find_break_indices () const
 Line_of_cols
 Break_algorithm::find_breaks () const
 {
-  Line_of_cols all (all_cols ());
+  Line_of_cols all (pscore_l_->col_l_arr_);
   Line_of_cols retval;
 
   for (int i=0; i < all.size (); i++)
@@ -156,7 +144,7 @@ Break_algorithm::feasible (Line_of_cols curline) const
 void
 Break_algorithm::problem_OK () const
 {
-  if (!pscore_l_->col_p_list_.size ())
+  if (pscore_l_->col_l_arr_.empty ())
     error (_("score does not have any columns"));
   OK ();
 }
@@ -165,11 +153,13 @@ void
 Break_algorithm::OK () const
 {
 #ifndef NDEBUG
-  iter_top (pscore_l_->col_p_list_,start);
+  #if 0
+    iter_top (pscore_l_->col_p_list_,start);
   PCursor<Paper_column *> end (pscore_l_->col_p_list_.bottom ());
 
   assert (start->breakable_b_);
   assert (end->breakable_b_);
+  #endif
 #endif
 }