Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / figured-bass-position-engraver.cc

diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc
index 4e4f63af0877ccb351ec2c2ab813da76cf4b9bbe..caab84bf4a7d9dd37b2ae93944221700b3e1e726 100644 (file)
--- a/lily/figured-bass-position-engraver.cc
+++ b/lily/figured-bass-position-engraver.cc
@@ -10,8 +10,8 @@
 #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"
@@ -78,13 +78,14 @@ 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 ());
-  span_support_.erase (i);
+
+  if (i < span_support_.end ())
+    span_support_.erase (i);
 }
 
 void
@@ -143,8 +144,6 @@ ADD_TRANSLATOR (Figured_bass_position_engraver,
                /* create */
                "BassFigureAlignmentPositioning ",
 
-               /* accept */ "",
-
                /* read */
                " ",
                /* write */ "");