From 2e62980e7d08267a083ff955d8dbf32d7182fbf8 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 00:49:10 +0000
Subject: [PATCH] lilypond-1.3.130

---
 input/bugs/score-dynamics.ly | 17 +++++++++++++++--
 lily/a2-engraver.cc          |  5 +++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/input/bugs/score-dynamics.ly b/input/bugs/score-dynamics.ly
index 9389c525a9..cec828c53c 100644
--- 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 5480059806..5df8930a30 100644
--- 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"))
-- 
2.39.5