X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpart-combine-engraver.cc;h=33c10f59660cb77ff2a674656168ae7d1d19a951;hb=69f2bf94c9f57986769f6371bc63ee27a3e6c095;hp=c6a3176f4711feec3b537607034d73f84ca967b4;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index c6a3176f47..33c10f5966 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
@@ -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);
@@ -51,7 +51,6 @@ private:
   Stream_event *waiting_event_;
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Part_combine_engraver, part_combine);
 void
 Part_combine_engraver::listen_part_combine (Stream_event *ev)
 {
@@ -61,7 +60,6 @@ Part_combine_engraver::listen_part_combine (Stream_event *ev)
   waiting_event_ = new_event_;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Part_combine_engraver, note);
 void
 Part_combine_engraver::listen_note (Stream_event *)
 {
@@ -79,13 +77,13 @@ Part_combine_engraver::Part_combine_engraver ()
 void
 Part_combine_engraver::create_item (Stream_event *ev)
 {
-  SCM what = ev->get_property ("class");
+  SCM what = scm_car (ev->get_property ("class"));
   SCM text = SCM_EOL;
-  if (what == ly_symbol2scm ("solo-one-event"))
+  if (scm_is_eq (what, ly_symbol2scm ("solo-one-event")))
     text = get_property ("soloText");
-  else if (what == ly_symbol2scm ("solo-two-event"))
+  else if (scm_is_eq (what, ly_symbol2scm ("solo-two-event")))
     text = get_property ("soloIIText");
-  else if (what == ly_symbol2scm ("unisono-event"))
+  else if (scm_is_eq (what, ly_symbol2scm ("unisono-event")))
     text = get_property ("aDueText");
 
   if (Text_interface::is_markup (text))
@@ -137,8 +135,15 @@ Part_combine_engraver::stop_translation_timestep ()
   note_found_ = false;
 }
 
-ADD_ACKNOWLEDGER (Part_combine_engraver, note_head);
-ADD_ACKNOWLEDGER (Part_combine_engraver, stem);
+void
+Part_combine_engraver::boot ()
+{
+  ADD_LISTENER (Part_combine_engraver, part_combine);
+  ADD_LISTENER (Part_combine_engraver, note);
+  ADD_ACKNOWLEDGER (Part_combine_engraver, note_head);
+  ADD_ACKNOWLEDGER (Part_combine_engraver, stem);
+}
+
 ADD_TRANSLATOR (Part_combine_engraver,
                 /* doc */
                 "Part combine engraver for orchestral scores: Print markings"