release: 1.5.29

[lilypond.git] / lily / rest-collision.cc

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index bd4c308d0f17883372e318df6b72ea51379b242d..f791015c8fa3211202213da28ca31f81d3865bb2 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <math.h>              // ceil.
@@ -47,7 +47,7 @@ void
 Rest_collision::add_column (Grob*me,Grob *p)
 {
   me->add_dependency (p);
-  Pointer_group_interface::add_element (me, "elements", p);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
 
   /*
     only add callback for the rests, since we don't move anything else.
@@ -76,6 +76,10 @@ head_characteristic (Grob * col)
 
 /*
   TODO: fixme, fucks up if called twice on the same set of rests.
+
+  TODO: look at horizontal-shift to determine ordering between rests
+  for more than two voices.
+  
  */
 SCM
 Rest_collision::do_shift (Grob *me, SCM elts)
@@ -86,10 +90,10 @@ Rest_collision::do_shift (Grob *me, SCM elts)
   Link_array<Grob> rests;
   Link_array<Grob> notes;
   Grob * commony = 0;
-  for (SCM s = elts; gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = elts; gh_pair_p (s); s = ly_cdr (s))
     {
       
-      Grob * e = unsmob_grob (gh_car (s));
+      Grob * e = unsmob_grob (ly_car (s));
       if (!e)
        continue;