X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-spacing-engraver.cc;h=414e1ee7610cee80c76e1ead38768c21e9fbd5cb;hb=532c6ba5b3e621e741140a4b25d6fe085d489004;hp=7a7ca7275fc832a0ee978e30400eb0a4ba754d48;hpb=c054eb280fd9953596eb164f67b0f9d5555c5a32;p=lilypond.git diff --git a/lily/note-spacing-engraver.cc b/lily/note-spacing-engraver.cc index 7a7ca7275f..414e1ee761 100644 --- a/lily/note-spacing-engraver.cc +++ b/lily/note-spacing-engraver.cc @@ -40,8 +40,8 @@ class Note_spacing_engraver : public Engraver TRANSLATOR_DECLARATIONS (Note_spacing_engraver); protected: - DECLARE_ACKNOWLEDGER (rhythmic_grob); - DECLARE_ACKNOWLEDGER (note_column); + void acknowledge_rhythmic_grob (Grob_info); + void acknowledge_note_column (Grob_info); void stop_translation_timestep (); virtual void finalize (); virtual void derived_mark () const; @@ -101,9 +101,9 @@ Note_spacing_engraver::finalize () Grob *last_spacing = last_spacings_[parent]; if (last_spacing - && !Grob_array::is_smob (last_spacing->get_object ("right-items"))) + && !unsmob (last_spacing->get_object ("right-items"))) { - Grob *col = Grob::unsmob (get_property ("currentCommandColumn")); + Grob *col = unsmob (get_property ("currentCommandColumn")); Pointer_group_interface::add_grob (last_spacing, ly_symbol2scm ("right-items"), @@ -120,7 +120,7 @@ Note_spacing_engraver::stop_translation_timestep () if (last_spacing && to_boolean (get_property ("hasStaffSpacing"))) { - Grob *col = Grob::unsmob (get_property ("currentCommandColumn")); + Grob *col = unsmob (get_property ("currentCommandColumn")); Pointer_group_interface::add_grob (last_spacing, ly_symbol2scm ("right-items"), col); @@ -135,8 +135,13 @@ Note_spacing_engraver::stop_translation_timestep () } -ADD_ACKNOWLEDGER (Note_spacing_engraver, note_column); -ADD_ACKNOWLEDGER (Note_spacing_engraver, rhythmic_grob); + +void +Note_spacing_engraver::boot () +{ + ADD_ACKNOWLEDGER (Note_spacing_engraver, note_column); + ADD_ACKNOWLEDGER (Note_spacing_engraver, rhythmic_grob); +} ADD_TRANSLATOR (Note_spacing_engraver, /* doc */