Merge with master

[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 b2aeb9b2ab4e72fe492f84114cb1cd1e06cb59a2..f493840d9585290af83648a7c86c17e4f2f5a8b4 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -93,13 +93,6 @@ Separating_line_group_engraver::finalize ()
   sep_span_->set_bound (RIGHT, unsmob_grob (ccol));
   sep_span_ = 0;
 
-  for (vsize i = 0; i < last_spacings_.note_spacings_.size (); i++)
-    {
-      Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
-                                        ly_symbol2scm ("right-items"),
-                                        column);
-    }
-
   if (last_spacings_.staff_spacing_
       && last_spacings_.staff_spacing_->get_column () == column)
     last_spacings_.staff_spacing_->suicide ();
@@ -146,14 +139,8 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
          Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"),
                                             break_item_);
 
-         if (int i = last_spacings_.note_spacings_.size ())
-           {
-             for (; i--;)
-               Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
-                                                  ly_symbol2scm ("right-items"),
-                                                  break_item_);
-           }
-         else if (last_spacings_.staff_spacing_)
+         if (!last_spacings_.note_spacings_.size ()
+             && last_spacings_.staff_spacing_)
            {
              SCM ri = last_spacings_.staff_spacing_->get_object ("right-items");
              Grob_array *ga = unsmob_grob_array (ri);