X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-engraver.cc;h=be9564685d2007314ab115236d45b3a7e2f515bb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6e4d63d12df9961207c384a6a6220483914c6ea7;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index 6e4d63d12d..be9564685d 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -3,37 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
-#include "text-interface.hh"
+#include "multi-measure-rest.hh"
 #include "note-head.hh"
-#include "stem.hh"
 #include "side-position-interface.hh"
-#include "multi-measure-rest.hh"
+#include "stem.hh"
+#include "stream-event.hh"
+#include "text-interface.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 class Part_combine_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Part_combine_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  PRECOMPUTED_VIRTUAL void process_music ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  virtual bool try_music (Music *);
+  DECLARE_ACKNOWLEDGER (note_head);
+  DECLARE_ACKNOWLEDGER (stem);
+
+  DECLARE_TRANSLATOR_LISTENER (part_combine);
+  void process_music ();
+  void stop_translation_timestep ();
 private:
   Item *text_;
-  Music *event_;
+  Stream_event *event_;
 };
 
-bool
-Part_combine_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Part_combine_engraver, part_combine);
+void
+Part_combine_engraver::listen_part_combine (Stream_event *ev)
 {
-  event_ = m;
-  return true;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 Part_combine_engraver::Part_combine_engraver ()
@@ -48,16 +54,16 @@ Part_combine_engraver::process_music ()
   if (event_
       && to_boolean (get_property ("printPartCombineTexts")))
     {
-      SCM what = event_->get_property ("part-combine-status");
+      SCM what = event_->get_property ("class");
       SCM text = SCM_EOL;
-      if (what == ly_symbol2scm ("solo1"))
+      if (what == ly_symbol2scm ("solo-one-event"))
 	text = get_property ("soloText");
-      else if (what == ly_symbol2scm ("solo2"))
+      else if (what == ly_symbol2scm ("solo-two-event"))
 	text = get_property ("soloIIText");
-      else if (what == ly_symbol2scm ("unisono"))
+      else if (what == ly_symbol2scm ("unisono-event"))
 	text = get_property ("aDueText");
 
-      if (Text_interface::markup_p (text))
+      if (Text_interface::is_markup (text))
 	{
 	  text_ = make_item ("CombineTextScript", event_->self_scm ());
 	  text_->set_property ("text", text);
@@ -66,25 +72,25 @@ Part_combine_engraver::process_music ()
 }
 
 void
-Part_combine_engraver::acknowledge_grob (Grob_info i)
+Part_combine_engraver::acknowledge_note_head (Grob_info i)
 {
   if (text_)
     {
-      if (Note_head::has_interface (i.grob ()))
-	{
-	  Grob *t = text_;
-	  Side_position_interface::add_support (t, i.grob ());
-	  if (Side_position_interface::get_axis (t) == X_AXIS
-	      && !t->get_parent (Y_AXIS))
-	    t->set_parent (i.grob (), Y_AXIS);
-	}
-      if (Stem::has_interface (i.grob ()))
-	{
-	  Side_position_interface::add_support (text_, i.grob ());
-	}
+      Grob *t = text_;
+      Side_position_interface::add_support (t, i.grob ());
+      if (Side_position_interface::get_axis (t) == X_AXIS
+	  && !t->get_parent (Y_AXIS))
+	t->set_parent (i.grob (), Y_AXIS);
     }
 }
 
+void
+Part_combine_engraver::acknowledge_stem (Grob_info i)
+{
+  if (text_)
+    Side_position_interface::add_support (text_, i.grob ());
+}
+
 void
 Part_combine_engraver::stop_translation_timestep ()
 {
@@ -92,15 +98,22 @@ Part_combine_engraver::stop_translation_timestep ()
   event_ = 0;
 }
 
-#include "translator.icc"
-
+ADD_ACKNOWLEDGER (Part_combine_engraver, note_head);
+ADD_ACKNOWLEDGER (Part_combine_engraver, stem);
 ADD_TRANSLATOR (Part_combine_engraver,
-		/* descr */ "Part combine engraver for orchestral scores:		"
-		"Print markings a2, Solo, Solo II, and unisono ",
-		/* creats*/ "CombineTextScript",
-		/* accepts */ "part-combine-event",
-		/* acks  */ "multi-measure-rest-interface "
-		"slur-interface stem-interface note-head-interface",
-		/* reads */ "printPartCombineTexts soloText soloIIText "
-		"aDueText",
-		/* write */ "");
+		/* doc */
+		"Part combine engraver for orchestral scores: Print markings"
+		" @q{a2}, @q{Solo}, @q{Solo II}, and @q{unisono}.",
+
+		/* create */
+		"CombineTextScript ",
+
+		/* read */
+		"printPartCombineTexts "
+		"soloText "
+		"soloIIText "
+		"aDueText ",
+
+		/* write */
+		""
+		);