X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-bracket-engraver.cc;h=9e50962ddcb2473a0158068bb26f13e67ff81568;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=a360e03f732719508a35cd15ad7bb164c2b3c738;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index a360e03f73..9e50962ddc 100644
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2002--2015 Juergen Reuter <reuter@ipd.uka.de>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,12 +19,11 @@
 
 #include "international.hh"
 
-#include "ligature-engraver.hh"
+#include "engraver.hh"
 #include "note-column.hh"
 #include "tuplet-bracket.hh"
 #include "spanner.hh"
 #include "stream-event.hh"
-#include "spanner.hh"
 #include "item.hh"
 
 #include "translator.icc"
@@ -34,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);
 
@@ -47,7 +46,6 @@ private:
   Stream_event *previous_start_event_;
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Ligature_bracket_engraver, ligature);
 void
 Ligature_bracket_engraver::listen_ligature (Stream_event *ev)
 {
@@ -55,7 +53,8 @@ Ligature_bracket_engraver::listen_ligature (Stream_event *ev)
   ASSIGN_EVENT_ONCE (events_drul_[d], ev);
 }
 
-Ligature_bracket_engraver::Ligature_bracket_engraver ()
+Ligature_bracket_engraver::Ligature_bracket_engraver (Context *c)
+  : Engraver (c)
 {
   ligature_ = 0;
   finished_ligature_ = 0;
@@ -64,15 +63,15 @@ Ligature_bracket_engraver::Ligature_bracket_engraver ()
 }
 
 void
-Ligature_bracket_engraver::process_music()
+Ligature_bracket_engraver::process_music ()
 {
   if (events_drul_[STOP])
     {
       if (!ligature_)
-	{
-	  events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
-	  return;
-	}
+        {
+          events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
+          return;
+        }
 
       finished_ligature_ = ligature_;
       ligature_ = 0;
@@ -82,10 +81,10 @@ Ligature_bracket_engraver::process_music()
   if (events_drul_[START])
     {
       if (ligature_)
-	{
-	  events_drul_[START]->origin ()->warning (_ ("already have a ligature"));
-	  return;
-	}
+        {
+          events_drul_[START]->origin ()->warning (_ ("already have a ligature"));
+          return;
+        }
 
       previous_start_event_ = events_drul_[START];
       ligature_ = make_spanner ("LigatureBracket", events_drul_[START]->self_scm ());
@@ -98,40 +97,45 @@ Ligature_bracket_engraver::acknowledge_note_column (Grob_info info)
   if (ligature_)
     {
       Tuplet_bracket::add_column (ligature_,
-				  info.item ());
-      add_bound_item (ligature_, info.item());
+                                  info.item ());
+      add_bound_item (ligature_, info.item ());
     }
 }
 
 void
 Ligature_bracket_engraver::acknowledge_rest (Grob_info info)
 {
-  acknowledge_note_column(info);
+  acknowledge_note_column (info);
 }
 
-
 void
 Ligature_bracket_engraver::stop_translation_timestep ()
 {
-  events_drul_[LEFT] =  
-    events_drul_[RIGHT] = 0;
+  events_drul_[LEFT]
+    = events_drul_[RIGHT] = 0;
   finished_ligature_ = 0;
 }
 
-ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest);
-ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
+
+void
+Ligature_bracket_engraver::boot ()
+{
+  ADD_LISTENER (Ligature_bracket_engraver, ligature);
+  ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest);
+  ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
+}
 
 ADD_TRANSLATOR (Ligature_bracket_engraver,
-		/* doc */
-		"Handle @code{Ligature_events} by engraving @code{Ligature}"
-		" brackets.",
+                /* doc */
+                "Handle @code{Ligature_events} by engraving @code{Ligature}"
+                " brackets.",
 
-		/* create */
-		"LigatureBracket ",
+                /* create */
+                "LigatureBracket ",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );