Housekeeping; 2005->2006, remove "notes for 2.6"

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

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index bfc5da52fb3f756819f586cba40733d5bd709eb3..923627f44c5a00384fac90adf1581aeb484611e8 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -15,42 +15,22 @@
 #include "cpu-timer.hh"
 #include "simple-spacer.hh"
 
-std::vector<int>
-Break_algorithm::find_break_indices () const
-{
-  Link_array__Grob_ all = pscore_->root_system ()->columns ();
-  std::vector<int> retval;
-
-  for (vsize i = 0; i < all.size (); i++)
-    if (Item::is_breakable (all[i]))
-      retval.push_back (i);
-
-  if (linewidth_ <= 0)
-    while (retval.size () > 2)
-      retval.erase (retval.begin () + 1);
-
-  return retval;
-}
-
-Link_array__Grob_
+vector<Grob*>
 Break_algorithm::find_breaks () const
 {
-  Link_array__Grob_ all = pscore_->root_system ()->columns ();
-  Link_array__Grob_ retval;
+  vector<Grob*> all = pscore_->root_system ()->columns ();
+  vector<Grob*> retval;
 
   for (vsize i = 0; i < all.size (); i++)
     if (Item::is_breakable (all[i]))
       retval.push_back (all[i]);
 
-  if (linewidth_ <= 0)
-    while (retval.size () > 2)
-      retval.erase (retval.begin () + 1);
 
   return retval;
 }
 
 Simple_spacer_wrapper *
-Break_algorithm::generate_spacing_problem (Link_array__Grob_ const &curline,
+Break_algorithm::generate_spacing_problem (vector<Grob*> const &curline,
                                           Interval line) const
 {
   Simple_spacer_wrapper *spw = new Simple_spacer_wrapper;
@@ -85,14 +65,13 @@ 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 ("line-width"));
 }
 
-std::vector<Column_x_positions>
-Break_algorithm::solve () const
+vector<Column_x_positions>
+Break_algorithm::solve () 
 {
-  std::vector<Column_x_positions> h= do_solve ();
-
+  vector<Column_x_positions> h;
   return h;
 }