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 024dd9b5f13dca1a6e2e26ecd39b3f5f786d3f94..fc8679494ff79591bd4451b13f6c0618f8f710dd 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -1,9 +1,9 @@
 /*   
-  separating-line-group-engraver.cc --  implement Separating_line_group_engraver
+'  separating-line-group-engraver.cc --  implement Separating_line_group_engraver
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -12,12 +12,20 @@
 #include "paper-column.hh"
 #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 * nobreak_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);
@@ -25,22 +33,25 @@ protected:
   virtual void finalize ();
   virtual void stop_translation_timestep ();
 public:
-  Separating_line_group_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Separating_line_group_engraver);
 };
 
 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;
-  nobreak_malt_p_ =0;
+  musical_malt_p_ =0;
 }
 
 void
 Separating_line_group_engraver::initialize ()
 {
   sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner"));
-  Separating_group_spanner::set_interface (sep_span_p_);
+
   announce_grob (sep_span_p_, 0);
   sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 }
@@ -56,24 +67,45 @@ Separating_line_group_engraver::finalize ()
 void
 Separating_line_group_engraver::acknowledge_grob (Grob_info i)
 {
-  Item * it = dynamic_cast <Item *> (i.elem_l_);
-  if (it && !it->parent_l (X_AXIS))
+  Item * it = dynamic_cast <Item *> (i.grob_l_);
+  if (!it)
+    return;
+  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)) 
     {
-      bool ib =Item::breakable_b (it);
-      Item *&p_ref_ (ib ? break_malt_p_
-                             : nobreak_malt_p_);
+      current_note_spacing_ =  it;
+      return ;
+    }
+  
+  bool ib =Item::breakable_b (it);
+  Item *&p_ref_ (ib ? break_malt_p_
+                : musical_malt_p_);
+
+  if (!p_ref_)
+    {
+      p_ref_ = new Item (get_property ("SeparationItem"));
 
-      if (!p_ref_)
+      if (ib)
+       p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
+      announce_grob (p_ref_, 0);
+
+      if (p_ref_ == break_malt_p_)
        {
-         p_ref_ = new Item
-           (get_property ("SeparationItem"));
-         
-         if (ib)
-           p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
-         announce_grob (p_ref_, 0);
+         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);
     }
+
+  Separation_item::add_item (p_ref_,it);
 }
 
 void
@@ -82,19 +114,39 @@ 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 (nobreak_malt_p_)
+
+  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_, nobreak_malt_p_);
-      typeset_grob (nobreak_malt_p_);
-      nobreak_malt_p_ =0;
+      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;
 }
 
 
 
-ADD_THIS_TRANSLATOR(Separating_line_group_engraver);
 
+
+ENTER_DESCRIPTION(Separating_line_group_engraver,
+/* descr */       "Generates objects for computing spacing parameters.",
+/* creats*/       "SeparationItem SeparatingGroupSpanner",
+/* acks  */       "grob-interface",
+/* reads */       "",
+/* write */       "");