X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-position-engraver.cc;h=b35d037a35fb0ca8442a3fc3ad90db2b264e4e53;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=8043640a2f5c91ed2d148bc1b861cf477dcc99bb;hpb=41e45dd730c075e78065dfa78e5e54be664d905e;p=lilypond.git

diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc
index 8043640a2f..b35d037a35 100644
--- a/lily/figured-bass-position-engraver.cc
+++ b/lily/figured-bass-position-engraver.cc
@@ -1,10 +1,21 @@
 /*
-  figured-bass-position-engraver.cc -- implement Figured_bass_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+  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/>.
 */
 
 #include "engraver.hh"
@@ -22,15 +33,15 @@ class Figured_bass_position_engraver : public Engraver
 
   Spanner *bass_figure_alignment_;
   Spanner *positioner_;
-  vector<Grob*> support_;
-  vector<Grob*> span_support_;
+  vector<Grob *> support_;
+  vector<Grob *> span_support_;
 protected:
-  DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_ACKNOWLEDGER (slur);
-  DECLARE_END_ACKNOWLEDGER (slur);
-  DECLARE_ACKNOWLEDGER (tie);
-  DECLARE_ACKNOWLEDGER (bass_figure_alignment);
-  DECLARE_END_ACKNOWLEDGER (bass_figure_alignment);
+  void acknowledge_note_column (Grob_info);
+  void acknowledge_slur (Grob_info);
+  void acknowledge_end_slur (Grob_info);
+  void acknowledge_end_tie (Grob_info);
+  void acknowledge_bass_figure_alignment (Grob_info);
+  void acknowledge_end_bass_figure_alignment (Grob_info);
 
   virtual void finalize ();
   void start_spanner ();
@@ -38,7 +49,8 @@ protected:
   void stop_translation_timestep ();
 };
 
-Figured_bass_position_engraver::Figured_bass_position_engraver ()
+Figured_bass_position_engraver::Figured_bass_position_engraver (Context *c)
+  : Engraver (c)
 {
   positioner_ = 0;
   bass_figure_alignment_ = 0;
@@ -61,13 +73,13 @@ Figured_bass_position_engraver::stop_spanner ()
     {
       positioner_->set_bound (RIGHT, bass_figure_alignment_->get_bound (RIGHT));
     }
-  
+
   positioner_ = 0;
   bass_figure_alignment_ = 0;
 }
 
 void
-Figured_bass_position_engraver::finalize () 
+Figured_bass_position_engraver::finalize ()
 {
   stop_spanner ();
 }
@@ -81,8 +93,8 @@ Figured_bass_position_engraver::acknowledge_note_column (Grob_info info)
 void
 Figured_bass_position_engraver::acknowledge_end_slur (Grob_info info)
 {
-  vector<Grob*>::iterator i = find (span_support_.begin (), span_support_.end (),
-				    info.grob ());
+  vector<Grob *>::iterator i = find (span_support_.begin (), span_support_.end (),
+                                     info.grob ());
 
   if (i < span_support_.end ())
     span_support_.erase (i);
@@ -95,7 +107,7 @@ Figured_bass_position_engraver::acknowledge_slur (Grob_info info)
 }
 
 void
-Figured_bass_position_engraver::acknowledge_tie (Grob_info info)
+Figured_bass_position_engraver::acknowledge_end_tie (Grob_info info)
 {
   support_.push_back (info.grob ());
 }
@@ -106,47 +118,50 @@ Figured_bass_position_engraver::stop_translation_timestep ()
   if (positioner_)
     {
       for (vsize i = 0; i < span_support_.size (); i++)
-	Side_position_interface::add_support (positioner_, span_support_[i]);
+        Side_position_interface::add_support (positioner_, span_support_[i]);
       for (vsize i = 0; i < support_.size (); i++)
-	Side_position_interface::add_support (positioner_, support_[i]);
+        Side_position_interface::add_support (positioner_, support_[i]);
     }
 
   support_.clear ();
 }
 
 void
-Figured_bass_position_engraver::acknowledge_end_bass_figure_alignment (Grob_info info)
+Figured_bass_position_engraver::acknowledge_end_bass_figure_alignment (Grob_info /* info */)
 {
-  (void)info;
   stop_spanner ();
 }
 
 void
 Figured_bass_position_engraver::acknowledge_bass_figure_alignment (Grob_info info)
 {
-  bass_figure_alignment_ = dynamic_cast<Spanner*> (info.grob ());
+  bass_figure_alignment_ = dynamic_cast<Spanner *> (info.grob ());
   start_spanner ();
 }
 
 
-ADD_ACKNOWLEDGER (Figured_bass_position_engraver, note_column);
-ADD_ACKNOWLEDGER (Figured_bass_position_engraver, slur);
-ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, slur);
 
-ADD_ACKNOWLEDGER (Figured_bass_position_engraver, tie);
-ADD_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment);
-ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment);
+void
+Figured_bass_position_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Figured_bass_position_engraver, note_column);
+  ADD_ACKNOWLEDGER (Figured_bass_position_engraver, slur);
+  ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, slur);
+  ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, tie);
+  ADD_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment);
+  ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment);
+}
 
 ADD_TRANSLATOR (Figured_bass_position_engraver,
-		/* doc */
-		"Position figured bass alignments over notes.",
-		
-		/* create */
-		"BassFigureAlignmentPositioning ",
-
-		/* read */
-		"",
-
-		/* write */
-		""
-		);
+                /* doc */
+                "Position figured bass alignments over notes.",
+
+                /* create */
+                "BassFigureAlignmentPositioning ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );