* 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 fc4a8c290f1e6605b6ba72c070641d266d393441..4973fb3bd49b9f32a6235144617e119e737b4a04 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,6 +14,28 @@
 #include "engraver.hh"
 #include "axis-group-interface.hh"
 #include "note-spacing.hh"
+#include "group-interface.hh"
+#include "accidental-placement.hh"
+
+struct Spacings
+{
+  Item * staff_spacing_;
+  Link_array<Item> note_spacings_;
+
+  Spacings ()
+  {
+    staff_spacing_ = 0;
+  }
+
+  bool empty( )const
+  {
+    return !staff_spacing_ && !note_spacings_.size (); 
+  }
+  void clear () {
+    staff_spacing_ = 0;
+    note_spacings_.clear();
+  }
+};
 
 class Separating_line_group_engraver : public Engraver
 {
@@ -22,9 +44,8 @@ protected:
   Item * musical_malt_p_;
   Item * last_musical_malt_p_;
 
-  Grob * last_note_spacing_;
-  Grob * current_note_spacing_;
-  Grob * staff_spacing_;
+  Spacings current_spacings_;
+  Spacings last_spacings_;
   
   Spanner * sep_span_p_;
   
@@ -32,16 +53,13 @@ protected:
   virtual void initialize ();
   virtual void finalize ();
   virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();  
 public:
   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;
   musical_malt_p_ =0;
@@ -52,16 +70,32 @@ 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")));
 }
 
 void
 Separating_line_group_engraver::finalize ()
 {
-  sep_span_p_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+  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++)
+    {
+      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 () == column)
+    {
+      last_spacings_.staff_spacing_->suicide ();
+    }
 }
 
 void
@@ -75,9 +109,13 @@ 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_note_spacing_ =  it;
+      current_spacings_.note_spacings_.push (it);
       return ;
     }
   
@@ -91,21 +129,43 @@ 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_)
        {
-         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 ());
+         Item *it  = new Item (get_property ("StaffSpacing"));
+         current_spacings_.staff_spacing_ = it;
+         it->set_grob_property ("left-items", gh_cons (break_malt_p_->self_scm (), SCM_EOL));
+         
+         announce_grob(it, SCM_EOL);
+
+         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_malt_p_);
+                                    
+           }
+         else if (last_spacings_.staff_spacing_)
+           {
+             
+             last_spacings_.staff_spacing_->set_grob_property ("right-items",
+                                                               gh_cons (break_malt_p_->self_scm(), SCM_EOL));
+           }
        }
     }
 
-  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
+Separating_line_group_engraver::start_translation_timestep ()
+{
+
 }
 
 void
@@ -118,35 +178,41 @@ Separating_line_group_engraver::stop_translation_timestep ()
 
       break_malt_p_ =0;
     }
-
-  if (staff_spacing_)
+  
+  if (Item * sp = current_spacings_.staff_spacing_)
     {
+      /*
+       TODO: should really look at the left-items of following
+       note-spacing grobs.
+       */
       if (musical_malt_p_)
-       staff_spacing_->set_grob_property ("right-item", musical_malt_p_->self_scm());
+       Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"),
+                                          musical_malt_p_);
+
+      typeset_grob (sp);
+    }
 
-      typeset_grob (staff_spacing_);
-      staff_spacing_ = 0;
+  
+  if (!current_spacings_.empty ())
+    {
+      last_spacings_ = current_spacings_;
     }
+
+  current_spacings_.clear ();
   
   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;
 }
 
 
-
-
-
 ENTER_DESCRIPTION(Separating_line_group_engraver,
 /* descr */       "Generates objects for computing spacing parameters.",
 /* creats*/       "SeparationItem SeparatingGroupSpanner",
-/* acks  */       "grob-interface",
+/* acks  */       "item-interface",
 /* reads */       "",
 /* write */       "");