* lily/output-def-scheme.cc: new file.

[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 bd880658423971aef63504a0104458f494e9de64..6844cb2b630f00b491775eb5482a2e8e4ef8f848 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -10,16 +10,13 @@
 #include "separating-group-spanner.hh"
 #include "separation-item.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "engraver.hh"
 #include "axis-group-interface.hh"
 #include "note-spacing.hh"
-#include "group-interface.hh"
 #include "accidental-placement.hh"
 #include "context.hh"
 
-
-
 struct Spacings
 {
   Item * staff_spacing_;
@@ -66,7 +63,7 @@ Separating_line_group_engraver::Separating_line_group_engraver ()
 {
   sep_span_ = 0;
   break_item_ = 0;
-  musical_item_ =0;
+  musical_item_ = 0;
 }
 
 void
@@ -75,9 +72,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")));
     }
 }
@@ -91,10 +88,9 @@ Separating_line_group_engraver::finalize ()
   Grob *column = unsmob_grob (ccol);
   
   sep_span_->set_bound (RIGHT, unsmob_grob (ccol));
-  typeset_grob (sep_span_);
-  sep_span_ =0;
+  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" ),
@@ -129,29 +125,29 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
       return ;
     }
   
-  bool ib =Item::is_breakable (it);
+  bool ib = Item::is_breakable (it);
   Item *&p_ref_ (ib ? break_item_
                 : musical_item_);
 
   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);
-         get_parent_context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
+         context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
        }
-      announce_grob (p_ref_, SCM_EOL);
+      
 
       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", scm_cons (break_item_->self_scm (), SCM_EOL));
          
-         announce_grob (it, SCM_EOL);
+         
 
          if (int i = last_spacings_.note_spacings_.size ())
            {
@@ -179,8 +175,8 @@ void
 Separating_line_group_engraver::start_translation_timestep ()
 {
   if (break_item_)
-    get_parent_context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
-  break_item_ =0;
+    context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+  break_item_ = 0;
 }
 
 void
@@ -189,7 +185,6 @@ Separating_line_group_engraver::stop_translation_timestep ()
   if (break_item_)
     {
       Separating_group_spanner::add_spacing_unit (sep_span_, break_item_);
-      typeset_grob (break_item_);
     }
   
   if (Item * sp = current_spacings_.staff_spacing_)
@@ -202,7 +197,6 @@ Separating_line_group_engraver::stop_translation_timestep ()
        Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"),
                                           musical_item_);
 
-      typeset_grob (sp);
     }
 
   
@@ -216,14 +210,13 @@ Separating_line_group_engraver::stop_translation_timestep ()
   if (musical_item_)
     {
       Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
-      typeset_grob (musical_item_);
     }
   
-  musical_item_ =0;
+  musical_item_ = 0;
 }
 
 
-ENTER_DESCRIPTION (Separating_line_group_engraver,
+ADD_TRANSLATOR (Separating_line_group_engraver,
 /* descr */       "Generates objects for computing spacing parameters.",
 /* creats*/       "SeparationItem SeparatingGroupSpanner StaffSpacing",
 /* accepts */     "",