patch::: 1.3.136.jcn3

[lilypond.git] / lily / separating-group-spanner.cc

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index cc6f70c219ac5450617da42981eb1e009d08677b..dbef68ff5a95390d58829f5ee7165ede289577c7 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -34,13 +34,13 @@ do_rod (Item *l, Item *r)
   rod.add_to_cols ();
 }
   
-MAKE_SCHEME_CALLBACK(Separating_group_spanner,set_spacing_rods);
+MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods,1);
 SCM
 Separating_group_spanner::set_spacing_rods (SCM smob)
 {
-  Score_element*me = unsmob_element (smob);
+  Grob*me = unsmob_grob (smob);
   
-  for (SCM s = me->get_elt_property ("elements"); gh_pair_p (s) && gh_pair_p (gh_cdr (s)); s = gh_cdr (s))
+  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s) && gh_pair_p (gh_cdr (s)); s = gh_cdr (s))
     {
       /*
        Order of elements is reversed!
@@ -48,19 +48,19 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
       SCM elt = gh_cadr (s);
       SCM next_elt = gh_car (s);
 
-      Item *l = dynamic_cast<Item*> (unsmob_element (elt));
-      Item *r = dynamic_cast<Item*> (unsmob_element ( next_elt));
+      Item *l = dynamic_cast<Item*> (unsmob_grob (elt));
+      Item *r = dynamic_cast<Item*> (unsmob_grob (next_elt));
 
       if (!r || !l)
        continue;
       
       Item *lb
-       = dynamic_cast<Item*>(l->find_prebroken_piece (RIGHT));
+       = dynamic_cast<Item*> (l->find_prebroken_piece (RIGHT));
 
       Item *rb
-       = dynamic_cast<Item*>(r->find_prebroken_piece (LEFT));
+       = dynamic_cast<Item*> (r->find_prebroken_piece (LEFT));
       
-      do_rod(l,  r);
+      do_rod (l,  r);
       if (lb)
        {
          do_rod (lb, r);
@@ -81,9 +81,9 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
   /*
     We've done our job, so we get lost. 
    */
-  for (SCM s = me->get_elt_property ("elements"); gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = gh_cdr (s))
     {
-      Item * it =dynamic_cast<Item*>(unsmob_element (gh_car (s)));
+      Item * it =dynamic_cast<Item*> (unsmob_grob (gh_car (s)));
       if (it && it->broken_b ())
        {
          it->find_prebroken_piece (LEFT) ->suicide ();
@@ -92,19 +92,19 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
       it->suicide ();
     }
   me->suicide ();
-  return SCM_UNDEFINED ;
+  return SCM_UNSPECIFIED ;
 }
 
 void
-Separating_group_spanner::add_spacing_unit (Score_element* me ,Item*i)
+Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i)
 {
-  Pointer_group_interface (me, "elements").add_element (i);
+  Pointer_group_interface::add_element (me, "elements",i);
   me->add_dependency (i);
 }
 
 
 void
-Separating_group_spanner::set_interface (Score_element*me)
+Separating_group_spanner::set_interface (Grob*)
 {
-  me->set_elt_property ("elements", SCM_EOL);
+
 }