]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/separating-line-group-engraver.cc
* lily/accidental-placement.cc (split_accidentals): new function
[lilypond.git] / lily / separating-line-group-engraver.cc
index bbbf47e54ba5e359e76258c515a97478f45825ef..4973fb3bd49b9f32a6235144617e119e737b4a04 100644 (file)
@@ -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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "paper-column.hh"
 #include "paper-def.hh"
 #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
 {
 protected:
   Item * break_malt_p_;
-  Item * nobreak_malt_p_;
+  Item * musical_malt_p_;
+  Item * last_musical_malt_p_;
+
+  Spacings current_spacings_;
+  Spacings last_spacings_;
+  
   Spanner * sep_span_p_;
   
   virtual void acknowledge_grob (Grob_info);
-  virtual void do_creation_processing ();
-  virtual void do_removal_processing ();
+  virtual void initialize ();
+  virtual void finalize ();
   virtual void stop_translation_timestep ();
+  virtual void start_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 ()
 {
   sep_span_p_ = 0;
   break_malt_p_ = 0;
-  nobreak_malt_p_ =0;
+  musical_malt_p_ =0;
 }
 
 void
-Separating_line_group_engraver::do_creation_processing ()
+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_element (get_property ("currentCommandColumn")));
+
+  announce_grob(sep_span_p_, SCM_EOL);
+  sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 }
 
 void
-Separating_line_group_engraver::do_removal_processing ()
+Separating_line_group_engraver::finalize ()
 {
-  sep_span_p_->set_bound (RIGHT, unsmob_element (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
 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 (to_boolean (it->get_grob_property ("no-spacing-rods")))
+    return ;
+
+  if (Note_spacing::has_interface (it)) 
+    {
+      current_spacings_.note_spacings_.push (it);
+      return ;
+    }
+  
+  bool ib =Item::breakable_b (it);
+  Item *&p_ref_ (ib ? break_malt_p_
+                : musical_malt_p_);
+
+  if (!p_ref_)
     {
-      bool ib =Item::breakable_b (it);
-      Item *&p_ref_ (ib ? break_malt_p_
-                             : nobreak_malt_p_);
+      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_, SCM_EOL);
+
+      if (p_ref_ == break_malt_p_)
        {
-         p_ref_ = new Item
-           (get_property ("SeparationItem"));
+         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));
          
-         if (ib)
-           p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
-         announce_grob (p_ref_, 0);
+         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
@@ -82,19 +174,45 @@ 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 (Item * sp = current_spacings_.staff_spacing_)
     {
-      Separating_group_spanner::add_spacing_unit (sep_span_p_, nobreak_malt_p_);
-      typeset_grob (nobreak_malt_p_);
-      nobreak_malt_p_ =0;
+      /*
+       TODO: should really look at the left-items of following
+       note-spacing grobs.
+       */
+      if (musical_malt_p_)
+       Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"),
+                                          musical_malt_p_);
+
+      typeset_grob (sp);
     }
-}
 
+  
+  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_);
+    }
+  
+  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  */       "item-interface",
+/* reads */       "",
+/* write */       "");