From ec747f27694f0673dc944568e9436f67771bce23 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 3 Jun 2006 00:34:30 +0000 Subject: [PATCH] (acknowledge_slur): add slurs and ties to support too. --- ChangeLog | 3 +++ lily/figured-bass-position-engraver.cc | 27 +++++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83296ae53a..6266c0d4e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-06-03 Han-Wen Nienhuys + * lily/figured-bass-position-engraver.cc (acknowledge_slur): + add slurs and ties to support too. + * buildscripts/output-distance.py (main): set dest_dir argument. Add --max-count option. diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc index af0d3be772..502b30d6c1 100644 --- a/lily/figured-bass-position-engraver.cc +++ b/lily/figured-bass-position-engraver.cc @@ -22,10 +22,12 @@ class Figured_bass_position_engraver : public Engraver Spanner *bass_figure_alignment_; Spanner *positioner_; - vector note_columns_; + vector support_; protected: DECLARE_ACKNOWLEDGER (note_column); + DECLARE_ACKNOWLEDGER (slur); + DECLARE_ACKNOWLEDGER (tie); DECLARE_ACKNOWLEDGER (bass_figure_alignment); DECLARE_END_ACKNOWLEDGER (bass_figure_alignment); @@ -72,7 +74,20 @@ 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_slur (Grob_info info) +{ + support_.push_back (info.grob ()); +} + +void +Figured_bass_position_engraver::acknowledge_tie (Grob_info info) +{ + support_.push_back (info.grob ()); } void @@ -80,11 +95,11 @@ 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 < support_.size (); i++) + Side_position_interface::add_support (positioner_, support_[i]); } - note_columns_.clear (); + support_.clear (); } void @@ -103,6 +118,8 @@ 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,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); -- 2.39.2