X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-tie-engraver.cc;h=aebed3fdbab2db162214d758a497a80ab105a51e;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=b2d5d6134e6fa1f23304dfcd0e33f7153ac7522e;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/repeat-tie-engraver.cc b/lily/repeat-tie-engraver.cc
index b2d5d6134e..aebed3fdba 100644
--- a/lily/repeat-tie-engraver.cc
+++ b/lily/repeat-tie-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -18,7 +18,6 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include "engraver.hh"
 #include "item.hh"
 #include "pointer-group-interface.hh"
@@ -30,17 +29,18 @@ class Repeat_tie_engraver : public Engraver
 {
   Stream_event *event_;
   Grob *semi_tie_column_;
-  vector<Grob*> semi_ties_;
-  
-  void stop_translation_timestep (); 
-  DECLARE_ACKNOWLEDGER (note_head);
-  DECLARE_TRANSLATOR_LISTENER (repeat_tie);
-  
+  vector<Grob *> semi_ties_;
+
+  void stop_translation_timestep ();
+  void acknowledge_note_head (Grob_info);
+  void listen_repeat_tie (Stream_event *);
+
 public:
   TRANSLATOR_DECLARATIONS (Repeat_tie_engraver);
 };
 
-Repeat_tie_engraver::Repeat_tie_engraver ()
+Repeat_tie_engraver::Repeat_tie_engraver (Context *c)
+  : Engraver (c)
 {
   event_ = 0;
   semi_tie_column_ = 0;
@@ -54,7 +54,6 @@ Repeat_tie_engraver::stop_translation_timestep ()
   semi_ties_.clear ();
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Repeat_tie_engraver, repeat_tie);
 void
 Repeat_tie_engraver::listen_repeat_tie (Stream_event *ev)
 {
@@ -69,39 +68,44 @@ Repeat_tie_engraver::acknowledge_note_head (Grob_info inf)
 
   if (!semi_tie_column_)
     {
-      semi_tie_column_ = make_item ("RepeatTieColumn", event_->self_scm ());
+      semi_tie_column_ = make_item ("RepeatTieColumn", SCM_EOL);
     }
 
   SCM cause = event_->self_scm ();
   Grob *semi_tie = make_item ("RepeatTie", cause);
   semi_tie->set_object ("note-head", inf.grob ()->self_scm ());
-  
+
   Pointer_group_interface::add_grob (semi_tie_column_, ly_symbol2scm ("ties"),
-				     semi_tie);
+                                     semi_tie);
   semi_tie->set_parent (semi_tie_column_, Y_AXIS);
   semi_ties_.push_back (semi_tie);
 
-
-  if (is_direction (unsmob_stream_event (cause)->get_property ("direction")))
+  if (is_direction (unsmob<Stream_event> (cause)->get_property ("direction")))
     {
-      Direction d = to_dir (unsmob_stream_event (cause)->get_property ("direction"));
-      semi_tie->set_property ("direction", scm_from_int (d)); 
+      Direction d = to_dir (unsmob<Stream_event> (cause)->get_property ("direction"));
+      semi_tie->set_property ("direction", scm_from_int (d));
     }
 
 }
 
-ADD_ACKNOWLEDGER (Repeat_tie_engraver, note_head);
-ADD_TRANSLATOR (Repeat_tie_engraver, 
-		/* doc */
-		"Create repeat ties.",
-		
-		/* create */
-		"RepeatTie "
-		"RepeatTieColumn ",
-
-		/* read */
-		"",
-
-		/* write */
-		""
-		);
+void
+Repeat_tie_engraver::boot ()
+{
+  ADD_LISTENER (Repeat_tie_engraver, repeat_tie);
+  ADD_ACKNOWLEDGER (Repeat_tie_engraver, note_head);
+}
+
+ADD_TRANSLATOR (Repeat_tie_engraver,
+                /* doc */
+                "Create repeat ties.",
+
+                /* create */
+                "RepeatTie "
+                "RepeatTieColumn ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );