X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Ftrill-spanner-engraver.cc;h=ff4612ac666fc6ed8ea4a3790fad427c6e18fe75;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=94554b790bf1eb90648e17a217bf128f69dc2d3b;hpb=36b9825a04fd050c1de107b5d68db3c13916fe33;p=lilypond.git

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 94554b790b..ff4612ac66 100644
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  trill-spanner-engraver.cc -- implement Trill_spanner_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -30,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 ();
@@ -44,7 +55,8 @@ private:
   void typeset_all ();
 };
 
-Trill_spanner_engraver::Trill_spanner_engraver ()
+Trill_spanner_engraver::Trill_spanner_engraver (Context *c)
+  : Engraver (c)
 {
   finished_ = 0;
   current_event_ = 0;
@@ -52,7 +64,6 @@ Trill_spanner_engraver::Trill_spanner_engraver ()
   event_drul_.set (0, 0);
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Trill_spanner_engraver, trill_span);
 void
 Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
 {
@@ -66,17 +77,17 @@ Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
   if (span_)
     {
       Pointer_group_interface::add_grob (span_,
-					 ly_symbol2scm ("note-columns"),
-					 info.grob());
+                                         ly_symbol2scm ("note-columns"),
+                                         info.grob ());
       if (!span_->get_bound (LEFT))
-	add_bound_item (span_, info.grob ());
+        add_bound_item (span_, info.grob ());
     }
   else if (finished_)
     {
       Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"),
-					 info.grob());
+                                         info.grob ());
       if (!finished_->get_bound (RIGHT))
-	add_bound_item (finished_, info.grob ());
+        add_bound_item (finished_, info.grob ());
     }
 }
 
@@ -88,7 +99,7 @@ Trill_spanner_engraver::process_music ()
     {
       Stream_event *ender = event_drul_[STOP];
       if (!ender)
-	ender = event_drul_[START];
+        ender = event_drul_[START];
       finished_ = span_;
       announce_end_grob (finished_, ender->self_scm ());
       span_ = 0;
@@ -109,10 +120,10 @@ Trill_spanner_engraver::typeset_all ()
   if (finished_)
     {
       if (!finished_->get_bound (RIGHT))
-	{
-	  Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
-	  finished_->set_bound (RIGHT, e);
-	}
+        {
+          Grob *e = unsmob<Grob> (get_property ("currentMusicalColumn"));
+          finished_->set_bound (RIGHT, e);
+        }
       finished_ = 0;
     }
 }
@@ -122,7 +133,7 @@ Trill_spanner_engraver::stop_translation_timestep ()
 {
   if (span_ && !span_->get_bound (LEFT))
     {
-      Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+      Grob *e = unsmob<Grob> (get_property ("currentMusicalColumn"));
       span_->set_bound (LEFT, e);
     }
 
@@ -136,24 +147,30 @@ Trill_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     {
-      Grob *e = unsmob_grob (get_property ("currentCommandColumn"));
+      Grob *e = unsmob<Grob> (get_property ("currentCommandColumn"));
       span_->set_bound (RIGHT, e);
     }
 }
 
-ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
+
+void
+Trill_spanner_engraver::boot ()
+{
+  ADD_LISTENER (Trill_spanner_engraver, trill_span);
+  ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
+}
 
 ADD_TRANSLATOR (Trill_spanner_engraver,
-		/* doc */
-		"Create trill spanner from an event.",
+                /* doc */
+                "Create trill spanner from an event.",
 
-		/* create */
-		"TrillSpanner ",
+                /* create */
+                "TrillSpanner ",
 
-		/* read */
-		"currentCommandColumn "
-		"currentMusicalColumn ",
+                /* read */
+                "currentCommandColumn "
+                "currentMusicalColumn ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );