From: Joe Neeman <joeneeman@gmail.com>
Date: Sun, 20 Jul 2008 05:02:54 +0000 (+1000)
Subject: Fix 549.
X-Git-Tag: release/2.11.53-1~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5649a453b03986466caa08bfe8c4888e7a469cf2;p=lilypond.git

Fix 549.

The slur-script.ly regression test was made obsolete by vertical
collision avoidance. This modifies slur-script.ly so that it only tests
things that we care about.
---

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index c9dc97f5eb..937224496c 100644
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -1,12 +1,9 @@
 
 \header {
 
-  texidoc = "A slur avoids collisions with scripts.  Articulations
-    go inside the slur, dynamic markings go outside the slur.
-    Fingerings and texts are placed either inside or outside.
-
-    For different configurations, the defaults can be changed, and
-    scripts can be moved manually."
+  texidoc = "A slur avoids collisions with scripts, which are placed
+    either inside or outside the slur, depending on the script.  The
+    slur responds appropriately if a script is moved."
 }
 
 \version "2.11.51"
@@ -16,26 +13,10 @@
 }
 \relative
 {
-  b4-.( b-. b-.)
-  b(-.  d-.)
-
-  b_1( f'_1_2_3 c_3_4_5 a)
-
-  \override DynamicLineSpanner #'avoid-slur = #'outside
-  b(^"dyn outside" b f'\p b,)
-  
-  %% Do not force dynamics outside slur, only avoid collisions.
-  \override DynamicLineSpanner #'avoid-slur = #'around
-  b(^"dyn around" e\p e\f b)
-  
-  %% Do not avoid collisions.
-  \override DynamicLineSpanner #'avoid-slur = #'()
-  b(^"no avoid" d\p d\f b)
-  
-  c_\markup { \italic {"cresc."}}( c c)
-  \once \override Script #'padding = #1.2
-  b-.( b-.
-  \once \override Script #'padding = #1.2
-  b-.)
-  e='16[-.( f-.)]
+  b4-.( b-.)
+  \once \override Script #'padding = #1.5
+  b-.( b-.)
+  b_\downbow( b_\downbow)
+  \once \override Script #'padding = #1.5
+  b_\downbow( b_\downbow)
 }