X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-align-engraver.cc;h=0d07872db08b18eeb82ad7aef6a1d6747879908a;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=4c984f253e7b32b31a87080528be0242a78c3e48;hpb=9066eeede909ace56324c905217c5b585ba42f90;p=lilypond.git diff --git a/lily/piano-pedal-align-engraver.cc b/lily/piano-pedal-align-engraver.cc index 4c984f253e..0d07872db0 100644 --- a/lily/piano-pedal-align-engraver.cc +++ b/lily/piano-pedal-align-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2014 Han-Wen Nienhuys + Copyright (C) 2006--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -27,6 +27,8 @@ #include "warn.hh" #include "axis-group-interface.hh" +#include "translator.icc" + /* TODO: @@ -74,11 +76,11 @@ public: protected: virtual void finalize (); - DECLARE_ACKNOWLEDGER (piano_pedal_script); - DECLARE_ACKNOWLEDGER (piano_pedal_bracket); - DECLARE_ACKNOWLEDGER (note_column); + void acknowledge_piano_pedal_script (Grob_info); + void acknowledge_piano_pedal_bracket (Grob_info); + void acknowledge_note_column (Grob_info); - DECLARE_END_ACKNOWLEDGER (piano_pedal_bracket); + void acknowledge_end_piano_pedal_bracket (Grob_info); void stop_translation_timestep (); void start_translation_timestep (); @@ -98,7 +100,8 @@ private: Spanner *make_line_spanner (Pedal_type t, SCM); }; -Piano_pedal_align_engraver::Piano_pedal_align_engraver () +Piano_pedal_align_engraver::Piano_pedal_align_engraver (Context *c) + : Engraver (c) { } @@ -238,7 +241,7 @@ Piano_pedal_align_engraver::finalize () if (pedal_info_[i].line_spanner_) { SCM cc = get_property ("currentCommandColumn"); - Item *c = Item::unsmob (cc); + Item *c = unsmob (cc); pedal_info_[i].line_spanner_->set_bound (RIGHT, c); pedal_info_[i].clear (); @@ -246,13 +249,16 @@ Piano_pedal_align_engraver::finalize () } } -#include "translator.icc" -ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, note_column); -ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_bracket); -ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_script); -ADD_END_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_bracket); +void +Piano_pedal_align_engraver::boot () +{ + ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, note_column); + ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_bracket); + ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_script); + ADD_END_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_bracket); +} ADD_TRANSLATOR (Piano_pedal_align_engraver, /* doc */