patch::: 1.3.48.jcn1

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

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 9e242d22f0038c99fe6d51527aca58894c7bc104..3337bff317a95f570e15a14b6314022e3f34377f 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -3,10 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "score-column.hh"
+#include "paper-column.hh"
 #include "break-algorithm.hh"
 #include "paper-def.hh"
 #include "debug.hh"
@@ -16,15 +16,15 @@
 #include "cpu-timer.hh"
 #include "command-request.hh"
 #include "simple-spacer.hh"
-
-
-
+#include "group-interface.hh"
 
 
 Array<int>
 Break_algorithm::find_break_indices () const
 {
-  Link_array<Paper_column> all (pscore_l_->col_l_arr_);
+  Link_array<Paper_column> all = pscore_l_->line_l_->column_l_arr ();
+  
+                                        
   Array<int> retval;
 
   for (int i=0; i < all.size (); i++)
@@ -42,7 +42,8 @@ Break_algorithm::find_break_indices () const
 Link_array<Paper_column>
 Break_algorithm::find_breaks () const
 {
-  Link_array<Paper_column> all (pscore_l_->col_l_arr_);
+  Link_array<Paper_column> all = pscore_l_->line_l_->column_l_arr ();
+    
   Link_array<Paper_column> retval;
 
   for (int i=0; i < all.size (); i++)
@@ -94,22 +95,6 @@ Break_algorithm::set_pscore (Paper_score*s)
 {
   pscore_l_ = s;
   linewidth_f_ = s->paper_l_->get_var("linewidth");
-  do_set_pscore ();
-}
-
-
-
-void
-Break_algorithm::problem_OK () const
-{
-  if (pscore_l_->col_l_arr_.empty ())
-    error (_("Score does not have any columns"));
-  OK ();
-}
-
-void
-Break_algorithm::OK () const
-{
 }
 
 Array<Column_x_positions>
@@ -120,8 +105,3 @@ Break_algorithm::solve () const
   return h;
 }
 
-void
-Break_algorithm::do_set_pscore ()
-{
-
-}