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 120a55969e94ef181d112ba33f22cd1e937826ce..923627f44c5a00384fac90adf1581aeb484611e8 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "break-algorithm.hh"
@@ -14,66 +14,43 @@
 #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++)
-    if (Item::is_breakable (all[i]))
-      retval.push (i);
-
-  if (linewidth_ <= 0)
-    while (retval.size () > 2)
-      retval.del (1);
-
-  return retval;
-}
-
-Link_array<Grob>
+vector<Grob*>
 Break_algorithm::find_breaks () const
 {
-  Link_array<Grob> all = pscore_->system_->columns ();
-  Link_array<Grob> retval;
+  vector<Grob*> all = pscore_->root_system ()->columns ();
+  vector<Grob*> retval;
 
-  for (int i= 0; i < all.size (); i++)
+  for (vsize i = 0; i < all.size (); i++)
     if (Item::is_breakable (all[i]))
-      retval.push (all[i]);
+      retval.push_back (all[i]);
 
-  if (linewidth_ <= 0)
-    while (retval.size () >2)
-      retval.del (1);
 
   return retval;
 }
 
-Simple_spacer_wrapper*
-Break_algorithm::generate_spacing_problem (Link_array<Grob> const &curline,
+Simple_spacer_wrapper *
+Break_algorithm::generate_spacing_problem (vector<Grob*> const &curline,
                                           Interval line) const
 {
-  Simple_spacer_wrapper * spw =  new Simple_spacer_wrapper;
-  Simple_spacer * sp =  spw->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"));        
-   */
+    used to be get_dimension (ly_symbol2scm ("loose_column_distance"));
+  */
   sp->default_space_ = 1.0;
   sp->indent_ = line[LEFT];
 
   /*
     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 ();
-  
+
   spw->add_columns (curline);
   return spw;
 }
@@ -85,17 +62,19 @@ Break_algorithm::Break_algorithm ()
 }
 
 void
-Break_algorithm::set_pscore (Paper_score*s)
+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"));
 }
 
-Array<Column_x_positions>
-Break_algorithm::solve () const
+vector<Column_x_positions>
+Break_algorithm::solve () 
 {
-  Array<Column_x_positions> h= do_solve ();
-  
+  vector<Column_x_positions> h;
   return h;
 }
 
+Break_algorithm::~Break_algorithm ()
+{
+}