X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-position-engraver.cc;h=b35d037a35fb0ca8442a3fc3ad90db2b264e4e53;hb=8659a99f233f5c4684292728e7ad4206669b35b0;hp=faf356052b99b57ae0944b9705f9e67a2af8a5bf;hpb=f127e14af04f474d20406ca0e0f76f05061ee103;p=lilypond.git diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc index faf356052b..b35d037a35 100644 --- a/lily/figured-bass-position-engraver.cc +++ b/lily/figured-bass-position-engraver.cc @@ -27,8 +27,6 @@ #include "translator.icc" #include "axis-group-interface.hh" -using std::vector; - class Figured_bass_position_engraver : public Engraver { TRANSLATOR_DECLARATIONS (Figured_bass_position_engraver); @@ -38,12 +36,12 @@ class Figured_bass_position_engraver : public Engraver vector support_; vector span_support_; protected: - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (slur); - DECLARE_END_ACKNOWLEDGER (slur); - DECLARE_END_ACKNOWLEDGER (tie); - DECLARE_ACKNOWLEDGER (bass_figure_alignment); - DECLARE_END_ACKNOWLEDGER (bass_figure_alignment); + void acknowledge_note_column (Grob_info); + void acknowledge_slur (Grob_info); + void acknowledge_end_slur (Grob_info); + void acknowledge_end_tie (Grob_info); + void acknowledge_bass_figure_alignment (Grob_info); + void acknowledge_end_bass_figure_alignment (Grob_info); virtual void finalize (); void start_spanner (); @@ -51,7 +49,8 @@ protected: void stop_translation_timestep (); }; -Figured_bass_position_engraver::Figured_bass_position_engraver () +Figured_bass_position_engraver::Figured_bass_position_engraver (Context *c) + : Engraver (c) { positioner_ = 0; bass_figure_alignment_ = 0; @@ -140,13 +139,18 @@ Figured_bass_position_engraver::acknowledge_bass_figure_alignment (Grob_info inf start_spanner (); } -ADD_ACKNOWLEDGER (Figured_bass_position_engraver, note_column); -ADD_ACKNOWLEDGER (Figured_bass_position_engraver, slur); -ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, slur); -ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, tie); -ADD_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment); -ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment); + +void +Figured_bass_position_engraver::boot () +{ + ADD_ACKNOWLEDGER (Figured_bass_position_engraver, note_column); + ADD_ACKNOWLEDGER (Figured_bass_position_engraver, slur); + ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, slur); + ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, tie); + ADD_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment); + ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment); +} ADD_TRANSLATOR (Figured_bass_position_engraver, /* doc */