* 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 b09b79f3d73e4fd80c08505ab784713c9a724198..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
 {
@@ -69,7 +70,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")));
 }
 
@@ -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,6 +109,10 @@ 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 ;
+
   if (Note_spacing::has_interface (it)) 
     {
       current_spacings_.note_spacings_.push (it);
@@ -120,7 +129,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,7 +137,7 @@ 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 ())
            {
@@ -147,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
@@ -166,7 +178,7 @@ Separating_line_group_engraver::stop_translation_timestep ()
 
       break_malt_p_ =0;
     }
-
+  
   if (Item * sp = current_spacings_.staff_spacing_)
     {
       /*
@@ -180,6 +192,7 @@ Separating_line_group_engraver::stop_translation_timestep ()
       typeset_grob (sp);
     }
 
+  
   if (!current_spacings_.empty ())
     {
       last_spacings_ = current_spacings_;
@@ -197,12 +210,9 @@ Separating_line_group_engraver::stop_translation_timestep ()
 }
 
 
-
-
-
 ENTER_DESCRIPTION(Separating_line_group_engraver,
 /* descr */       "Generates objects for computing spacing parameters.",
 /* creats*/       "SeparationItem SeparatingGroupSpanner",
-/* acks  */       "grob-interface",
+/* acks  */       "item-interface",
 /* reads */       "",
 /* write */       "");