X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-position-engraver.cc;h=fadb5f1cb3ccab5f4816a9240c92a6b3a594fdcd;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=af0d3be772ba9b2c5344b635e3480a0fdd1f8418;hpb=548075f8c20d76600ee58e7ab90aae277ff03f39;p=lilypond.git

diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc
index af0d3be772..fadb5f1cb3 100644
--- a/lily/figured-bass-position-engraver.cc
+++ b/lily/figured-bass-position-engraver.cc
@@ -3,29 +3,32 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
 #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*> note_columns_;
-
+  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);
 
@@ -46,7 +49,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_);
 }
@@ -72,7 +75,29 @@ Figured_bass_position_engraver::finalize ()
 void
 Figured_bass_position_engraver::acknowledge_note_column (Grob_info info)
 {
-  note_columns_.push_back (info.grob ());
+  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)
+{
+  span_support_.push_back (info.grob ());
+}
+
+void
+Figured_bass_position_engraver::acknowledge_tie (Grob_info info)
+{
+  support_.push_back (info.grob ());
 }
 
 void
@@ -80,11 +105,13 @@ Figured_bass_position_engraver::stop_translation_timestep ()
 {
   if (positioner_)
     {
-      for (vsize i = 0; i < note_columns_.size (); i++)
-	Side_position_interface::add_support (positioner_, note_columns_[i]);
+      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]);
     }
 
-  note_columns_.clear ();
+  support_.clear ();
 }
 
 void
@@ -102,9 +129,13 @@ Figured_bass_position_engraver::acknowledge_bass_figure_alignment (Grob_info inf
 }
 
 
-ADD_ACKNOWLEDGER(Figured_bass_position_engraver,note_column);
-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, 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);
 
 ADD_TRANSLATOR (Figured_bass_position_engraver,
 		/* doc */
@@ -113,8 +144,9 @@ ADD_TRANSLATOR (Figured_bass_position_engraver,
 		/* create */
 		"BassFigureAlignmentPositioning ",
 
-		/* accept */ "",
-
 		/* read */
-		" ",
-		/* write */ "");
+		"",
+
+		/* write */
+		""
+		);