From: David Kastrup Date: Sun, 5 Jun 2016 16:52:47 +0000 (+0200) Subject: Issue 4884: Remove DECLARE_* translator callback macros X-Git-Tag: release/2.19.43-1~15 X-Git-Url: https://git.donarmstrong.com/lilypond.git?p=lilypond.git;a=commitdiff_plain;h=0dcde4fc13c8091439fb8e2d77ea755357a0e7ed Issue 4884: Remove DECLARE_* translator callback macros Recent changes have rendered them trivial. This does not review their accessibility status: in general, they should be protected since they can be reused by derived classes but aren't needed externally. However, where they are indeed called from static member functions of derived classes, the associated trampoline instantiation appears to require public access. This might warrant some more investigation. --- diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index c2761c11a9..665c83a4cc 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -40,7 +40,7 @@ class Ambitus_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Ambitus_engraver); protected: - DECLARE_ACKNOWLEDGER (note_head); + void acknowledge_note_head (Grob_info); void process_music (); void stop_translation_timestep (); diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index 44eb2580a3..d308a43068 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -43,7 +43,7 @@ public: protected: void process_music (); void stop_translation_timestep (); - DECLARE_TRANSLATOR_LISTENER (arpeggio); + void listen_arpeggio (Stream_event *); private: Item *arpeggio_; Stream_event *arpeggio_event_; diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index a68e1b9f06..148ed44c77 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -45,12 +45,12 @@ protected: virtual void finalize (); virtual void derived_mark () const; - DECLARE_ACKNOWLEDGER (rest); - DECLARE_ACKNOWLEDGER (beam); - DECLARE_ACKNOWLEDGER (bar_line); - DECLARE_ACKNOWLEDGER (breathing_sign); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_TRANSLATOR_LISTENER (beam_forbid); + void acknowledge_rest (Grob_info); + void acknowledge_beam (Grob_info); + void acknowledge_bar_line (Grob_info); + void acknowledge_breathing_sign (Grob_info); + void acknowledge_stem (Grob_info); + void listen_beam_forbid (Stream_event *); private: virtual bool test_moment (Direction, Moment, Moment); @@ -580,7 +580,7 @@ class Grace_auto_beam_engraver : public Auto_beam_engraver { TRANSLATOR_DECLARATIONS (Grace_auto_beam_engraver); TRANSLATOR_INHERIT (Auto_beam_engraver) - DECLARE_TRANSLATOR_LISTENER (beam_forbid); + void listen_beam_forbid (Stream_event *); private: Moment last_grace_start_; // Full starting time of last grace group diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 49350d01cf..2bc4858479 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -43,7 +43,7 @@ protected: void process_music (); virtual void initialize (); virtual void finalize (); - DECLARE_ACKNOWLEDGER (grob); + void acknowledge_grob (Grob_info); void process_acknowledged (); virtual Spanner *get_spanner (); virtual void add_element (Grob *); diff --git a/lily/balloon-engraver.cc b/lily/balloon-engraver.cc index 5155d98518..4f0f136db0 100644 --- a/lily/balloon-engraver.cc +++ b/lily/balloon-engraver.cc @@ -28,8 +28,8 @@ class Balloon_engraver : public Engraver { TRANSLATOR_DECLARATIONS (Balloon_engraver); - DECLARE_TRANSLATOR_LISTENER (annotate_output); - DECLARE_ACKNOWLEDGER (grob); + void listen_annotate_output (Stream_event *); + void acknowledge_grob (Grob_info); vector events_; void stop_translation_timestep (); diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 97972d046c..8feb63dd13 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -38,7 +38,7 @@ protected: void stop_translation_timestep (); void process_acknowledged (); - DECLARE_END_ACKNOWLEDGER (spanner); + void acknowledge_end_spanner (Grob_info); private: void create_bar (); diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 75c192f284..1af5f19da1 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -45,8 +45,8 @@ protected: protected: void stop_translation_timestep (); - DECLARE_TRANSLATOR_LISTENER (alternative); - DECLARE_ACKNOWLEDGER (break_alignment); + void listen_alternative (Stream_event *); + void acknowledge_break_alignment (Grob_info); void process_music (); void create_items (); TRANSLATOR_DECLARATIONS (Bar_number_engraver); diff --git a/lily/beam-collision-engraver.cc b/lily/beam-collision-engraver.cc index 0ca0e0cf65..31f96b72b1 100644 --- a/lily/beam-collision-engraver.cc +++ b/lily/beam-collision-engraver.cc @@ -30,15 +30,15 @@ protected: vector beams_; vector covered_grobs_; - DECLARE_ACKNOWLEDGER (note_head); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (clef); - DECLARE_ACKNOWLEDGER (clef_modifier); - DECLARE_ACKNOWLEDGER (key_signature); - DECLARE_ACKNOWLEDGER (time_signature); - DECLARE_ACKNOWLEDGER (beam); - DECLARE_ACKNOWLEDGER (flag); + void acknowledge_note_head (Grob_info); + void acknowledge_stem (Grob_info); + void acknowledge_accidental (Grob_info); + void acknowledge_clef (Grob_info); + void acknowledge_clef_modifier (Grob_info); + void acknowledge_key_signature (Grob_info); + void acknowledge_time_signature (Grob_info); + void acknowledge_beam (Grob_info); + void acknowledge_flag (Grob_info); virtual void finalize (); diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 019d68db48..c9e9a12d49 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -38,8 +38,8 @@ class Beam_engraver : public Engraver { public: - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (rest); + void acknowledge_stem (Grob_info); + void acknowledge_rest (Grob_info); protected: Stream_event *start_ev_; @@ -77,7 +77,7 @@ protected: virtual bool valid_start_point (); virtual bool valid_end_point (); - DECLARE_TRANSLATOR_LISTENER (beam); + void listen_beam (Stream_event *); public: TRANSLATOR_DECLARATIONS (Beam_engraver); }; @@ -343,7 +343,7 @@ class Grace_beam_engraver : public Beam_engraver public: TRANSLATOR_DECLARATIONS (Grace_beam_engraver); TRANSLATOR_INHERIT (Beam_engraver); - DECLARE_TRANSLATOR_LISTENER (beam); + void listen_beam (Stream_event *); protected: virtual bool valid_start_point (); diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc index 0d658dd6b8..0970e8b5e7 100644 --- a/lily/beam-performer.cc +++ b/lily/beam-performer.cc @@ -35,7 +35,7 @@ protected: void start_translation_timestep (); void process_music (); void set_melisma (bool); - DECLARE_TRANSLATOR_LISTENER (beam); + void listen_beam (Stream_event *); private: Stream_event *start_ev_; Stream_event *now_stop_ev_; diff --git a/lily/bend-engraver.cc b/lily/bend-engraver.cc index 87d13c68ec..83c98a94e0 100644 --- a/lily/bend-engraver.cc +++ b/lily/bend-engraver.cc @@ -29,10 +29,10 @@ class Bend_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Bend_engraver); - DECLARE_ACKNOWLEDGER (note_head); + void acknowledge_note_head (Grob_info); protected: - DECLARE_TRANSLATOR_LISTENER (bend_after); + void listen_bend_after (Stream_event *); void finalize (); void process_music (); void stop_translation_timestep (); diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 52e4eda0c5..55a638da87 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -40,8 +40,8 @@ protected: virtual void derived_mark () const; public: TRANSLATOR_DECLARATIONS (Break_align_engraver); - DECLARE_ACKNOWLEDGER (break_aligned); - DECLARE_ACKNOWLEDGER (break_alignable); + void acknowledge_break_aligned (Grob_info); + void acknowledge_break_alignable (Grob_info); }; void diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index 0ee8cabe77..ade1b15f29 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -39,7 +39,7 @@ protected: void process_music (); void stop_translation_timestep (); - DECLARE_TRANSLATOR_LISTENER (breathing); + void listen_breathing (Stream_event *); private: Stream_event *breathing_sign_event_; Grob *breathing_sign_; diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 2f4def8116..3a14ff4b07 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -39,8 +39,8 @@ protected: void stop_translation_timestep (); void process_music (); virtual void finalize (); - DECLARE_TRANSLATOR_LISTENER (note); - DECLARE_TRANSLATOR_LISTENER (rest); + void listen_note (Stream_event *); + void listen_rest (Stream_event *); private: vector notes_; diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 9e704a222a..7a17c1350e 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -62,8 +62,8 @@ protected: protected: virtual void finalize (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (tremolo_span); - DECLARE_ACKNOWLEDGER (stem); + void listen_tremolo_span (Stream_event *); + void acknowledge_stem (Grob_info); }; Chord_tremolo_engraver::Chord_tremolo_engraver () diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 75adb6e3ee..00b3c3e55a 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -39,7 +39,7 @@ public: protected: void stop_translation_timestep (); void process_music (); - DECLARE_ACKNOWLEDGER (bar_line); + void acknowledge_bar_line (Grob_info); virtual void derived_mark () const; private: diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc index eac15a7690..0c84d1cb65 100644 --- a/lily/cluster-engraver.cc +++ b/lily/cluster-engraver.cc @@ -34,8 +34,8 @@ class Cluster_spanner_engraver : public Engraver protected: TRANSLATOR_DECLARATIONS (Cluster_spanner_engraver); - DECLARE_TRANSLATOR_LISTENER (cluster_note); - DECLARE_ACKNOWLEDGER (note_column); + void listen_cluster_note (Stream_event *); + void acknowledge_note_column (Grob_info); void stop_translation_timestep (); virtual void process_music (); virtual void finalize (); diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index 034726def9..ca6a52d320 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -31,7 +31,7 @@ class Collision_engraver : public Engraver vector note_columns_; protected: - DECLARE_ACKNOWLEDGER (note_column); + void acknowledge_note_column (Grob_info); void process_acknowledged (); void stop_translation_timestep (); public: diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index e7a5dbc560..ef3a5012a2 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -80,7 +80,7 @@ protected: void start_translation_timestep (); void process_music (); void stop_translation_timestep (); - DECLARE_TRANSLATOR_LISTENER (note); + void listen_note (Stream_event *); }; void diff --git a/lily/completion-rest-engraver.cc b/lily/completion-rest-engraver.cc index 2f9dc56030..2b5693916e 100644 --- a/lily/completion-rest-engraver.cc +++ b/lily/completion-rest-engraver.cc @@ -76,7 +76,7 @@ protected: void start_translation_timestep (); void process_music (); void stop_translation_timestep (); - DECLARE_TRANSLATOR_LISTENER (rest); + void listen_rest (Stream_event *); }; void diff --git a/lily/concurrent-hairpin-engraver.cc b/lily/concurrent-hairpin-engraver.cc index 0fb9a13d0f..3fdf6524c2 100644 --- a/lily/concurrent-hairpin-engraver.cc +++ b/lily/concurrent-hairpin-engraver.cc @@ -34,8 +34,8 @@ public: TRANSLATOR_DECLARATIONS (Concurrent_hairpin_engraver); protected: - DECLARE_ACKNOWLEDGER (hairpin); - DECLARE_END_ACKNOWLEDGER (hairpin); + void acknowledge_hairpin (Grob_info); + void acknowledge_end_hairpin (Grob_info); void stop_translation_timestep (); void finalize (); diff --git a/lily/cue-clef-engraver.cc b/lily/cue-clef-engraver.cc index 771eea4b79..53640afadc 100644 --- a/lily/cue-clef-engraver.cc +++ b/lily/cue-clef-engraver.cc @@ -41,7 +41,7 @@ public: protected: void stop_translation_timestep (); void process_music (); - DECLARE_ACKNOWLEDGER (bar_line); + void acknowledge_bar_line (Grob_info); virtual void derived_mark () const; private: diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index 517e53aece..a21ad4eb78 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -39,8 +39,8 @@ class Custos_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Custos_engraver); void start_translation_timestep (); - DECLARE_ACKNOWLEDGER (bar); - DECLARE_ACKNOWLEDGER (note_head); + void acknowledge_bar (Grob_info); + void acknowledge_note_head (Grob_info); void process_acknowledged (); void stop_translation_timestep (); virtual void finalize (); diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc index a300b6f3a1..c5c8001524 100644 --- a/lily/dot-column-engraver.cc +++ b/lily/dot-column-engraver.cc @@ -32,7 +32,7 @@ public: protected: - DECLARE_ACKNOWLEDGER (rhythmic_head); + void acknowledge_rhythmic_head (Grob_info); void stop_translation_timestep (); }; diff --git a/lily/dots-engraver.cc b/lily/dots-engraver.cc index 4bf379124d..cbd6c718a9 100644 --- a/lily/dots-engraver.cc +++ b/lily/dots-engraver.cc @@ -27,7 +27,7 @@ class Dots_engraver : public Engraver { - DECLARE_ACKNOWLEDGER (rhythmic_head); + void acknowledge_rhythmic_head (Grob_info); TRANSLATOR_DECLARATIONS (Dots_engraver); }; diff --git a/lily/double-percent-repeat-engraver.cc b/lily/double-percent-repeat-engraver.cc index f50f8f8108..d1717f8314 100644 --- a/lily/double-percent-repeat-engraver.cc +++ b/lily/double-percent-repeat-engraver.cc @@ -38,7 +38,7 @@ protected: // moment (global time) where percent started Moment start_mom_; - DECLARE_TRANSLATOR_LISTENER (double_percent); + void listen_double_percent (Stream_event *); void process_music (); }; diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index d78e2ba3d1..16b089cb70 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -43,9 +43,9 @@ public: protected: void process_music (); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_TRANSLATOR_LISTENER (note); + void acknowledge_stem (Grob_info); + void acknowledge_note_column (Grob_info); + void listen_note (Stream_event *); void stop_translation_timestep (); }; diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index 88c1a61d05..93f648f3d7 100644 --- a/lily/drum-note-performer.cc +++ b/lily/drum-note-performer.cc @@ -33,7 +33,7 @@ public: protected: void stop_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (note); + void listen_note (Stream_event *); private: vector note_evs_; }; diff --git a/lily/dynamic-align-engraver.cc b/lily/dynamic-align-engraver.cc index 29f35b4f61..c276e21759 100644 --- a/lily/dynamic-align-engraver.cc +++ b/lily/dynamic-align-engraver.cc @@ -34,11 +34,11 @@ class Dynamic_align_engraver : public Engraver { TRANSLATOR_DECLARATIONS (Dynamic_align_engraver); - DECLARE_ACKNOWLEDGER (rhythmic_head); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (dynamic); - DECLARE_ACKNOWLEDGER (footnote_spanner); - DECLARE_END_ACKNOWLEDGER (dynamic); + void acknowledge_rhythmic_head (Grob_info); + void acknowledge_stem (Grob_info); + void acknowledge_dynamic (Grob_info); + void acknowledge_footnote_spanner (Grob_info); + void acknowledge_end_dynamic (Grob_info); protected: virtual void stop_translation_timestep (); diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 6df34baf67..5d4ef33de3 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -33,10 +33,10 @@ class Dynamic_engraver : public Engraver { TRANSLATOR_DECLARATIONS (Dynamic_engraver); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); - DECLARE_TRANSLATOR_LISTENER (span_dynamic); - DECLARE_TRANSLATOR_LISTENER (break_span); + void acknowledge_note_column (Grob_info); + void listen_absolute_dynamic (Stream_event *); + void listen_span_dynamic (Stream_event *); + void listen_break_span (Stream_event *); protected: virtual void process_music (); diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc index 567184412e..46a8a446d3 100644 --- a/lily/dynamic-performer.cc +++ b/lily/dynamic-performer.cc @@ -33,9 +33,9 @@ protected: void process_music (); Real equalize_volume (Real); - DECLARE_TRANSLATOR_LISTENER (decrescendo); - DECLARE_TRANSLATOR_LISTENER (crescendo); - DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); + void listen_decrescendo (Stream_event *); + void listen_crescendo (Stream_event *); + void listen_absolute_dynamic (Stream_event *); private: Stream_event *script_event_; Drul_array span_events_; diff --git a/lily/episema-engraver.cc b/lily/episema-engraver.cc index dbbda29130..d2fc2f398f 100644 --- a/lily/episema-engraver.cc +++ b/lily/episema-engraver.cc @@ -33,9 +33,9 @@ public: TRANSLATOR_DECLARATIONS (Episema_engraver); protected: virtual void finalize (); - DECLARE_TRANSLATOR_LISTENER (episema); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (note_head); + void listen_episema (Stream_event *); + void acknowledge_note_column (Grob_info); + void acknowledge_note_head (Grob_info); void stop_translation_timestep (); void process_music (); diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 2d96c400b6..39fa7788de 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -43,9 +43,9 @@ public: TRANSLATOR_DECLARATIONS (Extender_engraver); protected: - DECLARE_TRANSLATOR_LISTENER (extender); - DECLARE_TRANSLATOR_LISTENER (completize_extender); - DECLARE_ACKNOWLEDGER (lyric_syllable); + void listen_extender (Stream_event *); + void listen_completize_extender (Stream_event *); + void acknowledge_lyric_syllable (Grob_info); virtual void finalize (); diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc index e9bd19291c..9785f3fef4 100644 --- a/lily/figured-bass-engraver.cc +++ b/lily/figured-bass-engraver.cc @@ -122,8 +122,8 @@ protected: Moment stop_moment_; bool have_rest_; - DECLARE_TRANSLATOR_LISTENER (rest); - DECLARE_TRANSLATOR_LISTENER (bass_figure); + void listen_rest (Stream_event *); + void listen_bass_figure (Stream_event *); virtual void derived_mark () const; diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc index 9dadfc58ce..66fabb1ffb 100644 --- a/lily/figured-bass-position-engraver.cc +++ b/lily/figured-bass-position-engraver.cc @@ -36,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 (); diff --git a/lily/fingering-column-engraver.cc b/lily/fingering-column-engraver.cc index 466d8e281c..a2a37143b3 100644 --- a/lily/fingering-column-engraver.cc +++ b/lily/fingering-column-engraver.cc @@ -37,7 +37,7 @@ class Fingering_column_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Fingering_column_engraver); protected: - DECLARE_ACKNOWLEDGER (finger); + void acknowledge_finger (Grob_info); void process_acknowledged (); void stop_translation_timestep (); }; diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index 4e5a6577fa..8de44e9698 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -38,10 +38,10 @@ public: protected: void stop_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (fingering); - DECLARE_ACKNOWLEDGER (rhythmic_head); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (flag); + void listen_fingering (Stream_event *); + void acknowledge_rhythmic_head (Grob_info); + void acknowledge_stem (Grob_info); + void acknowledge_flag (Grob_info); private: void make_script (Direction, Stream_event *, int); diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc index 6618c6d482..4dfd24d014 100644 --- a/lily/font-size-engraver.cc +++ b/lily/font-size-engraver.cc @@ -25,7 +25,7 @@ class Font_size_engraver : public Engraver TRANSLATOR_DECLARATIONS (Font_size_engraver); protected: - DECLARE_ACKNOWLEDGER (font); + void acknowledge_font (Grob_info); void process_music (); Real size; private: diff --git a/lily/footnote-engraver.cc b/lily/footnote-engraver.cc index 857d08fcef..e80d9b64ce 100644 --- a/lily/footnote-engraver.cc +++ b/lily/footnote-engraver.cc @@ -33,8 +33,8 @@ class Footnote_engraver : public Engraver { TRANSLATOR_DECLARATIONS (Footnote_engraver); - DECLARE_ACKNOWLEDGER (grob); - DECLARE_END_ACKNOWLEDGER (grob); + void acknowledge_grob (Grob_info); + void acknowledge_end_grob (Grob_info); vector > annotated_spanners_; diff --git a/lily/fretboard-engraver.cc b/lily/fretboard-engraver.cc index 239ee54eb6..18843fc87c 100644 --- a/lily/fretboard-engraver.cc +++ b/lily/fretboard-engraver.cc @@ -48,9 +48,9 @@ protected: void stop_translation_timestep (); void process_music (); virtual void derived_mark () const; - DECLARE_TRANSLATOR_LISTENER (note); - DECLARE_TRANSLATOR_LISTENER (string_number); - DECLARE_TRANSLATOR_LISTENER (fingering); + void listen_note (Stream_event *); + void listen_string_number (Stream_event *); + void listen_fingering (Stream_event *); private: SCM last_placements_; diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc index 853ba8f279..878e7f88b3 100644 --- a/lily/glissando-engraver.cc +++ b/lily/glissando-engraver.cc @@ -35,8 +35,8 @@ public: TRANSLATOR_DECLARATIONS (Glissando_engraver); protected: - DECLARE_TRANSLATOR_LISTENER (glissando); - DECLARE_ACKNOWLEDGER (note_column); + void listen_glissando (Stream_event *); + void acknowledge_note_column (Grob_info); virtual void finalize (); void stop_translation_timestep (); diff --git a/lily/grid-line-span-engraver.cc b/lily/grid-line-span-engraver.cc index e27e502c07..efecf67622 100644 --- a/lily/grid-line-span-engraver.cc +++ b/lily/grid-line-span-engraver.cc @@ -31,7 +31,7 @@ class Grid_line_span_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Grid_line_span_engraver); protected: - DECLARE_ACKNOWLEDGER (grid_point); + void acknowledge_grid_point (Grob_info); void stop_translation_timestep (); }; diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index 4c388c5145..25392a4355 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -42,7 +42,7 @@ public: TRANSLATOR_DECLARATIONS (Grob_pq_engraver); protected: virtual void initialize (); - DECLARE_ACKNOWLEDGER (grob); + void acknowledge_grob (Grob_info); void start_translation_timestep (); void stop_translation_timestep (); void process_acknowledged (); diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc index 2e7f2b6294..d50146a2d0 100644 --- a/lily/horizontal-bracket-engraver.cc +++ b/lily/horizontal-bracket-engraver.cc @@ -39,8 +39,8 @@ public: void stop_translation_timestep (); void process_music (); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_TRANSLATOR_LISTENER (note_grouping); + void acknowledge_note_column (Grob_info); + void listen_note_grouping (Stream_event *); }; Horizontal_bracket_engraver::Horizontal_bracket_engraver () diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index ef1013b979..19ff388963 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -42,8 +42,8 @@ public: protected: - DECLARE_ACKNOWLEDGER (lyric_syllable); - DECLARE_TRANSLATOR_LISTENER (hyphen); + void acknowledge_lyric_syllable (Grob_info); + void listen_hyphen (Stream_event *); virtual void finalize (); diff --git a/lily/include/ligature-engraver.hh b/lily/include/ligature-engraver.hh index 0c45f8c225..726496e91f 100644 --- a/lily/include/ligature-engraver.hh +++ b/lily/include/ligature-engraver.hh @@ -30,8 +30,8 @@ protected: void stop_translation_timestep (); virtual void finalize (); - DECLARE_ACKNOWLEDGER (rest); - DECLARE_ACKNOWLEDGER (ligature_head); + void acknowledge_rest (Grob_info); + void acknowledge_ligature_head (Grob_info); virtual void listen_ligature (Stream_event *ev); void process_music (); virtual Spanner *create_ligature_spanner () = 0; diff --git a/lily/include/paper-column-engraver.hh b/lily/include/paper-column-engraver.hh index 1279ff17c9..a176fc48eb 100644 --- a/lily/include/paper-column-engraver.hh +++ b/lily/include/paper-column-engraver.hh @@ -42,12 +42,12 @@ protected: virtual void initialize (); virtual void finalize (); - DECLARE_TRANSLATOR_LISTENER (break); - DECLARE_TRANSLATOR_LISTENER (label); + void listen_break (Stream_event *); + void listen_label (Stream_event *); - DECLARE_ACKNOWLEDGER (item); - DECLARE_ACKNOWLEDGER (note_spacing); - DECLARE_ACKNOWLEDGER (staff_spacing); + void acknowledge_item (Grob_info); + void acknowledge_note_spacing (Grob_info); + void acknowledge_staff_spacing (Grob_info); System *system_; vector break_events_; diff --git a/lily/include/slur-proto-engraver.hh b/lily/include/slur-proto-engraver.hh index 4ffeb6007f..22d773de41 100644 --- a/lily/include/slur-proto-engraver.hh +++ b/lily/include/slur-proto-engraver.hh @@ -54,14 +54,14 @@ protected: const char* event_name_; virtual SCM event_symbol () = 0; - DECLARE_ACKNOWLEDGER (inline_accidental); - DECLARE_ACKNOWLEDGER (fingering); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (script); - DECLARE_ACKNOWLEDGER (dots); - DECLARE_ACKNOWLEDGER (text_script); - DECLARE_END_ACKNOWLEDGER (tie); - DECLARE_ACKNOWLEDGER (tuplet_number); + void acknowledge_inline_accidental (Grob_info); + void acknowledge_fingering (Grob_info); + void acknowledge_note_column (Grob_info); + void acknowledge_script (Grob_info); + void acknowledge_dots (Grob_info); + void acknowledge_text_script (Grob_info); + void acknowledge_end_tie (Grob_info); + void acknowledge_tuplet_number (Grob_info); void listen_note (Stream_event *ev); void listen_slur (Stream_event *ev, Stream_event *note = 0); diff --git a/lily/include/translator.hh b/lily/include/translator.hh index d10e8d41ec..2d3199c76b 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -77,15 +77,6 @@ public: \ } \ /* end #define */ -#define DECLARE_TRANSLATOR_LISTENER(m) \ -public: \ -inline void listen_ ## m (Stream_event *); \ -/* Should be private */ \ -static void _internal_declare_ ## m (); - -#define DECLARE_ACKNOWLEDGER(x) public : void acknowledge_ ## x (Grob_info); protected: -#define DECLARE_END_ACKNOWLEDGER(x) public : void acknowledge_end_ ## x (Grob_info); protected: - enum Translator_precompute_index { START_TRANSLATION_TIMESTEP, diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index a0263d930f..ec37d6bcbf 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -43,7 +43,7 @@ protected: vector backup_axis_groups_; virtual void finalize (); - DECLARE_ACKNOWLEDGER (axis_group); + void acknowledge_axis_group (Grob_info); void process_music (); void start_spanner (); void consider_start_spanner (); diff --git a/lily/keep-alive-together-engraver.cc b/lily/keep-alive-together-engraver.cc index 83699da593..9b1cbe4a23 100644 --- a/lily/keep-alive-together-engraver.cc +++ b/lily/keep-alive-together-engraver.cc @@ -31,7 +31,7 @@ class Keep_alive_together_engraver: public Engraver public: TRANSLATOR_DECLARATIONS (Keep_alive_together_engraver); - DECLARE_ACKNOWLEDGER (hara_kiri_group_spanner); + void acknowledge_hara_kiri_group_spanner (Grob_info); virtual void finalize (); }; diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 635f293120..8c907dc7cc 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -46,9 +46,9 @@ protected: void stop_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (key_change); - DECLARE_ACKNOWLEDGER (clef); - DECLARE_ACKNOWLEDGER (bar_line); + void listen_key_change (Stream_event *); + void acknowledge_clef (Grob_info); + void acknowledge_bar_line (Grob_info); }; void diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 568357573d..219454115a 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -36,7 +36,7 @@ protected: void process_music (); void stop_translation_timestep (); - DECLARE_TRANSLATOR_LISTENER (key_change); + void listen_key_change (Stream_event *); private: Stream_event *key_ev_; Audio_key *audio_; diff --git a/lily/kievan-ligature-engraver.cc b/lily/kievan-ligature-engraver.cc index 42c48a551e..8934800cdf 100644 --- a/lily/kievan-ligature-engraver.cc +++ b/lily/kievan-ligature-engraver.cc @@ -36,7 +36,7 @@ protected: virtual Spanner *create_ligature_spanner (); virtual void build_ligature (Spanner *ligature, vector const &primitives); - DECLARE_TRANSLATOR_LISTENER (ligature); + void listen_ligature (Stream_event *); public: TRANSLATOR_DECLARATIONS (Kievan_ligature_engraver); diff --git a/lily/laissez-vibrer-engraver.cc b/lily/laissez-vibrer-engraver.cc index 11e379aeed..e84ea36bca 100644 --- a/lily/laissez-vibrer-engraver.cc +++ b/lily/laissez-vibrer-engraver.cc @@ -32,9 +32,9 @@ class Laissez_vibrer_engraver : public Engraver vector lv_ties_; void stop_translation_timestep (); - DECLARE_ACKNOWLEDGER (note_head); + void acknowledge_note_head (Grob_info); protected: - DECLARE_TRANSLATOR_LISTENER (laissez_vibrer); + void listen_laissez_vibrer (Stream_event *); public: TRANSLATOR_DECLARATIONS (Laissez_vibrer_engraver); }; diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc index ba52d62f67..869720cca4 100644 --- a/lily/ledger-line-engraver.cc +++ b/lily/ledger-line-engraver.cc @@ -36,8 +36,8 @@ protected: virtual void finalize (); void process_music (); - DECLARE_ACKNOWLEDGER (ledgered); - DECLARE_ACKNOWLEDGER (staff_symbol); + void acknowledge_ledgered (Grob_info); + void acknowledge_staff_symbol (Grob_info); void start_spanner (); void stop_spanner (); diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc index 7c0a8d6e2f..4919071d97 100644 --- a/lily/ligature-bracket-engraver.cc +++ b/lily/ligature-bracket-engraver.cc @@ -33,9 +33,9 @@ class Ligature_bracket_engraver : public Engraver protected: virtual void process_music (); virtual void stop_translation_timestep (); - DECLARE_ACKNOWLEDGER (rest); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_TRANSLATOR_LISTENER (ligature); + void acknowledge_rest (Grob_info); + void acknowledge_note_column (Grob_info); + void listen_ligature (Stream_event *); public: TRANSLATOR_DECLARATIONS (Ligature_bracket_engraver); diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index f051cfcb0a..08c9306693 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -36,7 +36,7 @@ class Lyric_engraver : public Engraver protected: void stop_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (lyric); + void listen_lyric (Stream_event *); public: TRANSLATOR_DECLARATIONS (Lyric_engraver); diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 1215cc7d55..6a25d62a3f 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -30,7 +30,7 @@ protected: void stop_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (lyric); + void listen_lyric (Stream_event *); private: vector events_; Audio_text *audio_; diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 76105f14dc..a849ec11ce 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -54,8 +54,8 @@ protected: void stop_translation_timestep (); virtual void finalize (); - DECLARE_TRANSLATOR_LISTENER (mark); - DECLARE_ACKNOWLEDGER (break_alignment); + void listen_mark (Stream_event *); + void acknowledge_break_alignment (Grob_info); }; Mark_engraver::Mark_engraver () diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc index 71e06d1747..2ab7a7bcc6 100644 --- a/lily/measure-grouping-engraver.cc +++ b/lily/measure-grouping-engraver.cc @@ -36,7 +36,7 @@ protected: void process_music (); virtual void finalize (); - DECLARE_ACKNOWLEDGER (note_column); + void acknowledge_note_column (Grob_info); }; void diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc index e7cf07292a..a97d13755f 100644 --- a/lily/melody-engraver.cc +++ b/lily/melody-engraver.cc @@ -29,8 +29,8 @@ class Melody_engraver : public Engraver Grob *stem_; protected: - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (slur); + void acknowledge_stem (Grob_info); + void acknowledge_slur (Grob_info); TRANSLATOR_DECLARATIONS (Melody_engraver); void stop_translation_timestep (); void process_acknowledged (); diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index b6a83f7d3e..b66a3ea381 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -59,7 +59,7 @@ protected: virtual Spanner *create_ligature_spanner (); virtual void build_ligature (Spanner *ligature, vector const &primitives); - DECLARE_TRANSLATOR_LISTENER (ligature); + void listen_ligature (Stream_event *); public: TRANSLATOR_DECLARATIONS (Mensural_ligature_engraver); diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index 21aab95ee2..241a2da44a 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -46,11 +46,11 @@ protected: void stop_translation_timestep (); void process_music (); - DECLARE_ACKNOWLEDGER (break_aligned); - DECLARE_ACKNOWLEDGER (break_alignment); - DECLARE_ACKNOWLEDGER (grob); + void acknowledge_break_aligned (Grob_info); + void acknowledge_break_alignment (Grob_info); + void acknowledge_grob (Grob_info); - DECLARE_TRANSLATOR_LISTENER (tempo_change); + void listen_tempo_change (Stream_event *); }; Metronome_mark_engraver::Metronome_mark_engraver () diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index aa4a54b9e7..04ef91fc88 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -40,8 +40,8 @@ public: protected: void process_music (); void start_translation_timestep (); - DECLARE_TRANSLATOR_LISTENER (multi_measure_rest); - DECLARE_TRANSLATOR_LISTENER (multi_measure_text); + void listen_multi_measure_rest (Stream_event *); + void listen_multi_measure_text (Stream_event *); private: void add_bound_item_to_grobs (Item *); diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index abf9ce5a6b..75eccf69fc 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -71,9 +71,9 @@ public: TRANSLATOR_DECLARATIONS (New_fingering_engraver); protected: void stop_translation_timestep (); - DECLARE_ACKNOWLEDGER (rhythmic_head); - DECLARE_ACKNOWLEDGER (inline_accidental); - DECLARE_ACKNOWLEDGER (stem); + void acknowledge_rhythmic_head (Grob_info); + void acknowledge_inline_accidental (Grob_info); + void acknowledge_stem (Grob_info); void add_fingering (Grob *, SCM, vector *, Stream_event *, Stream_event *); diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index f71c8bdbe1..b09fe66361 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -39,7 +39,7 @@ public: TRANSLATOR_DECLARATIONS (Note_head_line_engraver); protected: - DECLARE_ACKNOWLEDGER (rhythmic_head); + void acknowledge_rhythmic_head (Grob_info); void process_acknowledged (); void stop_translation_timestep (); diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 244e25cedc..5839a827eb 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -41,7 +41,7 @@ public: TRANSLATOR_DECLARATIONS (Note_heads_engraver); protected: - DECLARE_TRANSLATOR_LISTENER (note); + void listen_note (Stream_event *); void process_music (); void stop_translation_timestep (); }; diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index d4494a7cb7..2b8fa87000 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -30,7 +30,7 @@ public: TRANSLATOR_DECLARATIONS (Note_name_engraver); vector events_; - DECLARE_TRANSLATOR_LISTENER (note); + void listen_note (Stream_event *); void process_music (); void stop_translation_timestep (); }; diff --git a/lily/note-performer.cc b/lily/note-performer.cc index a81c723b7b..a2ca6946e9 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -35,8 +35,8 @@ protected: void stop_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (note); - DECLARE_TRANSLATOR_LISTENER (breathing); + void listen_note (Stream_event *); + void listen_breathing (Stream_event *); private: vector note_evs_; vector notes_; diff --git a/lily/note-spacing-engraver.cc b/lily/note-spacing-engraver.cc index 29293ea7fe..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; diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index 79d054a7cc..e681e73af6 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -32,7 +32,7 @@ public: protected: virtual void finalize (); - DECLARE_ACKNOWLEDGER (note_column); + void acknowledge_note_column (Grob_info); void process_music (); void stop_translation_timestep (); diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc index b1956910b6..7a0fa2d3c3 100644 --- a/lily/output-property-engraver.cc +++ b/lily/output-property-engraver.cc @@ -31,8 +31,8 @@ class Output_property_engraver : public Engraver protected: vector props_; - DECLARE_ACKNOWLEDGER (grob); - DECLARE_TRANSLATOR_LISTENER (apply_output); + void acknowledge_grob (Grob_info); + void listen_apply_output (Stream_event *); void stop_translation_timestep (); }; diff --git a/lily/page-turn-engraver.cc b/lily/page-turn-engraver.cc index fd5b34a088..c77dc9b2a5 100644 --- a/lily/page-turn-engraver.cc +++ b/lily/page-turn-engraver.cc @@ -97,8 +97,8 @@ class Page_turn_engraver : public Engraver Grob *breakable_column (Page_turn_event const &); protected: - DECLARE_TRANSLATOR_LISTENER (break); - DECLARE_ACKNOWLEDGER (note_head); + void listen_break (Stream_event *); + void acknowledge_note_head (Grob_info); public: TRANSLATOR_DECLARATIONS (Page_turn_engraver); diff --git a/lily/parenthesis-engraver.cc b/lily/parenthesis-engraver.cc index d9dfac1825..dcbd506a4a 100644 --- a/lily/parenthesis-engraver.cc +++ b/lily/parenthesis-engraver.cc @@ -32,7 +32,7 @@ class Parenthesis_engraver : public Engraver TRANSLATOR_DECLARATIONS (Parenthesis_engraver); protected: - DECLARE_ACKNOWLEDGER (grob); + void acknowledge_grob (Grob_info); }; Parenthesis_engraver::Parenthesis_engraver () diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc index cb788f02ce..33c10f5966 100644 --- a/lily/part-combine-engraver.cc +++ b/lily/part-combine-engraver.cc @@ -34,11 +34,11 @@ class Part_combine_engraver : public Engraver TRANSLATOR_DECLARATIONS (Part_combine_engraver); protected: - DECLARE_ACKNOWLEDGER (note_head); - DECLARE_ACKNOWLEDGER (stem); + void acknowledge_note_head (Grob_info); + void acknowledge_stem (Grob_info); - DECLARE_TRANSLATOR_LISTENER (part_combine); - DECLARE_TRANSLATOR_LISTENER (note); + void listen_part_combine (Stream_event *); + void listen_note (Stream_event *); void process_music (); void stop_translation_timestep (); void create_item (Stream_event *ev); diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc index 59655a110a..b620cdccb5 100644 --- a/lily/percent-repeat-engraver.cc +++ b/lily/percent-repeat-engraver.cc @@ -50,7 +50,7 @@ protected: Moment command_moment_; virtual void finalize (); - DECLARE_TRANSLATOR_LISTENER (percent); + void listen_percent (Stream_event *); void start_translation_timestep (); void stop_translation_timestep (); diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index c694c5337d..a4e1214928 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -34,9 +34,9 @@ class Phrasing_slur_engraver : public Slur_proto_engraver { protected: - DECLARE_TRANSLATOR_LISTENER (phrasing_slur); - DECLARE_TRANSLATOR_LISTENER (note); - DECLARE_ACKNOWLEDGER (slur); + void listen_phrasing_slur (Stream_event *); + void listen_note (Stream_event *); + void acknowledge_slur (Grob_info); public: SCM event_symbol (); diff --git a/lily/piano-pedal-align-engraver.cc b/lily/piano-pedal-align-engraver.cc index 3fa7c5e479..7c120a1bc1 100644 --- a/lily/piano-pedal-align-engraver.cc +++ b/lily/piano-pedal-align-engraver.cc @@ -76,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 (); diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index d0e35713d9..cbdf5244d1 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -123,9 +123,9 @@ public: protected: virtual void initialize (); virtual void finalize (); - DECLARE_TRANSLATOR_LISTENER (sustain); - DECLARE_TRANSLATOR_LISTENER (una_corda); - DECLARE_TRANSLATOR_LISTENER (sostenuto); + void listen_sustain (Stream_event *); + void listen_una_corda (Stream_event *); + void listen_sostenuto (Stream_event *); void stop_translation_timestep (); void process_music (); diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index ba2d2b5042..a8273980e9 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -48,9 +48,9 @@ protected: void process_music (); void stop_translation_timestep (); void start_translation_timestep (); - DECLARE_TRANSLATOR_LISTENER (sustain); - DECLARE_TRANSLATOR_LISTENER (una_corda); - DECLARE_TRANSLATOR_LISTENER (sostenuto); + void listen_sustain (Stream_event *); + void listen_una_corda (Stream_event *); + void listen_sostenuto (Stream_event *); private: vector audios_; Pedal_info info_alist_[NUM_PEDAL_TYPES]; diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc index 5d403c79e4..0750c59495 100644 --- a/lily/pitch-squash-engraver.cc +++ b/lily/pitch-squash-engraver.cc @@ -28,7 +28,7 @@ class Pitch_squash_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Pitch_squash_engraver); - DECLARE_ACKNOWLEDGER (note_head); + void acknowledge_note_head (Grob_info); }; void diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc index 54ef0827a7..1ec4da9aeb 100644 --- a/lily/pitched-trill-engraver.cc +++ b/lily/pitched-trill-engraver.cc @@ -38,11 +38,11 @@ public: TRANSLATOR_DECLARATIONS (Pitched_trill_engraver); protected: - DECLARE_ACKNOWLEDGER (note_head); - DECLARE_ACKNOWLEDGER (dots); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (flag); - DECLARE_ACKNOWLEDGER (trill_spanner); + void acknowledge_note_head (Grob_info); + void acknowledge_dots (Grob_info); + void acknowledge_stem (Grob_info); + void acknowledge_flag (Grob_info); + void acknowledge_trill_spanner (Grob_info); void stop_translation_timestep (); private: diff --git a/lily/pure-from-neighbor-engraver.cc b/lily/pure-from-neighbor-engraver.cc index d5439726bb..3bd0fa1091 100644 --- a/lily/pure-from-neighbor-engraver.cc +++ b/lily/pure-from-neighbor-engraver.cc @@ -36,8 +36,8 @@ class Pure_from_neighbor_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Pure_from_neighbor_engraver); protected: - DECLARE_ACKNOWLEDGER (pure_from_neighbor); - DECLARE_ACKNOWLEDGER (item); + void acknowledge_pure_from_neighbor (Grob_info); + void acknowledge_item (Grob_info); void finalize (); }; diff --git a/lily/repeat-tie-engraver.cc b/lily/repeat-tie-engraver.cc index 6eead57309..fb2c8bb584 100644 --- a/lily/repeat-tie-engraver.cc +++ b/lily/repeat-tie-engraver.cc @@ -32,8 +32,8 @@ class Repeat_tie_engraver : public Engraver vector semi_ties_; void stop_translation_timestep (); - DECLARE_ACKNOWLEDGER (note_head); - DECLARE_TRANSLATOR_LISTENER (repeat_tie); + void acknowledge_note_head (Grob_info); + void listen_repeat_tie (Stream_event *); public: TRANSLATOR_DECLARATIONS (Repeat_tie_engraver); diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 64ff97a35f..d691c2e98c 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -37,7 +37,7 @@ class Rest_engraver : public Engraver protected: void start_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (rest); + void listen_rest (Stream_event *); public: TRANSLATOR_DECLARATIONS (Rest_engraver); }; diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index d6e461060b..04281231d5 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -61,9 +61,9 @@ class Rhythmic_column_engraver : public Engraver TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver); protected: - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (flag); - DECLARE_ACKNOWLEDGER (rhythmic_head); + void acknowledge_stem (Grob_info); + void acknowledge_flag (Grob_info); + void acknowledge_rhythmic_head (Grob_info); void process_acknowledged (); void stop_translation_timestep (); }; diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 8caf8b903c..6310f3b540 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -35,7 +35,7 @@ class Script_column_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Script_column_engraver); protected: - DECLARE_ACKNOWLEDGER (side_position); + void acknowledge_side_position (Grob_info); void process_acknowledged (); void stop_translation_timestep (); }; diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 578ed84ad4..8a7b122f1f 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -54,14 +54,14 @@ protected: void stop_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (articulation); - DECLARE_ACKNOWLEDGER (rhythmic_head); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (stem_tremolo); - DECLARE_ACKNOWLEDGER (tie); - DECLARE_END_ACKNOWLEDGER (tie); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (inline_accidental); + void listen_articulation (Stream_event *); + void acknowledge_rhythmic_head (Grob_info); + void acknowledge_stem (Grob_info); + void acknowledge_stem_tremolo (Grob_info); + void acknowledge_tie (Grob_info); + void acknowledge_end_tie (Grob_info); + void acknowledge_note_column (Grob_info); + void acknowledge_inline_accidental (Grob_info); public: TRANSLATOR_DECLARATIONS (Script_engraver); diff --git a/lily/script-row-engraver.cc b/lily/script-row-engraver.cc index 390cba5f96..20af8d1cbb 100644 --- a/lily/script-row-engraver.cc +++ b/lily/script-row-engraver.cc @@ -39,8 +39,8 @@ class Script_row_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Script_row_engraver); protected: - DECLARE_ACKNOWLEDGER (accidental_placement); - DECLARE_ACKNOWLEDGER (side_position); + void acknowledge_accidental_placement (Grob_info); + void acknowledge_side_position (Grob_info); void process_acknowledged (); void stop_translation_timestep (); }; diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index c2f76349df..5eb1407a31 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -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 (); diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc index 2134503e88..b1bdf9c0da 100644 --- a/lily/slash-repeat-engraver.cc +++ b/lily/slash-repeat-engraver.cc @@ -35,7 +35,7 @@ public: protected: Stream_event *slash_; protected: - DECLARE_TRANSLATOR_LISTENER (repeat_slash); + void listen_repeat_slash (Stream_event *); void process_music (); }; diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index aa09f4db1f..1e7b6b3e1e 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -36,8 +36,8 @@ class Slur_engraver : public Slur_proto_engraver virtual void set_melisma (bool); protected: - DECLARE_TRANSLATOR_LISTENER (slur); - DECLARE_TRANSLATOR_LISTENER (note); + void listen_slur (Stream_event *); + void listen_note (Stream_event *); public: SCM event_symbol (); diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc index c1d8de3bb4..47fed784fe 100644 --- a/lily/slur-performer.cc +++ b/lily/slur-performer.cc @@ -40,7 +40,7 @@ protected: void process_music (); void set_melisma (bool); - DECLARE_TRANSLATOR_LISTENER (slur); + void listen_slur (Stream_event *); private: Stream_event *start_ev_; Stream_event *now_stop_ev_; diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 6628fe36b4..d77a55b757 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -76,11 +76,11 @@ class Spacing_engraver : public Engraver TRANSLATOR_DECLARATIONS (Spacing_engraver); protected: - DECLARE_ACKNOWLEDGER (staff_spacing); - DECLARE_ACKNOWLEDGER (note_spacing); - DECLARE_ACKNOWLEDGER (rhythmic_head); - DECLARE_ACKNOWLEDGER (rhythmic_grob); - DECLARE_TRANSLATOR_LISTENER (spacing_section); + void acknowledge_staff_spacing (Grob_info); + void acknowledge_note_spacing (Grob_info); + void acknowledge_rhythmic_head (Grob_info); + void acknowledge_rhythmic_grob (Grob_info); + void listen_spacing_section (Stream_event *); void start_translation_timestep (); void stop_translation_timestep (); diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index 231e484409..9cece4a6fe 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -37,8 +37,8 @@ class Span_arpeggio_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Span_arpeggio_engraver); - DECLARE_ACKNOWLEDGER (arpeggio); - DECLARE_ACKNOWLEDGER (note_column); + void acknowledge_arpeggio (Grob_info); + void acknowledge_note_column (Grob_info); protected: void process_acknowledged (); diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index fa1608b72e..e74528535b 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -41,7 +41,7 @@ class Span_bar_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Span_bar_engraver); protected: - DECLARE_ACKNOWLEDGER (bar_line); + void acknowledge_bar_line (Grob_info); void stop_translation_timestep (); void process_acknowledged (); }; diff --git a/lily/span-bar-stub-engraver.cc b/lily/span-bar-stub-engraver.cc index 07fc722814..a0c10f8594 100644 --- a/lily/span-bar-stub-engraver.cc +++ b/lily/span-bar-stub-engraver.cc @@ -55,8 +55,8 @@ class Span_bar_stub_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Span_bar_stub_engraver); protected: - DECLARE_ACKNOWLEDGER (span_bar); - DECLARE_ACKNOWLEDGER (hara_kiri_group_spanner); + void acknowledge_span_bar (Grob_info); + void acknowledge_hara_kiri_group_spanner (Grob_info); void process_acknowledged (); void stop_translation_timestep (); virtual void derived_mark () const; diff --git a/lily/spanner-break-forbid-engraver.cc b/lily/spanner-break-forbid-engraver.cc index adebe934ef..8d64b40ce8 100644 --- a/lily/spanner-break-forbid-engraver.cc +++ b/lily/spanner-break-forbid-engraver.cc @@ -31,8 +31,8 @@ class Spanner_break_forbid_engraver : public Engraver TRANSLATOR_DECLARATIONS (Spanner_break_forbid_engraver); vector running_spanners_; protected: - DECLARE_ACKNOWLEDGER (unbreakable_spanner); - DECLARE_END_ACKNOWLEDGER (unbreakable_spanner); + void acknowledge_unbreakable_spanner (Grob_info); + void acknowledge_end_unbreakable_spanner (Grob_info); void process_music (); }; diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc index 259055b5f4..88680943d3 100644 --- a/lily/staff-collecting-engraver.cc +++ b/lily/staff-collecting-engraver.cc @@ -26,8 +26,8 @@ class Staff_collecting_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Staff_collecting_engraver); - DECLARE_ACKNOWLEDGER (staff_symbol); - DECLARE_END_ACKNOWLEDGER (staff_symbol); + void acknowledge_staff_symbol (Grob_info); + void acknowledge_end_staff_symbol (Grob_info); }; Staff_collecting_engraver::Staff_collecting_engraver () diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc index 2d836fbee9..c8f528f0f5 100644 --- a/lily/staff-symbol-engraver.cc +++ b/lily/staff-symbol-engraver.cc @@ -42,8 +42,8 @@ protected: void stop_translation_timestep (); virtual ~Staff_symbol_engraver (); - DECLARE_ACKNOWLEDGER (grob); - DECLARE_TRANSLATOR_LISTENER (staff_span); + void acknowledge_grob (Grob_info); + void listen_staff_span (Stream_event *); virtual void finalize (); void process_music (); virtual void derived_mark () const; diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc index ac13277149..39eae99831 100644 --- a/lily/stanza-number-align-engraver.cc +++ b/lily/stanza-number-align-engraver.cc @@ -35,8 +35,8 @@ protected: vector lyrics_; vector stanza_numbers_; - DECLARE_ACKNOWLEDGER (lyric_syllable); - DECLARE_ACKNOWLEDGER (stanza_number); + void acknowledge_lyric_syllable (Grob_info); + void acknowledge_stanza_number (Grob_info); void stop_translation_timestep (); }; diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index 54432ff1bc..0a4539e8f1 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -32,7 +32,7 @@ public: void process_music (); virtual void derived_mark () const; void stop_translation_timestep (); - DECLARE_ACKNOWLEDGER (lyric_syllable); + void acknowledge_lyric_syllable (Grob_info); }; void diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 81e31dcc36..8907c34bc3 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -48,9 +48,9 @@ class Stem_engraver : public Engraver protected: void make_stem (Grob_info, bool); - DECLARE_TRANSLATOR_LISTENER (tremolo); - DECLARE_TRANSLATOR_LISTENER (tuplet_span); - DECLARE_ACKNOWLEDGER (rhythmic_head); + void listen_tremolo (Stream_event *); + void listen_tuplet_span (Stream_event *); + void acknowledge_rhythmic_head (Grob_info); void stop_translation_timestep (); void finalize (); void kill_unused_flags (); diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index ade977859a..2979e11a19 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -169,8 +169,8 @@ public: protected: Bracket_nesting_group *nesting_; - DECLARE_ACKNOWLEDGER (system_start_delimiter); - DECLARE_ACKNOWLEDGER (staff_symbol); + void acknowledge_system_start_delimiter (Grob_info); + void acknowledge_staff_symbol (Grob_info); void process_music (); virtual void finalize (); diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index e452e8f717..4294a2e5fe 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -49,9 +49,9 @@ public: TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver); protected: - DECLARE_TRANSLATOR_LISTENER (note); - DECLARE_TRANSLATOR_LISTENER (string_number); - DECLARE_TRANSLATOR_LISTENER (fingering); + void listen_note (Stream_event *); + void listen_string_number (Stream_event *); + void listen_fingering (Stream_event *); void process_music (); void stop_translation_timestep (); diff --git a/lily/tab-staff-symbol-engraver.cc b/lily/tab-staff-symbol-engraver.cc index f1f95df49c..cde9e82bbb 100644 --- a/lily/tab-staff-symbol-engraver.cc +++ b/lily/tab-staff-symbol-engraver.cc @@ -25,7 +25,7 @@ class Tab_staff_symbol_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Tab_staff_symbol_engraver); protected: - DECLARE_ACKNOWLEDGER (staff_symbol); + void acknowledge_staff_symbol (Grob_info); }; void diff --git a/lily/tab-tie-follow-engraver.cc b/lily/tab-tie-follow-engraver.cc index b8e9966862..58c5203ef0 100644 --- a/lily/tab-tie-follow-engraver.cc +++ b/lily/tab-tie-follow-engraver.cc @@ -44,9 +44,9 @@ public: TRANSLATOR_DECLARATIONS (Tab_tie_follow_engraver); protected: - DECLARE_ACKNOWLEDGER (glissando); - DECLARE_ACKNOWLEDGER (slur); - DECLARE_ACKNOWLEDGER (tab_note_head); + void acknowledge_glissando (Grob_info); + void acknowledge_slur (Grob_info); + void acknowledge_tab_note_head (Grob_info); void stop_translation_timestep (); }; diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 7dd1e36e75..982b61a287 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -42,8 +42,8 @@ protected: void stop_translation_timestep (); void process_music (); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_TRANSLATOR_LISTENER (text_script); + void acknowledge_note_column (Grob_info); + void listen_text_script (Stream_event *); }; void diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 7ede49e54d..f63e19a059 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -34,8 +34,8 @@ public: TRANSLATOR_DECLARATIONS (Text_spanner_engraver); protected: virtual void finalize (); - DECLARE_TRANSLATOR_LISTENER (text_span); - DECLARE_ACKNOWLEDGER (note_column); + void listen_text_span (Stream_event *); + void acknowledge_note_column (Grob_info); void stop_translation_timestep (); void process_music (); diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 1e48db7e9a..2a016b31be 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -84,8 +84,8 @@ protected: void process_acknowledged (); void stop_translation_timestep (); void start_translation_timestep (); - DECLARE_ACKNOWLEDGER (note_head); - DECLARE_TRANSLATOR_LISTENER (tie); + void acknowledge_note_head (Grob_info); + void listen_tie (Stream_event *); void process_music (); void typeset_tie (Spanner *); void report_unterminated_tie (Head_event_tuple const &); diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 51fcf07193..e93b3e6b0c 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -51,7 +51,7 @@ protected: void start_translation_timestep (); virtual void acknowledge_audio_element (Audio_element_info); void process_music (); - DECLARE_TRANSLATOR_LISTENER (tie); + void listen_tie (Stream_event *); public: TRANSLATOR_DECLARATIONS (Tie_performer); }; diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 186d9e20e0..d57b35bf6e 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -43,7 +43,7 @@ protected: void process_music (); public: TRANSLATOR_DECLARATIONS (Time_signature_engraver); - DECLARE_TRANSLATOR_LISTENER (time_signature); + void listen_time_signature (Stream_event *); }; void diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc index 421a333a86..6634b5ea43 100644 --- a/lily/trill-spanner-engraver.cc +++ b/lily/trill-spanner-engraver.cc @@ -41,8 +41,8 @@ public: TRANSLATOR_DECLARATIONS (Trill_spanner_engraver); protected: virtual void finalize (); - DECLARE_TRANSLATOR_LISTENER (trill_span); - DECLARE_ACKNOWLEDGER (note_column); + void listen_trill_span (Stream_event *); + void acknowledge_note_column (Grob_info); void stop_translation_timestep (); void process_music (); diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index d8be4c2097..92e018aece 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -63,11 +63,11 @@ protected: vector stopped_tuplets_; vector last_tuplets_; - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (script); - DECLARE_ACKNOWLEDGER (finger); - DECLARE_ACKNOWLEDGER (string_number); - DECLARE_TRANSLATOR_LISTENER (tuplet_span); + void acknowledge_note_column (Grob_info); + void acknowledge_script (Grob_info); + void acknowledge_finger (Grob_info); + void acknowledge_string_number (Grob_info); + void listen_tuplet_span (Stream_event *); virtual void finalize (); void start_translation_timestep (); void process_music (); diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc index d709765e5c..5f97b1e4cb 100644 --- a/lily/tweak-engraver.cc +++ b/lily/tweak-engraver.cc @@ -29,7 +29,7 @@ class Tweak_engraver : public Engraver TRANSLATOR_DECLARATIONS (Tweak_engraver); protected: - DECLARE_ACKNOWLEDGER (grob); + void acknowledge_grob (Grob_info); }; Tweak_engraver::Tweak_engraver () diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index 35c645a5f6..3d5e6dfa9c 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -82,8 +82,8 @@ protected: virtual Spanner *create_ligature_spanner (); virtual void transform_heads (Spanner *ligature, vector const &primitives); - DECLARE_TRANSLATOR_LISTENER (pes_or_flexa); - DECLARE_TRANSLATOR_LISTENER (ligature); + void listen_pes_or_flexa (Stream_event *); + void listen_ligature (Stream_event *); }; void diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 40d4146828..0226173a2e 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -37,7 +37,7 @@ class Vertical_align_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Vertical_align_engraver); - DECLARE_ACKNOWLEDGER (axis_group); + void acknowledge_axis_group (Grob_info); protected: virtual void derived_mark () const; diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 837c3b7b57..2f95ac7ac1 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -43,7 +43,7 @@ public: TRANSLATOR_DECLARATIONS (Volta_engraver); protected: - DECLARE_ACKNOWLEDGER (bar_line); + void acknowledge_bar_line (Grob_info); virtual void derived_mark () const; void stop_translation_timestep ();