X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner-break-forbid-engraver.cc;h=98bf1934d0ee6b1edfdbd20e87f0b09b1eb3ef7b;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=a37056ba8df38288032fc2c1c43309665a9117d6;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/spanner-break-forbid-engraver.cc b/lily/spanner-break-forbid-engraver.cc
index a37056ba8d..98bf1934d0 100644
--- a/lily/spanner-break-forbid-engraver.cc
+++ b/lily/spanner-break-forbid-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2007--2015 Han-Wen Nienhuys <hanwen@lilypond.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
@@ -17,8 +17,6 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-
 #include "engraver.hh"
 #include "international.hh"
 #include "spanner.hh"
@@ -31,15 +29,14 @@
 class Spanner_break_forbid_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Spanner_break_forbid_engraver);
-  vector<Spanner*> running_spanners_;
+  vector<Spanner *> running_spanners_;
 protected:
-  DECLARE_ACKNOWLEDGER (unbreakable_spanner);
-  DECLARE_END_ACKNOWLEDGER (unbreakable_spanner);
+  void acknowledge_unbreakable_spanner (Grob_info);
+  void acknowledge_end_unbreakable_spanner (Grob_info);
 
   void process_music ();
 };
 
-
 void
 Spanner_break_forbid_engraver::process_music ()
 {
@@ -52,8 +49,8 @@ Spanner_break_forbid_engraver::process_music ()
 void
 Spanner_break_forbid_engraver::acknowledge_end_unbreakable_spanner (Grob_info gi)
 {
-  vector<Spanner*>::iterator i = find (running_spanners_.begin (), running_spanners_.end (),
-				       gi.spanner ());
+  vector<Spanner *>::iterator i = find (running_spanners_.begin (), running_spanners_.end (),
+                                        gi.spanner ());
   if (i != running_spanners_.end ())
     running_spanners_.erase (i);
 }
@@ -65,23 +62,28 @@ Spanner_break_forbid_engraver::acknowledge_unbreakable_spanner (Grob_info gi)
     running_spanners_.push_back (gi.spanner ());
 }
 
-Spanner_break_forbid_engraver::Spanner_break_forbid_engraver ()
+Spanner_break_forbid_engraver::Spanner_break_forbid_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
+void
+Spanner_break_forbid_engraver::boot ()
+{
+  ADD_END_ACKNOWLEDGER (Spanner_break_forbid_engraver, unbreakable_spanner);
+  ADD_ACKNOWLEDGER (Spanner_break_forbid_engraver, unbreakable_spanner);
+}
 
-ADD_END_ACKNOWLEDGER (Spanner_break_forbid_engraver, unbreakable_spanner);
-ADD_ACKNOWLEDGER (Spanner_break_forbid_engraver, unbreakable_spanner);
 ADD_TRANSLATOR (Spanner_break_forbid_engraver,
-		/* doc */
-		"Forbid breaks in certain spanners.",
+                /* doc */
+                "Forbid breaks in certain spanners.",
 
-		/* create */
-		"",
+                /* create */
+                "",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );