* lily/include/translator.hh (class Translator): rename

[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 2cb1cf9aa2442569345d232a7b7fa75167e6d7c4..3ab5b422562c93b29bdb49f7bda903e4edbd60b2 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -16,7 +16,8 @@
 #include "note-spacing.hh"
 #include "group-interface.hh"
 #include "accidental-placement.hh"
-#include "translator-group.hh"
+#include "context.hh"
+
 
 
 struct Spacings
@@ -29,13 +30,13 @@ struct Spacings
     staff_spacing_ = 0;
   }
 
-  bool empty( )const
+  bool is_empty () const
   {
     return !staff_spacing_ && !note_spacings_.size (); 
   }
   void clear () {
     staff_spacing_ = 0;
-    note_spacings_.clear();
+    note_spacings_.clear ();
   }
 };
 
@@ -53,12 +54,12 @@ protected:
   Spanner * sep_span_;
   
   virtual void acknowledge_grob (Grob_info);
-  virtual void initialize ();
+  virtual void process_music ();
   virtual void finalize ();
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();  
 public:
-  TRANSLATOR_DECLARATIONS(Separating_line_group_engraver);
+  TRANSLATOR_DECLARATIONS (Separating_line_group_engraver);
 };
 
 Separating_line_group_engraver::Separating_line_group_engraver ()
@@ -69,17 +70,23 @@ Separating_line_group_engraver::Separating_line_group_engraver ()
 }
 
 void
-Separating_line_group_engraver::initialize ()
+Separating_line_group_engraver::process_music ()
 {
-  sep_span_ = new Spanner (get_property ("SeparatingGroupSpanner"));
 
-  announce_grob(sep_span_, SCM_EOL);
-  sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-}
+  if (!sep_span_)
+    {
+      sep_span_ = make_spanner ("SeparatingGroupSpanner");
 
+      announce_grob (sep_span_, SCM_EOL);
+      sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
+}
 void
 Separating_line_group_engraver::finalize ()
 {
+  if (!sep_span_)
+    return ;
+  
   SCM ccol = get_property ("currentCommandColumn");
   Grob *column = unsmob_grob (ccol);
   
@@ -87,14 +94,14 @@ Separating_line_group_engraver::finalize ()
   typeset_grob (sep_span_);
   sep_span_ =0;
 
-  for  (int i= 0 ; i < last_spacings_.note_spacings_.size(); i++)
+  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_
+  if (last_spacings_.staff_spacing_
      && last_spacings_.staff_spacing_->get_column () == column)
     {
       last_spacings_.staff_spacing_->suicide ();
@@ -109,11 +116,11 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
     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))
+      ->has_extent_callback (Axis_group_interface::group_extent_callback_proc, X_AXIS))
     return;
 
   
-  if (to_boolean (it->get_grob_property ("no-spacing-rods")))
+  if (to_boolean (it->get_property ("no-spacing-rods")))
     return ;
 
   if (Note_spacing::has_interface (it)) 
@@ -122,28 +129,29 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
       return ;
     }
   
-  bool ib =Item::breakable_b (it);
+  bool ib =Item::is_breakable (it);
   Item *&p_ref_ (ib ? break_item_
                 : musical_item_);
 
   if (!p_ref_)
     {
-      p_ref_ = new Item (get_property ("SeparationItem"));
+      p_ref_ = make_item ("SeparationItem");
 
       if (ib)
        {
-         p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
-         daddy_trans_->set_property ("breakableSeparationItem", p_ref_->self_scm ());
+         p_ref_->set_property ("breakable", SCM_BOOL_T);
+         context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
        }
-      announce_grob(p_ref_, SCM_EOL);
+      announce_grob (p_ref_, SCM_EOL);
 
-      if (p_ref_ == break_item_)
+      if (to_boolean (get_property ("createSpacing"))
+         && p_ref_ == break_item_)
        {
-         Item *it  = new Item (get_property ("StaffSpacing"));
+         Item *it  = make_item ("StaffSpacing");
          current_spacings_.staff_spacing_ = it;
-         it->set_grob_property ("left-items", gh_cons (break_item_->self_scm (), SCM_EOL));
+         it->set_property ("left-items", scm_cons (break_item_->self_scm (), SCM_EOL));
          
-         announce_grob(it, SCM_EOL);
+         announce_grob (it, SCM_EOL);
 
          if (int i = last_spacings_.note_spacings_.size ())
            {
@@ -155,9 +163,8 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
            }
          else if (last_spacings_.staff_spacing_)
            {
-             
-             last_spacings_.staff_spacing_->set_grob_property ("right-items",
-                                                               gh_cons (break_item_->self_scm(), SCM_EOL));
+             last_spacings_.staff_spacing_->set_property ("right-items",
+                                                               scm_cons (break_item_->self_scm (), SCM_EOL));
            }
        }
     }
@@ -172,7 +179,7 @@ void
 Separating_line_group_engraver::start_translation_timestep ()
 {
   if (break_item_)
-    daddy_trans_->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+    context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
   break_item_ =0;
 }
 
@@ -199,7 +206,7 @@ Separating_line_group_engraver::stop_translation_timestep ()
     }
 
   
-  if (!current_spacings_.empty ())
+  if (!current_spacings_.is_empty ())
     {
       last_spacings_ = current_spacings_;
     }
@@ -216,10 +223,10 @@ Separating_line_group_engraver::stop_translation_timestep ()
 }
 
 
-ENTER_DESCRIPTION(Separating_line_group_engraver,
+ENTER_DESCRIPTION (Separating_line_group_engraver,
 /* descr */       "Generates objects for computing spacing parameters.",
-/* creats*/       "SeparationItem SeparatingGroupSpanner",
+/* creats*/       "SeparationItem SeparatingGroupSpanner StaffSpacing",
 /* accepts */     "",
 /* acks  */      "item-interface",
-/* reads */       "",
+/* reads */       "createSpacing",
 /* write */       "breakableSeparationItem");