Backport bugfix for dynamic/accidental collisions

diff --git a/ChangeLog b/ChangeLog
index 2f4a218bbcab89fb52fe712d045d1aea58c0069e..2c36818cdf2fb1177a2fd74bf7b6864416b1d74d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-31  Erlend Aasland  <erlenda@gmail.com>
+
+       * dynamic-engraver.cc: fix bug (dynamics collide with accidentals)
+
 2006-05-31  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scripts/lilypond-book.py (Lilypond_file_snippet.ly): strip

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 3c1a517942d4477fe686d6a29406d33adfd1085f..54373ddb9d5d110206e5ac57dd39a25971dd0ad6 100644 (file)
--- 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);