X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=234008d9830bcac736edd19ad69459a3a7931b67;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=c63ff065ed7f76764332339dcd7677dd9ab803fc;hpb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;p=lilypond.git

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index c63ff065ed..234008d983 100644
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -59,8 +59,8 @@ protected:
   Spacings current_spacings_;
   Spacings last_spacings_;
 
-  DECLARE_ACKNOWLEDGER (item);
-  DECLARE_ACKNOWLEDGER (break_aligned);
+  void acknowledge_item (Grob_info);
+  void acknowledge_break_aligned (Grob_info);
   void stop_translation_timestep ();
   void start_translation_timestep ();
 
@@ -69,7 +69,8 @@ public:
   TRANSLATOR_DECLARATIONS (Separating_line_group_engraver);
 };
 
-Separating_line_group_engraver::Separating_line_group_engraver ()
+Separating_line_group_engraver::Separating_line_group_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
@@ -78,7 +79,7 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
 {
   Item *it = i.item ();
 
-  if (Note_spacing::has_interface (it))
+  if (has_interface<Note_spacing> (it))
     {
       current_spacings_.note_spacings_.push_back (it);
       return;
@@ -88,7 +89,7 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
       && !current_spacings_.staff_spacing_
       && to_boolean (get_property ("createSpacing")))
     {
-      Grob *col = Grob::unsmob (get_property ("currentCommandColumn"));
+      Grob *col = unsmob<Grob> (get_property ("currentCommandColumn"));
 
       current_spacings_.staff_spacing_ = make_item ("StaffSpacing", SCM_EOL);
       context ()->set_property ("hasStaffSpacing", SCM_BOOL_T);
@@ -101,12 +102,12 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
           && last_spacings_.staff_spacing_)
         {
           SCM ri = last_spacings_.staff_spacing_->get_object ("right-items");
-          Grob_array *ga = Grob_array::unsmob (ri);
+          Grob_array *ga = unsmob<Grob_array> (ri);
           if (!ga)
             {
               SCM ga_scm = Grob_array::make_array ();
               last_spacings_.staff_spacing_->set_object ("right-items", ga_scm);
-              ga = Grob_array::unsmob (ga_scm);
+              ga = unsmob<Grob_array> (ga_scm);
             }
 
           ga->clear ();
@@ -146,15 +147,20 @@ Separating_line_group_engraver::stop_translation_timestep ()
     last_spacings_ = current_spacings_;
 
   if (Item *sp = current_spacings_.staff_spacing_)
-    if (Grob *col = Grob::unsmob (get_property ("currentMusicalColumn")))
+    if (Grob *col = unsmob<Grob> (get_property ("currentMusicalColumn")))
       Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), col);
 
   current_spacings_.clear ();
   break_aligned_.clear ();
 }
 
-ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
-ADD_ACKNOWLEDGER (Separating_line_group_engraver, break_aligned);
+
+void
+Separating_line_group_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
+  ADD_ACKNOWLEDGER (Separating_line_group_engraver, break_aligned);
+}
 
 ADD_TRANSLATOR (Separating_line_group_engraver,
                 /* doc */