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 c2761c11a9a1438f750c3023d05adfa28da3fd16..665c83a4cc51c6b5648df8ee06565aaf6f9a093e 100644 (file)
--- 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 44eb2580a395e30437dabe10c380e3ff6590ba76..d308a430686a6dc085685b4ac1f68304eb6621fe 100644 (file)
--- 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 a68e1b9f06ee399d1e540d665669639be4edcbde..148ed44c777a1ba71d1c18599fd11bb6758f8369 100644 (file)
--- 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 49350d01cf27fe8d85d7121656dc1065801e6509..2bc4858479898f905cc3799aba21074a2111038a 100644 (file)
--- 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 5155d985187593f6edffa4a9f88b3df021c5d063..4f0f136db05b8ca6f5edf72bfd9ead489859b34f 100644 (file)
--- 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<Stream_event *> events_;
 
   void stop_translation_timestep ();

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 97972d046cf50fe3ec2b117782da25ec74b9b100..8feb63dd134fa873d229fc4e3f4b10ecd98ca9c6 100644 (file)
--- 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 75c192f28459ce6ea7500ba78f0ec5ff7b21e2aa..1af5f19da1777115acda72facd0dd63d630a1c68 100644 (file)
--- 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 0ca0e0cf65c8e9804bb50f0b08bd3caf0eca037b..31f96b72b17b4f406d2f87720b6af847bab55f23 100644 (file)
--- a/lily/beam-collision-engraver.cc
+++ b/lily/beam-collision-engraver.cc
@@ -30,15 +30,15 @@ protected:
   vector<Grob_info> beams_;
   vector<Grob_info> 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 019d68db48a66ea1c30479bd373e979867f0f663..c9e9a12d497cc485dffe47b512066e36e03c7b18 100644 (file)
--- 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 0d658dd6b8ea75554370f934a3eff091a121fd37..0970e8b5e74831d5767b2e8367f7d00eb8c55fff 100644 (file)
--- 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 87d13c68ec8d8810d798463a6016a83ca028e007..83c98a94e082a612a18d6c30c3d3935e090b7285 100644 (file)
--- 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 52e4eda0c576c7093360e7a7a16bd0660a55eeb8..55a638da870283b10b8446695221264a581c8991 100644 (file)
--- 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 0ee8cabe77b91659c879efca5f918f31b4241515..ade1b15f297ea1dd4f32a1bfc1437c51fce8935e 100644 (file)
--- 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 2f4def811613aa05432dbf349b1550ab4189ea69..3a14ff4b07f44168ce5117712d7e99e73812cc91 100644 (file)
--- 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<Stream_event *> notes_;
 

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 9e704a222a926f54a5dfcc26a11ded67b2a6b04c..7a17c1350e36567857acb983eeda04695df3827f 100644 (file)
--- 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 75adb6e3ee125f668b51af7b05eea145b584645e..00b3c3e55a736ef930d8d048afe30c2d74869df3 100644 (file)
--- 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 eac15a76909c36769a6413ce10c53f4c1d2202cd..0c84d1cb650019a32607e4744588715ea3b4d09e 100644 (file)
--- 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 034726def9b2437176e124b99be0ad23aca3deac..ca6a52d320a09dde5c5ff326611bfe4309ded81b 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -31,7 +31,7 @@ class Collision_engraver : public Engraver
   vector<Grob *> 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 e7a5dbc5606d5966f5bacd70da2c3016b6daac83..ef3a5012a26cbc5a77d192904ffb216d5082c4ab 100644 (file)
--- 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 2f9dc5603065db94f274d18c7cbf87ad34018735..2b5693916e96ee25e02d0d1ff9a4882e50b51b1d 100644 (file)
--- 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 0fb9a13d0fe1751fcd6b0e41003fe80cf5fc6ef4..3fdf6524c243f6745fa93883b7b46223528c1ca7 100644 (file)
--- 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 771eea4b7900401481a6bc522707a28dc8905572..53640afadc17264e62e765b6a1f238d592e5e548 100644 (file)
--- 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 517e53aece81a84df0437c238b8521d5ad38ecb2..a21ad4eb787ee8c9a4a91047abad40ffaa802601 100644 (file)
--- 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 a300b6f3a1ad0829d0fad48846e208379eca35b5..c5c80015249791f858e82ba1499e820122be975a 100644 (file)
--- 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 4bf379124dd6c0f707ca56d5e5e4408c600470e1..cbd6c718a9e944bcc70b245b64b88045575c4ed6 100644 (file)
--- 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 f50f8f8108f55ce5fa2382bf8ef9cd5f79585aa7..d1717f8314a96f68b67cb85367f8a79910673767 100644 (file)
--- 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 d78e2ba3d10ae017327cb41b14c50d46557fb81d..16b089cb703cca7877766b9e16ed202929357fbb 100644 (file)
--- 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 88c1a61d05f5562ce4212e147bb02f37164f9546..93f648f3d765b4047afc23803e1e6eb8eda3a840 100644 (file)
--- 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<Stream_event *> note_evs_;
 };

diff --git a/lily/dynamic-align-engraver.cc b/lily/dynamic-align-engraver.cc
index 29f35b4f6128014a4a683ba0c34177dc0f96625b..c276e217593e7b209e1cce5f47b15a8610dd8e1b 100644 (file)
--- 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 6df34baf675b4cb060cb7803374bdad97df0af08..5d4ef33de3aee6f282176fd92d3f82baf23966dc 100644 (file)
--- 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 567184412e97a83008144613a9b02e459189ced5..46a8a446d35af8c3a32e949c34f59ed962e520c1 100644 (file)
--- 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<Stream_event *> span_events_;

diff --git a/lily/episema-engraver.cc b/lily/episema-engraver.cc
index dbbda29130db6c0facd55d6bb3ead19fe72eb15f..d2fc2f398f9ac8856a0ef4b69cf2e5d3392edb20 100644 (file)
--- 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 2d96c400b637df2b13104ad352f3fc09bbcb47c2..39fa7788dedb87fa6a4ff5344c865f9c963383c3 100644 (file)
--- 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 e9bd19291ca89aeb9a436e36676b0d68b5ceffac..9785f3fef47e763efc7acc2da7636ed7e20a7b72 100644 (file)
--- 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 9dadfc58ce89b51552f3574e437ac321bdc840b8..66fabb1ffb6d4a0a316aeccb31bec741bfefd759 100644 (file)
--- 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<Grob *> support_;
   vector<Grob *> 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 466d8e281cae023ab87c0a6edef3a61ae7d4834c..a2a37143b37a81efc59482fda913b1b7c7eddf20 100644 (file)
--- 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 4e5a6577fab7b8715919af7b72ca3d5eb1d0e872..8de44e96984ed22d18a504a1d5fe41bc9118d8bc 100644 (file)
--- 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 6618c6d4827bd183bef15faef14c80d753502463..4dfd24d01444a561a2485f6001aeb9f14f57c8d3 100644 (file)
--- 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 857d08fcef4eff92102362a8aaff39fef62be93d..e80d9b64cec69b8016a4a2aca5cb5bdfb4f924f5 100644 (file)
--- 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<Drul_array<Spanner *> > annotated_spanners_;
 

diff --git a/lily/fretboard-engraver.cc b/lily/fretboard-engraver.cc
index 239ee54eb67e6dc967cee814e8cd1641d8930f03..18843fc87c6d3c2d9829c6b29f1f337d85cd14f2 100644 (file)
--- 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 853ba8f27957027b2937f1e068c4c2b38b6bc25e..878e7f88b355539a7f29e1cf75aa3e3e701108be 100644 (file)
--- 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 e27e502c072d32ab3d3f3c336f8acf332095f6f5..efecf676228f01de4c5d225f68231d5a7b3f749c 100644 (file)
--- 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 4c388c5145baead6ccea5c20d3503dea18a2fe70..25392a43556d8746b6742cded90cb9e30da521a9 100644 (file)
--- 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 2e7f2b629428cdba15aad0e34c075ddf4c3851ec..d50146a2d0ddaf0061104d33252b73166d36077b 100644 (file)
--- 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 ef1013b979fceff07726659f8c1587aa543b6718..19ff388963d2273934eb9a5356b1da005557aefe 100644 (file)
--- 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 0c45f8c2257817299637adc4be5cf4f7f01783d1..726496e91fc208ff3b09a5616b0ac4fe48f7913c 100644 (file)
--- 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 1279ff17c990c527db9eaba102eba4aa859357cf..a176fc48ebf6a667d894eb352f2e9e62851c52b6 100644 (file)
--- 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<Stream_event *> break_events_;

diff --git a/lily/include/slur-proto-engraver.hh b/lily/include/slur-proto-engraver.hh
index 4ffeb6007f0b860d2a5250c29791884bd3fd7eb7..22d773de417ecbef9ce195180d1983a0ebd4b03d 100644 (file)
--- 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 d10e8d41ecbfd13a533c6d59332f571a556d8e4f..2d3199c76bb4c4aa7b74704c5ddd3b19752a3aec 100644 (file)
--- 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 a0263d930f6d03af5ffdaf91e5320a84e88fcf10..ec37d6bcbffc2b18d638e76cf1ead798526e8e47 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -43,7 +43,7 @@ protected:
   vector<Grob *> 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 83699da5938f742a801c8e3f836c45cbaa90f48d..9b1cbe4a23a412b95cb8797e6f7dd8fdc7656704 100644 (file)
--- 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 635f293120c4c3bac29327788536ffb0549f2965..8c907dc7cccb0a4da9ed48ceaf6093a68916278c 100644 (file)
--- 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 568357573de7626e90136e4a15731854883b2c94..219454115a04dc673f2ce903d04d2be68afded22 100644 (file)
--- 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 42c48a551e035bef14fba51bf998b8e94d0155b1..8934800cdf9eec4d512f69255f4198b51a36bbb9 100644 (file)
--- 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<Grob_info> 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 11e379aeed1b13e03ba38b3afc9ff5c2eb7f20b1..e84ea36bca7b72cbbe263b3361afdd0813a6f642 100644 (file)
--- a/lily/laissez-vibrer-engraver.cc
+++ b/lily/laissez-vibrer-engraver.cc
@@ -32,9 +32,9 @@ class Laissez_vibrer_engraver : public Engraver
   vector<Grob *> 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 ba52d62f6711021e02159d868558387af7ebe9a6..869720cca4f8811a835c7ec00af5dd717348c706 100644 (file)
--- 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 7c0a8d6e2f52aec96b625036e88ac96114486a87..4919071d97b92a05c01bdc960f8cc7a3e8d2002e 100644 (file)
--- 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 f051cfcb0a1a479f62bd8b544e82e336a5208b6f..08c9306693a303f83ed31dc1c51c62c013d08422 100644 (file)
--- 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 1215cc7d5500808a247af52c09739d9a9d68eb8d..6a25d62a3f99e44fd8fbff912e20b0e2e70e61d0 100644 (file)
--- 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<Stream_event *> events_;
   Audio_text *audio_;

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 76105f14dcbefe4a9c00ee71c8bb04c0a4e7a05a..a849ec11ce0dddd77f57c586efc0db2c8a68a3f7 100644 (file)
--- 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 71e06d174753f48f0f39bed98a85cb1cb2ad1517..2ab7a7bcc6092d8aa4fb5fc7ab6c029f652924eb 100644 (file)
--- 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 e7cf07292a83f297fbdf43355f93eda917d2d678..a97d13755f08e777948a70394ebbd15f7c2e437b 100644 (file)
--- 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 b6a83f7d3efc471c0cb9163344a8467c7affd40d..b66a3ea38163441054e28c30156e8db7633a25fb 100644 (file)
--- 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<Grob_info> 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 21aab95ee22adfb5a19cc90f435cf00983a93e42..241a2da44aa0a7b990504dadc2765b97b59825c3 100644 (file)
--- 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 aa4a54b9e733496a2b8d0173f49b4dd8aa0218f6..04ef91fc881a5744ae84615bdf2aadfe042738c5 100644 (file)
--- 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 abf9ce5a6b7d715b978cd17ac19f06831621fa6d..75eccf69fc2cb44edb69d4cc63861332f6d8f578 100644 (file)
--- 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<Finger_tuple> *,
                       Stream_event *, Stream_event *);

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index f71c8bdbe1eb7e7b0647a4a559a4ef1860d08bf1..b09fe6636139ebe3a658decf524086b04437057c 100644 (file)
--- 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 244e25cedc7f1a87c4261e6011b0d2c49b374ed7..5839a827eb3129045c9e5330d41dacf203ab0d67 100644 (file)
--- 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 d4494a7cb7f7eae9374128bfc372764b9b34495c..2b8fa87000c8331f6c6a02e137a176e95fb83636 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -30,7 +30,7 @@ public:
   TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
   vector<Stream_event *> 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 a81c723b7b84fae73a1bc338993fcb94469a15bc..a2ca6946e95a440635d3127fa5884bcd532a9ce6 100644 (file)
--- 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<Stream_event *> note_evs_;
   vector<Audio_note *> notes_;

diff --git a/lily/note-spacing-engraver.cc b/lily/note-spacing-engraver.cc
index 29293ea7feec95a82e8023fdf1aeab1af003c7d5..414e1ee7610cee80c76e1ead38768c21e9fbd5cb 100644 (file)
--- 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 79d054a7cccf09abb3eee81846b1bdd051180d2a..e681e73af6b65a661454712f47a4b535a72f6328 100644 (file)
--- 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 b1956910b6bfb7daa3f4fec11dd999ca52f03539..7a0fa2d3c3389484cb94f03c6f798f0a1e6b866c 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -31,8 +31,8 @@ class Output_property_engraver : public Engraver
 protected:
   vector<Stream_event*> 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 fd5b34a088d7a10136cc6306bb6683ec3dc53908..c77dc9b2a5de516ad7cf827c7793c8e310dc3cb2 100644 (file)
--- 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 d9dfac1825802a0c38a76fab552296d2397c045f..dcbd506a4a5326ec6fd8524f13fd5298ac07a453 100644 (file)
--- 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 cb788f02ce7d2381a05b0f6fd63ef13dc60a1391..33c10f59660cb77ff2a674656168ae7d1d19a951 100644 (file)
--- 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 59655a110abf186a4d5746907484518447e92be8..b620cdccb561d49fc684917d58116b3be5a1c534 100644 (file)
--- 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 c694c5337d49e03932e9ddf50f7f88afa871d9bf..a4e1214928ccd9d913dcc99732adabd4ffb9d8de 100644 (file)
--- 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 3fa7c5e479a44e4b579a0359febaabba5a9e3e59..7c120a1bc19f861cea5c14a7603326d629a5469b 100644 (file)
--- 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 d0e35713d981256103001ad60b389c2c9f905ac8..cbdf5244d11e223d3c8aea157ac0d8acee5daf8d 100644 (file)
--- 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 ba2d2b50428ef138d943b76babdaa36321157c24..a8273980e924d61ca558444ec949475102b6c536 100644 (file)
--- 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<Audio_piano_pedal *> audios_;
   Pedal_info info_alist_[NUM_PEDAL_TYPES];

diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc
index 5d403c79e4a0055e0102766283816ce93e270d4f..0750c594950e7dd7ce5f9bcea9166345a1b9875f 100644 (file)
--- 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 54ef0827a7c43a19b32fb85c2f5617457a348373..1ec4da9aebdd26c07c31725230d8f20d650937b0 100644 (file)
--- 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 d5439726bbe6cdd04d9c4b846385626acdc1d415..3bd0fa1091482d4e12a9f32707492c0630e9823b 100644 (file)
--- 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 6eead573099d288acd3ccc9d9a3d62f14cac48d0..fb2c8bb58465ca0c80ebc3d6f0de9cfa13652dcf 100644 (file)
--- a/lily/repeat-tie-engraver.cc
+++ b/lily/repeat-tie-engraver.cc
@@ -32,8 +32,8 @@ class Repeat_tie_engraver : public Engraver
   vector<Grob *> 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 64ff97a35fcf48fe58a0d5460a63ffcd5186c59f..d691c2e98c7f9e2001706845c9ca3cf15b590df1 100644 (file)
--- 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 d6e461060ba741a2d22f0d49d2a1224197545cf9..04281231d52825410a3606900a52f36147b31d5b 100644 (file)
--- 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 8caf8b903c4e2b92f4f67aea0a51510a827c5291..6310f3b5403e5b56a98d984f3b3e735bb0c42cc4 100644 (file)
--- 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 578ed84ad4a0b9ea687c8cf4ad0293a2dd64ade2..8a7b122f1fb0c0be00bab174937f95d627f0206a 100644 (file)
--- 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 390cba5f96ef29f89bc4474c02e83a99b35fbb66..20af8d1cbb20326dd041db1461b2facaf4dc89ce 100644 (file)
--- 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 c2f76349dff946bce1f7286eaba17aeb10e8d726..5eb1407a31787a4babd78271edffd528570f9dc4 100644 (file)
--- 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 2134503e8880e93c6c213e3bad771250fd33b02f..b1bdf9c0dac4746b26634d7bb4da9690073a98f9 100644 (file)
--- 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 aa09f4db1f865def9bc652812232f779475c558e..1e7b6b3e1efccbf020e780a5a2b27da514b02a01 100644 (file)
--- 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 c1d8de3bb4f6ca981d6d71adcde5bb217b15e4df..47fed784fe6c64335b1b926f033a372599405cbf 100644 (file)
--- 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 6628fe36b4b3e232866bbfb9d035852ad8b16b58..d77a55b757af67725ac237d49eeffdcb129fb793 100644 (file)
--- 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 231e484409040d2f2d50a01ba5b94c4121c3c39d..9cece4a6fe336bd26d050168fa974f4c8db67737 100644 (file)
--- 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 fa1608b72e69309615eb79cfc2624e78b3289954..e74528535bfa0f2dd48dd8b0834e38bace2fd6b1 100644 (file)
--- 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 07fc7228148d38da147db96a15e01b685ce9b376..a0c10f8594ae1165cbe74fcdd3b077ad94c0cd86 100644 (file)
--- 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 adebe934ef0e2fc3add9ddf8ecea568a152c7faa..8d64b40ce8134672fcc1e53dfa28daedbfcfab4a 100644 (file)
--- 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<Spanner *> 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 259055b5f4f835458d3a8659a6b7524bace3e4e7..88680943d3d0937139645d0a6a8cf075f1e24bce 100644 (file)
--- 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 2d836fbee995670e8e6c83486f9189f5a59831e3..c8f528f0f541c6d6536bbff52e6a0474e2d4966b 100644 (file)
--- 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 ac1327714939b2c524f6568c65188ce4969314cb..39eae99831fb5c5c4f1ae353691523cd9e7aadd5 100644 (file)
--- a/lily/stanza-number-align-engraver.cc
+++ b/lily/stanza-number-align-engraver.cc
@@ -35,8 +35,8 @@ protected:
   vector<Grob *> lyrics_;
   vector<Grob *> 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 54432ff1bcfa7f7f7273fbe6ce5c158dd9fcec29..0a4539e8f1679059ee81676ca5e8d08797473152 100644 (file)
--- 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 81e31dcc369152ce098763df0405d0d3f7fd7898..8907c34bc3bcfd68b1e5375fa86d950f7d6d9eb1 100644 (file)
--- 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 ade977859a4aa0dc06701c88d27054eb9652e4e5..2979e11a1918ed653e06108490ee190dab613cd3 100644 (file)
--- 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 e452e8f717dc92920f108e92949f11ff26577fb5..4294a2e5fe5279ff19a4df3e2031d8a77598de93 100644 (file)
--- 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 f1f95df49cd1abdb13287ace00e6f5eb4ed2bb99..cde9e82bbb20373d6edc10427a38ffa8f4716802 100644 (file)
--- 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 b8e9966862ee9eb83b3444e6156a6d2637dd1926..58c5203ef089a41ccb413a8c3040db0fbe50690b 100644 (file)
--- 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 7dd1e36e75c1c736e2be210017092ba349427bd9..982b61a287461559c024b87911696bdf69b1870c 100644 (file)
--- 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 7ede49e54d4a85ea9524ef59f6803587eb7707c1..f63e19a0593083f9fbb1d869d24ea05696d30823 100644 (file)
--- 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 1e48db7e9a39a4122e10e3a3b2bf26cdce2da357..2a016b31be8a08317422b17faa22b39cd5d84684 100644 (file)
--- 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 51fcf07193a1eb34f7e57053114a0c3783cce099..e93b3e6b0c6047fea2c2de8d33705b9a3098e0c4 100644 (file)
--- 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 186d9e20e0342968563bcd749f1a14fa3aaf018d..d57b35bf6eae9bb95c04d2d0d1dde3d85c9f6764 100644 (file)
--- 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 421a333a86b2538a461c00a9bac61ee9a80bfb98..6634b5ea43be9cee202f9772cdeb79f00f6f765a 100644 (file)
--- 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 d8be4c20978e32de3c7897286e6a2c75b7901694..92e018aeceae7ed2f9475c0e7e20c226c806ca0d 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -63,11 +63,11 @@ protected:
   vector<Tuplet_description> stopped_tuplets_;
   vector<Spanner *> 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 d709765e5c89824841c434de06fc1540ae2c6b48..5f97b1e4cbdb11a84bfb469f864e31a01f2b8d0c 100644 (file)
--- 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 35c645a5f67074e0404e8e4060037a64f82a39ed..3d5e6dfa9c4d3a593a847260f4161f36e77f471e 100644 (file)
--- 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<Grob_info> 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 40d4146828e55f1d1d28407db11c56a0ff0f627b..0226173a2e115ec81d153212a5c3317cee6755c2 100644 (file)
--- 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 837c3b7b5736ffabadce11b06befae8645f2f9bd..2f95ac7ac11b861216e75a77d7d63857f6373fab 100644 (file)
--- 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 ();