* lily/accidental-placement.cc (split_accidentals): new function

[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 29c393fb67b8366a09e258cb06955eabcd5de50d..4973fb3bd49b9f32a6235144617e119e737b4a04 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -15,6 +15,7 @@
 #include "axis-group-interface.hh"
 #include "note-spacing.hh"
 #include "group-interface.hh"
+#include "accidental-placement.hh"
 
 struct Spacings
 {
@@ -77,17 +78,21 @@ void
 Separating_line_group_engraver::finalize ()
 {
   SCM ccol = get_property ("currentCommandColumn");
+  Grob *column = unsmob_grob (ccol);
+  
   sep_span_p_->set_bound (RIGHT, unsmob_grob (ccol));
   typeset_grob (sep_span_p_);
   sep_span_p_ =0;
 
   for  (int i= 0 ; i < last_spacings_.note_spacings_.size(); i++)
     {
-      last_spacings_.note_spacings_[i]->set_grob_property ("right-items", gh_cons (ccol, SCM_EOL));
+      Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
+                                        ly_symbol2scm ("right-items" ),
+                                        column);
     }
-
+   
   if(last_spacings_.staff_spacing_
-     && last_spacings_.staff_spacing_->column_l () == unsmob_grob (ccol))
+     && last_spacings_.staff_spacing_->column_l () == column)
     {
       last_spacings_.staff_spacing_->suicide ();
     }
@@ -104,7 +109,6 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
       ->has_extent_callback_b(Axis_group_interface::group_extent_callback_proc, X_AXIS))
     return;
 
-
   
   if (to_boolean (it->get_grob_property ("no-spacing-rods")))
     return ;
@@ -152,7 +156,10 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
        }
     }
 
-  Separation_item::add_item (p_ref_,it);
+  if (Accidental_placement::has_interface (it))
+    Separation_item::add_conditional_item (p_ref_, it);
+  else
+    Separation_item::add_item (p_ref_,it);
 }
 
 void