clap

[lilypond.git] / lily / separating-line-group-engraver.cc

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index 57100c952ec5402b9439fca66beb55a8107ca6ae..796821254b95bf8734c4dc94d9fcd6d56f399968 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,7 +14,7 @@
 #include "engraver.hh"
 #include "axis-group-interface.hh"
 #include "note-spacing.hh"
-
+#include "group-interface.hh"
 
 struct Spacings
 {
@@ -69,7 +69,7 @@ Separating_line_group_engraver::initialize ()
 {
   sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner"));
 
-  announce_grob (sep_span_p_, 0);
+  announce_grob(sep_span_p_, SCM_EOL);
   sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 }
 
@@ -120,7 +120,7 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
 
       if (ib)
        p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
-      announce_grob (p_ref_, 0);
+      announce_grob(p_ref_, SCM_EOL);
 
       if (p_ref_ == break_malt_p_)
        {
@@ -128,14 +128,14 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
          current_spacings_.staff_spacing_ = it;
          it->set_grob_property ("left-items", gh_cons (break_malt_p_->self_scm (), SCM_EOL));
          
-         announce_grob (it, 0);
+         announce_grob(it, SCM_EOL);
 
          if (int i = last_spacings_.note_spacings_.size ())
            {
-             SCM break_malt = gh_cons (break_malt_p_->self_scm (), SCM_EOL);
              for (; i--;)
-               last_spacings_.note_spacings_[i]
-                 ->set_grob_property ("right-items",break_malt);
+               Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
+                                                  ly_symbol2scm ("right-items"),
+                                                  break_malt_p_);
                                     
            }
          else if (last_spacings_.staff_spacing_)
@@ -166,7 +166,7 @@ Separating_line_group_engraver::stop_translation_timestep ()
 
       break_malt_p_ =0;
     }
-
+  
   if (Item * sp = current_spacings_.staff_spacing_)
     {
       /*
@@ -174,11 +174,13 @@ Separating_line_group_engraver::stop_translation_timestep ()
        note-spacing grobs.
        */
       if (musical_malt_p_)
-       sp->set_grob_property ("right-items", musical_malt_p_->self_scm());
+       Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"),
+                                          musical_malt_p_);
 
       typeset_grob (sp);
     }
 
+  
   if (!current_spacings_.empty ())
     {
       last_spacings_ = current_spacings_;