update for the lily-wins.py script.

[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 59fdc721196d1484414774c876510bbcf66f2d26..b9b3fda402fe20542577f37ad2bc8cefa77b4f13 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -36,7 +36,7 @@ struct Spacings
   }
   void clear () {
     staff_spacing_ = 0;
-    note_spacings_.clear();
+    note_spacings_.clear ();
   }
 };
 
@@ -59,7 +59,7 @@ protected:
   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 ()
@@ -75,9 +75,9 @@ Separating_line_group_engraver::process_music ()
 
   if (!sep_span_)
     {
-      sep_span_ = make_spanner ("SeparatingGroupSpanner");
+      sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL);
 
-      announce_grob(sep_span_, SCM_EOL);
+      
       sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
     }
 }
@@ -94,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 ();
@@ -116,7 +116,7 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
     return;
   if (it->get_parent (X_AXIS)
       && it->get_parent (X_AXIS)
-      ->has_extent_callback(Axis_group_interface::group_extent_callback_proc, X_AXIS))
+      ->has_extent_callback (Axis_group_interface::group_extent_callback_proc, X_AXIS))
     return;
 
   
@@ -135,22 +135,23 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
 
   if (!p_ref_)
     {
-      p_ref_ = make_item ("SeparationItem");
+      p_ref_ = make_item ("SeparationItem", SCM_EOL);
 
       if (ib)
        {
          p_ref_->set_property ("breakable", SCM_BOOL_T);
-         daddy_context_->set_property ("breakableSeparationItem", p_ref_->self_scm ());
+         context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
        }
-      announce_grob(p_ref_, SCM_EOL);
+      
 
-      if (p_ref_ == break_item_)
+      if (to_boolean (get_property ("createSpacing"))
+         && p_ref_ == break_item_)
        {
-         Item *it  = make_item ("StaffSpacing");
+         Item *it  = make_item ("StaffSpacing", SCM_EOL);
          current_spacings_.staff_spacing_ = it;
-         it->set_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);
 
          if (int i = last_spacings_.note_spacings_.size ())
            {
@@ -162,9 +163,8 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
            }
          else if (last_spacings_.staff_spacing_)
            {
-             
              last_spacings_.staff_spacing_->set_property ("right-items",
-                                                               gh_cons (break_item_->self_scm(), SCM_EOL));
+                                                               scm_cons (break_item_->self_scm (), SCM_EOL));
            }
        }
     }
@@ -179,7 +179,7 @@ void
 Separating_line_group_engraver::start_translation_timestep ()
 {
   if (break_item_)
-    daddy_context_->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+    context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
   break_item_ =0;
 }
 
@@ -223,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");