lilypond-1.3.130

diff --git a/input/bugs/score-dynamics.ly b/input/bugs/score-dynamics.ly
index 9389c525a9a6b7ca4aa23ef3410ccc63ca6a7dca..cec828c53cee6e81873cee169492dd024ced9041 100644 (file)
--- a/input/bugs/score-dynamics.ly
+++ b/input/bugs/score-dynamics.ly
@@ -1,19 +1,32 @@
-% dynamics collide with staff
+% dynamics should not collide with staff
+% dynamics (of two voices) should not collide with eachother
 
 \header {
 texidoc="Template for part-combining orchestral scores";
 }
 
 
-End = { \skip 1*6; }
+End = { \skip 1*8; }
 violoncello = \notes\relative c'' {
   c1\ff d e \break
   c1\ff d e \break
+  
+  \property Voice.crescendoText = #"cresc."
+  \property Voice.crescendoSpanner = #'dashed-line
+  g4\p\< r r r8 g(|
+  )c,4 r r r8 c|
+  [\!f8\sf(\>as f as][f g d)\!g]|
 }
 
 contrabasso = \notes\relative c'' {
   c1\pp d e
   c2\pp c d1 e
+  
+  \property Voice.crescendoText = #"cresc."
+  \property Voice.crescendoSpanner = #'dashed-line
+  g4\p\< r r r8 g(|
+  )c,4 r r r8 c|
+  [\!f8\sf(\>as f as][f g d)\!g]| 
 }
 
 flautiStaff =  \notes \context Staff = flauti <

diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc
index 54800598068fae9a65514abaecfa2d0d93fc4c8b..5df8930a30054f7e3cd364dc260e3e666fa6f36b 100644 (file)
--- a/lily/a2-engraver.cc
+++ b/lily/a2-engraver.cc
@@ -134,8 +134,9 @@ A2_engraver::acknowledge_grob (Grob_info i)
       || Slur::has_interface (i.elem_l_)
       /*
        Usually, dynamics are removed by *_devnull_engravers for the
-       second voice.  We don't want all dynamics for the first voice
-       to be placed above the staff.  */
+       second voice.  On the one hand, we don't want all dynamics for
+       the first voice to be placed above the staff.  On the other
+       hand, colliding of scripts may be worse */
 #if 0
       || i.elem_l_->has_interface (ly_symbol2scm ("dynamic-interface"))
       || i.elem_l_->has_interface (ly_symbol2scm ("text-interface"))