X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-position-engraver.cc;h=5fa27a69cbe40819c1f0146c56fdd1579ada4a90;hb=84cad110c3bbaeca8e5144dba7f8756b89100396;hp=502b30d6c15c7e56b2c1c1d746acb6a856039cc3;hpb=780bab3e188af124fb267f6abefbe5d976c7f479;p=lilypond.git

diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc
index 502b30d6c1..5fa27a69cb 100644
--- a/lily/figured-bass-position-engraver.cc
+++ b/lily/figured-bass-position-engraver.cc
@@ -1,32 +1,44 @@
 /*
-  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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 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"
 
 #include "context.hh"
-#include "music.hh"
 #include "spanner.hh"
+#include "item.hh"
 #include "side-position-interface.hh"
 #include "translator.icc"
 #include "axis-group-interface.hh"
 
 class Figured_bass_position_engraver : public Engraver
 {
-  TRANSLATOR_DECLARATIONS(Figured_bass_position_engraver);
+  TRANSLATOR_DECLARATIONS (Figured_bass_position_engraver);
 
   Spanner *bass_figure_alignment_;
   Spanner *positioner_;
-  vector<Grob*> 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);
@@ -48,7 +60,7 @@ Figured_bass_position_engraver::start_spanner ()
 {
   assert (!positioner_);
 
-  positioner_ = make_spanner("BassFigureAlignmentPositioning", bass_figure_alignment_->self_scm ());
+  positioner_ = make_spanner ("BassFigureAlignmentPositioning", bass_figure_alignment_->self_scm ());
   positioner_->set_bound (LEFT, bass_figure_alignment_->get_bound (LEFT));
   Axis_group_interface::add_element (positioner_, bass_figure_alignment_);
 }
@@ -60,13 +72,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 ();
 }
@@ -77,11 +89,20 @@ Figured_bass_position_engraver::acknowledge_note_column (Grob_info info)
   support_.push_back (info.grob ());
 }
 
+void
+Figured_bass_position_engraver::acknowledge_end_slur (Grob_info info)
+{
+  vector<Grob *>::iterator i = find (span_support_.begin (), span_support_.end (),
+                                     info.grob ());
+
+  if (i < span_support_.end ())
+    span_support_.erase (i);
+}
 
 void
 Figured_bass_position_engraver::acknowledge_slur (Grob_info info)
 {
-  support_.push_back (info.grob ());
+  span_support_.push_back (info.grob ());
 }
 
 void
@@ -95,43 +116,46 @@ 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]);
       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,note_column);
-ADD_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);
+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);
 
 ADD_TRANSLATOR (Figured_bass_position_engraver,
-		/* doc */
-		"Position figured bass alignments over notes.",
-		
-		/* create */
-		"BassFigureAlignmentPositioning ",
+                /* doc */
+                "Position figured bass alignments over notes.",
+
+                /* create */
+                "BassFigureAlignmentPositioning ",
 
-		/* accept */ "",
+                /* read */
+                "",
 
-		/* read */
-		" ",
-		/* write */ "");
+                /* write */
+                ""
+               );