From 025d5fc9775ee6f276bceb13d1651a3c386e4645 Mon Sep 17 00:00:00 2001 From: Erlend Aasland Date: Wed, 31 May 2006 14:01:38 +0000 Subject: [PATCH] Backport bugfix for dynamic/accidental collisions --- ChangeLog | 4 ++++ lily/dynamic-engraver.cc | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2f4a218bbc..2c36818cdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-05-31 Erlend Aasland + + * dynamic-engraver.cc: fix bug (dynamics collide with accidentals) + 2006-05-31 Han-Wen Nienhuys * scripts/lilypond-book.py (Lilypond_file_snippet.ly): strip diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 3c1a517942..54373ddb9d 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -61,6 +61,7 @@ class Dynamic_engraver : public Engraver void typeset_all (); TRANSLATOR_DECLARATIONS (Dynamic_engraver); + DECLARE_ACKNOWLEDGER (accidental); DECLARE_ACKNOWLEDGER (script); DECLARE_ACKNOWLEDGER (stem_tremolo); DECLARE_ACKNOWLEDGER (note_column); @@ -376,6 +377,14 @@ Dynamic_engraver::typeset_all () } +void +Dynamic_engraver::acknowledge_accidental (Grob_info info) +{ + if (line_spanner_) + Side_position_interface::add_support (line_spanner_, info.grob ()); +} + + void Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info) { @@ -449,6 +458,7 @@ Dynamic_engraver::acknowledge_script (Grob_info info) Side_position_interface::add_support (line_spanner_, info.grob ()); } +ADD_ACKNOWLEDGER (Dynamic_engraver, accidental); ADD_ACKNOWLEDGER (Dynamic_engraver, script); ADD_ACKNOWLEDGER (Dynamic_engraver, note_column); ADD_ACKNOWLEDGER (Dynamic_engraver, slur); -- 2.39.5