release: 1.5.26

[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 d36a852911a59c6bded27b26746485e24c05f94d..fc8679494ff79591bd4451b13f6c0618f8f710dd 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -13,13 +13,19 @@
 #include "paper-def.hh"
 #include "engraver.hh"
 #include "axis-group-interface.hh"
+#include "note-spacing.hh"
 
 class Separating_line_group_engraver : public Engraver
 {
 protected:
   Item * break_malt_p_;
   Item * musical_malt_p_;
+  Item * last_musical_malt_p_;
 
+  Item * last_note_spacing_;
+  Item * current_note_spacing_;
+  Item * staff_spacing_;
+  
   Spanner * sep_span_p_;
   
   virtual void acknowledge_grob (Grob_info);
@@ -32,6 +38,10 @@ public:
 
 Separating_line_group_engraver::Separating_line_group_engraver ()
 {
+  last_note_spacing_ = 0;
+  current_note_spacing_ = 0;
+  staff_spacing_ =0;
+  
   sep_span_p_ = 0;
   break_malt_p_ = 0;
   musical_malt_p_ =0;
@@ -60,11 +70,16 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
   Item * it = dynamic_cast <Item *> (i.grob_l_);
   if (!it)
     return;
-  if (it->parent_l (X_AXIS)
-      && it->parent_l (X_AXIS)->has_extent_callback_b
- (Axis_group_interface::group_extent_callback_proc, X_AXIS))
+  if (it->get_parent (X_AXIS)
+      && it->get_parent (X_AXIS)
+      ->has_extent_callback_b(Axis_group_interface::group_extent_callback_proc, X_AXIS))
     return;
 
+  if (Note_spacing::has_interface (it)) 
+    {
+      current_note_spacing_ =  it;
+      return ;
+    }
   
   bool ib =Item::breakable_b (it);
   Item *&p_ref_ (ib ? break_malt_p_
@@ -72,13 +87,24 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
 
   if (!p_ref_)
     {
-      p_ref_ = new Item
- (get_property ("SeparationItem"));
-         
+      p_ref_ = new Item (get_property ("SeparationItem"));
+
       if (ib)
        p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
       announce_grob (p_ref_, 0);
+
+      if (p_ref_ == break_malt_p_)
+       {
+         staff_spacing_ = new Item (get_property ("StaffSpacing"));
+         staff_spacing_->set_grob_property ("left-item", break_malt_p_->self_scm ());
+         announce_grob (staff_spacing_, 0);
+
+         if (last_note_spacing_)
+           last_note_spacing_->set_grob_property ("right-item",
+                                                  break_malt_p_->self_scm ());
+       }
     }
+
   Separation_item::add_item (p_ref_,it);
 }
 
@@ -88,17 +114,29 @@ Separating_line_group_engraver::stop_translation_timestep ()
   if (break_malt_p_)
     {
       Separating_group_spanner::add_spacing_unit (sep_span_p_, break_malt_p_);
-      
       typeset_grob (break_malt_p_);
+
       break_malt_p_ =0;
     }
 
+  if (staff_spacing_)
+    {
+      if (musical_malt_p_)
+       staff_spacing_->set_grob_property ("right-item", musical_malt_p_->self_scm());
+
+      typeset_grob (staff_spacing_);
+      staff_spacing_ = 0;
+    }
+  
   if (musical_malt_p_)
     {
       Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_);
       typeset_grob (musical_malt_p_);
     }
 
+  last_note_spacing_ = current_note_spacing_ ;
+  current_note_spacing_ =0 ;
+  
   musical_malt_p_ =0;
 }